From 87354c9a6de95d5dcebace77a35fc21a73d599ab Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 24 Oct 2011 19:39:53 +1100 Subject: lib/util Split samba-modules library into public and private parts This will allow OpenChange to get at the symbols it needs, without exposing any more of this as a public API than we must. Andrew Bartlett --- source4/auth/ntlm/auth.c | 2 +- source4/auth/ntlm/wscript_build | 2 +- source4/ntptr/ntptr_base.c | 2 +- source4/ntvfs/ntvfs_base.c | 2 +- source4/ntvfs/posix/pvfs_acl.c | 2 +- source4/ntvfs/posix/wscript_build | 2 +- source4/ntvfs/sysdep/sys_lease.c | 2 +- source4/ntvfs/sysdep/sys_notify.c | 2 +- source4/ntvfs/wscript_build | 2 +- source4/param/share.c | 2 +- source4/param/wscript_build | 2 +- source4/rpc_server/dcerpc_server.c | 2 +- source4/smbd/process_model.c | 2 +- source4/smbd/server.c | 2 +- source4/smbd/wscript_build | 2 +- source4/torture/smbtorture.c | 2 +- source4/torture/torture.c | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) (limited to 'source4') diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c index 870f8a9ba3..0a3122673e 100644 --- a/source4/auth/ntlm/auth.c +++ b/source4/auth/ntlm/auth.c @@ -27,7 +27,7 @@ #include "param/param.h" #include "dsdb/samdb/samdb.h" #include "libcli/wbclient/wbclient.h" -#include "lib/util/samba_modules.h" +#include "lib/util/samba_module.h" /*************************************************************************** Set a fixed challenge diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build index 6447bf2ea0..bb687d9600 100644 --- a/source4/auth/ntlm/wscript_build +++ b/source4/auth/ntlm/wscript_build @@ -51,7 +51,7 @@ bld.SAMBA_MODULE('auth4_unix', bld.SAMBA_LIBRARY('auth4', source='auth.c auth_util.c auth_simple.c', autoproto='auth_proto.h', - deps='samba-util security samdb samba-credentials tevent-util LIBWBCLIENT_OLD auth_unix_token samba-modules', + deps='samba-util security samdb samba-credentials tevent-util LIBWBCLIENT_OLD auth_unix_token samba-module', private_library=True ) diff --git a/source4/ntptr/ntptr_base.c b/source4/ntptr/ntptr_base.c index 425a311fe5..7b16986655 100644 --- a/source4/ntptr/ntptr_base.c +++ b/source4/ntptr/ntptr_base.c @@ -25,7 +25,7 @@ #include "includes.h" #include "ntptr/ntptr.h" #include "param/param.h" -#include "lib/util/samba_modules.h" +#include "lib/util/samba_module.h" /* the list of currently registered NTPTR backends */ static struct ntptr_backend { diff --git a/source4/ntvfs/ntvfs_base.c b/source4/ntvfs/ntvfs_base.c index fa4167e03d..25cbfc1194 100644 --- a/source4/ntvfs/ntvfs_base.c +++ b/source4/ntvfs/ntvfs_base.c @@ -26,7 +26,7 @@ #include "../lib/util/dlinklist.h" #include "ntvfs/ntvfs.h" #include "param/param.h" -#include "lib/util/samba_modules.h" +#include "lib/util/samba_module.h" /* the list of currently registered NTVFS backends, note that there * can be more than one backend with the same name, as long as they diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c index 2bff4be304..d809095224 100644 --- a/source4/ntvfs/posix/pvfs_acl.c +++ b/source4/ntvfs/posix/pvfs_acl.c @@ -27,7 +27,7 @@ #include "libcli/security/security.h" #include "param/param.h" #include "../lib/util/unix_privs.h" -#include "lib/util/samba_modules.h" +#include "lib/util/samba_module.h" /* the list of currently registered ACL backends */ static struct pvfs_acl_backend { diff --git a/source4/ntvfs/posix/wscript_build b/source4/ntvfs/posix/wscript_build index acceefadf6..eea506fdb2 100644 --- a/source4/ntvfs/posix/wscript_build +++ b/source4/ntvfs/posix/wscript_build @@ -3,7 +3,7 @@ bld.SAMBA_SUBSYSTEM('pvfs_acl', source='pvfs_acl.c', autoproto='vfs_acl_proto.h', - deps='events samba-modules', + deps='events samba-module', ) diff --git a/source4/ntvfs/sysdep/sys_lease.c b/source4/ntvfs/sysdep/sys_lease.c index 35d99c1938..f95e02a578 100644 --- a/source4/ntvfs/sysdep/sys_lease.c +++ b/source4/ntvfs/sysdep/sys_lease.c @@ -27,7 +27,7 @@ #include "ntvfs/sysdep/sys_lease.h" #include "../lib/util/dlinklist.h" #include "param/param.h" -#include "lib/util/samba_modules.h" +#include "lib/util/samba_module.h" /* list of registered backends */ static struct sys_lease_ops *backends; diff --git a/source4/ntvfs/sysdep/sys_notify.c b/source4/ntvfs/sysdep/sys_notify.c index 660e87f51a..71ffda2bac 100644 --- a/source4/ntvfs/sysdep/sys_notify.c +++ b/source4/ntvfs/sysdep/sys_notify.c @@ -28,7 +28,7 @@ #include #include "../lib/util/dlinklist.h" #include "param/param.h" -#include "lib/util/samba_modules.h" +#include "lib/util/samba_module.h" /* list of registered backends */ static struct sys_notify_backend *backends; diff --git a/source4/ntvfs/wscript_build b/source4/ntvfs/wscript_build index 455e7f0b8b..738b7e0fa1 100644 --- a/source4/ntvfs/wscript_build +++ b/source4/ntvfs/wscript_build @@ -67,7 +67,7 @@ bld.SAMBA_MODULE('ntvfs_nbench', bld.SAMBA_LIBRARY('ntvfs', source='ntvfs_base.c ntvfs_generic.c ntvfs_interface.c ntvfs_util.c', autoproto='ntvfs_proto.h', - deps='tevent samba-modules', + deps='tevent samba-module', private_library=True ) diff --git a/source4/param/share.c b/source4/param/share.c index bdd12df2aa..67759369bd 100644 --- a/source4/param/share.c +++ b/source4/param/share.c @@ -22,7 +22,7 @@ #include "includes.h" #include "param/share.h" #include "param/param.h" -#include "lib/util/samba_modules.h" +#include "lib/util/samba_module.h" const char *share_string_option(struct share_config *scfg, const char *opt_name, const char *defval) { diff --git a/source4/param/wscript_build b/source4/param/wscript_build index 80b2758766..faeeae6e71 100644 --- a/source4/param/wscript_build +++ b/source4/param/wscript_build @@ -10,7 +10,7 @@ bld.SAMBA_SUBSYSTEM('PROVISION', bld.SAMBA_SUBSYSTEM('share', source='share.c', public_headers='share.h', - deps='samba-util samba-modules' + deps='samba-util samba-module' ) diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c index 63bf1c0daf..94e628f9bf 100644 --- a/source4/rpc_server/dcerpc_server.c +++ b/source4/rpc_server/dcerpc_server.c @@ -39,7 +39,7 @@ #include "smbd/process_model.h" #include "lib/messaging/irpc.h" #include "librpc/rpc/rpc_common.h" -#include "lib/util/samba_modules.h" +#include "lib/util/samba_module.h" /* this is only used when the client asks for an unknown interface */ #define DUMMY_ASSOC_GROUP 0x0FFFFFFF diff --git a/source4/smbd/process_model.c b/source4/smbd/process_model.c index 6e1252c718..710246cf8b 100644 --- a/source4/smbd/process_model.c +++ b/source4/smbd/process_model.c @@ -21,7 +21,7 @@ #include "includes.h" #include "smbd/process_model.h" #include "param/param.h" -#include "lib/util/samba_modules.h" +#include "lib/util/samba_module.h" /* the list of currently registered process models */ static struct process_model { diff --git a/source4/smbd/server.c b/source4/smbd/server.c index e925dd4e3f..1da472155d 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -42,7 +42,7 @@ #include "librpc/gen_ndr/ndr_irpc.h" #include "cluster/cluster.h" #include "dynconfig/dynconfig.h" -#include "lib/util/samba_modules.h" +#include "lib/util/samba_module.h" /* recursively delete a directory tree diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build index ab92e3c920..20fabe1a27 100644 --- a/source4/smbd/wscript_build +++ b/source4/smbd/wscript_build @@ -76,7 +76,7 @@ bld.SAMBA_MODULE('process_model_onefork', bld.SAMBA_LIBRARY('process_model', source='process_model.c', autoproto='process_model_proto.h', - deps='samba-util samba-hostconfig samba-modules', + deps='samba-util samba-hostconfig samba-module', private_library=True ) diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c index b2bd4c6749..9620605174 100644 --- a/source4/torture/smbtorture.c +++ b/source4/torture/smbtorture.c @@ -32,7 +32,7 @@ #include "librpc/rpc/dcerpc.h" #include "auth/gensec/gensec.h" #include "param/param.h" -#include "lib/util/samba_modules.h" +#include "lib/util/internal_module.h" #if HAVE_READLINE_HISTORY_H #include diff --git a/source4/torture/torture.c b/source4/torture/torture.c index 50ff4c96fc..e270818dce 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -23,7 +23,7 @@ #include "param/param.h" #include "lib/cmdline/popt_common.h" #include "torture/smbtorture.h" -#include "lib/util/samba_modules.h" +#include "lib/util/samba_module.h" _PUBLIC_ int torture_numops=10; _PUBLIC_ int torture_entries=1000; -- cgit