use nss_wrapper code in samba4 if

--enable-nss-wrapper or --enable-developer is given

metze

git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25839 0c0555d6-39d7-0310-84fc-f1cc0bd64818

diff --git a/source/auth/config.mk b/source/auth/config.mk
index e75f36bdda270caa1a153051caa8565496afc71a..c34a941d1210f4c91cf7493dcadd022702648563 100644 (file)
--- a/source/auth/config.mk
+++ b/source/auth/config.mk
@@ -55,7 +55,7 @@ OBJ_FILES = auth_developer.o
 INIT_FUNCTION = auth_unix_init
 SUBSYSTEM = auth
 OBJ_FILES = auth_unix.o
-PRIVATE_DEPENDENCIES = CRYPT PAM PAM_ERRORS
+PRIVATE_DEPENDENCIES = CRYPT PAM PAM_ERRORS NSS_WRAPPER
 # End MODULE auth_unix
 #######################
 

diff --git a/source/configure.ac b/source/configure.ac
index 52be29c022854822b9071828fec86525e695fe86..520808051e442def21294f8f0c4bdbae6beaf745 100644 (file)
--- a/source/configure.ac
+++ b/source/configure.ac
@@ -85,6 +85,7 @@ m4_include(scripting/swig/config.m4)
 m4_include(ntvfs/posix/config.m4)
 m4_include(ntvfs/unixuid/config.m4)
 m4_include(lib/socket_wrapper/config.m4)
+m4_include(lib/nss_wrapper/config.m4)
 m4_include(auth/config.m4)
 m4_include(kdc/config.m4)
 m4_include(ntvfs/sysdep/config.m4)

diff --git a/source/configure.developer b/source/configure.developer
index b8cf6d68b100a8a3dc45cf0989b4df31e2a4d460..503367020950304687c10ba535f17d384a0b9581 100755 (executable)
--- a/source/configure.developer
+++ b/source/configure.developer
@@ -2,4 +2,5 @@
 `dirname $0`/configure -C \
        --enable-developer \
        --enable-socket-wrapper \
+       --enable-nss-wrapper \
        "$@"

diff --git a/source/dsdb/samdb/ldb_modules/config.mk b/source/dsdb/samdb/ldb_modules/config.mk
index a93dea7db75e4b336e90f932c6375c1d25842eb2..48f2ad38138197971dabd8bed48eb7e0e3847010 100644 (file)
--- a/source/dsdb/samdb/ldb_modules/config.mk
+++ b/source/dsdb/samdb/ldb_modules/config.mk
@@ -81,7 +81,7 @@ OBJ_FILES = \
 [MODULE::ldb_samba3sam]
 SUBSYSTEM = LIBLDB
 INIT_FUNCTION = ldb_samba3sam_module_init
-PRIVATE_DEPENDENCIES = LIBTALLOC ldb_map SMBPASSWD
+PRIVATE_DEPENDENCIES = LIBTALLOC ldb_map SMBPASSWD NSS_WRAPPER
 OBJ_FILES = \
                samba3sam.o
 #

diff --git a/source/lib/basic.mk b/source/lib/basic.mk
index 266ca6e685a82f9bd5fe95d9efc62f00efb0b9a7..0fc07bcd899a3fc8cf739f5cb43255577684d9a5 100644 (file)
--- a/source/lib/basic.mk
+++ b/source/lib/basic.mk
@@ -10,6 +10,7 @@ include messaging/config.mk
 include events/config.mk
 include cmdline/config.mk
 include socket_wrapper/config.mk
+include nss_wrapper/config.mk
 include appweb/config.mk
 include stream/config.mk
 include util/config.mk

diff --git a/source/ntvfs/unixuid/config.mk b/source/ntvfs/unixuid/config.mk
index d078e9f5c64852b21f4446ea1e3fac3b3d2fea1f..91976c6811bfdd48faa235d8ee94b25270f81f52 100644 (file)
--- a/source/ntvfs/unixuid/config.mk
+++ b/source/ntvfs/unixuid/config.mk
@@ -5,6 +5,6 @@ INIT_FUNCTION = ntvfs_unixuid_init
 SUBSYSTEM = ntvfs
 OBJ_FILES = \
                vfs_unixuid.o
-PRIVATE_DEPENDENCIES = SAMDB
+PRIVATE_DEPENDENCIES = SAMDB NSS_WRAPPER
 # End MODULE ntvfs_unixuid
 ################################################

diff --git a/source/rpc_server/config.mk b/source/rpc_server/config.mk
index 1269dcc707498a77c7ab97f6433adcbc48e3b34b..d794b9470d3bb2d21015d1e69154e7bd44d38937 100644 (file)
--- a/source/rpc_server/config.mk
+++ b/source/rpc_server/config.mk
@@ -82,7 +82,8 @@ OBJ_FILES = \
 PRIVATE_DEPENDENCIES = \
                DCERPC_COMMON \
                SAMDB \
-               NDR_UNIXINFO
+               NDR_UNIXINFO \
+               NSS_WRAPPER
 # End MODULE dcerpc_unixinfo
 ################################################
 

diff --git a/source/scripting/ejs/config.mk b/source/scripting/ejs/config.mk
index 5d562ee344e1cb21b4115902044d7043899abdfc..1916854f7b5ce93b64fec70f5a4b98c7fb5c8ab9 100644 (file)
--- a/source/scripting/ejs/config.mk
+++ b/source/scripting/ejs/config.mk
@@ -43,6 +43,7 @@ INIT_FUNCTION = smb_setup_ejs_random
 OBJ_FILES = smbcalls_nss.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_nss
+PRIVATE_DEPENDENCIES = NSS_WRAPPER
 
 [MODULE::smbcalls_data]
 OBJ_FILES = smbcalls_data.o