diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-09-09 21:24:49 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-10-06 07:18:07 +0200 |
| commit | 7d33ec3dfe78723d62f4941684060baeb9c4bda6 (patch) | |
| tree | 0ca105c694d41ebda5d6b7e9c50e0b57d4204858 /source4/ntvfs | |
| parent | 040055bb6a578516007ab6f56ebe2ee77b0f8605 (diff) | |
| download | samba-7d33ec3dfe78723d62f4941684060baeb9c4bda6.tar.gz samba-7d33ec3dfe78723d62f4941684060baeb9c4bda6.tar.bz2 samba-7d33ec3dfe78723d62f4941684060baeb9c4bda6.zip | |
lib/util: consolidate module loading into common code
This creates a samba-modules private libary that handles the details.
Andrew Bartlett
Diffstat (limited to 'source4/ntvfs')
| -rw-r--r-- | source4/ntvfs/ntvfs_base.c | 1 | ||||
| -rw-r--r-- | source4/ntvfs/posix/pvfs_acl.c | 1 | ||||
| -rw-r--r-- | source4/ntvfs/posix/wscript_build | 2 | ||||
| -rw-r--r-- | source4/ntvfs/sysdep/sys_lease.c | 1 | ||||
| -rw-r--r-- | source4/ntvfs/sysdep/sys_notify.c | 1 | ||||
| -rw-r--r-- | source4/ntvfs/wscript_build | 2 |
6 files changed, 6 insertions, 2 deletions
diff --git a/source4/ntvfs/ntvfs_base.c b/source4/ntvfs/ntvfs_base.c index 448d2919df..8058181f89 100644 --- a/source4/ntvfs/ntvfs_base.c +++ b/source4/ntvfs/ntvfs_base.c @@ -26,6 +26,7 @@ #include "../lib/util/dlinklist.h" #include "ntvfs/ntvfs.h" #include "param/param.h" +#include "lib/util/samba_modules.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 cbe3e4e233..8157d862ec 100644 --- a/source4/ntvfs/posix/pvfs_acl.c +++ b/source4/ntvfs/posix/pvfs_acl.c @@ -26,6 +26,7 @@ #include "libcli/security/security.h" #include "param/param.h" #include "../lib/util/unix_privs.h" +#include "lib/util/samba_modules.h" #if defined(UID_WRAPPER) #if !defined(UID_WRAPPER_REPLACE) && !defined(UID_WRAPPER_NOT_REPLACE) diff --git a/source4/ntvfs/posix/wscript_build b/source4/ntvfs/posix/wscript_build index 84695eeafd..acceefadf6 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', + deps='events samba-modules', ) diff --git a/source4/ntvfs/sysdep/sys_lease.c b/source4/ntvfs/sysdep/sys_lease.c index 7865f717a4..9adb898274 100644 --- a/source4/ntvfs/sysdep/sys_lease.c +++ b/source4/ntvfs/sysdep/sys_lease.c @@ -27,6 +27,7 @@ #include "ntvfs/sysdep/sys_lease.h" #include "../lib/util/dlinklist.h" #include "param/param.h" +#include "lib/util/samba_modules.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 03679b644d..00300cd25a 100644 --- a/source4/ntvfs/sysdep/sys_notify.c +++ b/source4/ntvfs/sysdep/sys_notify.c @@ -28,6 +28,7 @@ #include <tevent.h> #include "../lib/util/dlinklist.h" #include "param/param.h" +#include "lib/util/samba_modules.h" /* list of registered backends */ static struct sys_notify_backend *backends; diff --git a/source4/ntvfs/wscript_build b/source4/ntvfs/wscript_build index 6d554f2273..0ddd4e5ed4 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', + deps='tevent samba-modules', private_library=True ) |