summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-11-05 15:47:34 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:44:20 +0100
commit6ce86941de76b27772172717ba5de17ab6fb081d (patch)
treeb14fcb073182592805823e8ff3d1f9f663d2f13f
parent4d354fd58374df6ab5ae52e6cd61988377ceddb2 (diff)
downloadsamba-6ce86941de76b27772172717ba5de17ab6fb081d.tar.gz
samba-6ce86941de76b27772172717ba5de17ab6fb081d.tar.bz2
samba-6ce86941de76b27772172717ba5de17ab6fb081d.zip
r25839: use nss_wrapper code in samba4 if
--enable-nss-wrapper or --enable-developer is given metze (This used to be commit f8bc6b9ad0eec60bff7fdc5653397efd9a044a29)
-rw-r--r--source4/auth/config.mk2
-rw-r--r--source4/configure.ac1
-rwxr-xr-xsource4/configure.developer1
-rw-r--r--source4/dsdb/samdb/ldb_modules/config.mk2
-rw-r--r--source4/lib/basic.mk1
-rw-r--r--source4/ntvfs/unixuid/config.mk2
-rw-r--r--source4/rpc_server/config.mk3
-rw-r--r--source4/scripting/ejs/config.mk1
8 files changed, 9 insertions, 4 deletions
diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index e75f36bdda..c34a941d12 100644
--- a/source4/auth/config.mk
+++ b/source4/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/source4/configure.ac b/source4/configure.ac
index 52be29c022..520808051e 100644
--- a/source4/configure.ac
+++ b/source4/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/source4/configure.developer b/source4/configure.developer
index b8cf6d68b1..5033670209 100755
--- a/source4/configure.developer
+++ b/source4/configure.developer
@@ -2,4 +2,5 @@
`dirname $0`/configure -C \
--enable-developer \
--enable-socket-wrapper \
+ --enable-nss-wrapper \
"$@"
diff --git a/source4/dsdb/samdb/ldb_modules/config.mk b/source4/dsdb/samdb/ldb_modules/config.mk
index a93dea7db7..48f2ad3813 100644
--- a/source4/dsdb/samdb/ldb_modules/config.mk
+++ b/source4/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/source4/lib/basic.mk b/source4/lib/basic.mk
index 266ca6e685..0fc07bcd89 100644
--- a/source4/lib/basic.mk
+++ b/source4/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/source4/ntvfs/unixuid/config.mk b/source4/ntvfs/unixuid/config.mk
index d078e9f5c6..91976c6811 100644
--- a/source4/ntvfs/unixuid/config.mk
+++ b/source4/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/source4/rpc_server/config.mk b/source4/rpc_server/config.mk
index 1269dcc707..d794b9470d 100644
--- a/source4/rpc_server/config.mk
+++ b/source4/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/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 5d562ee344..1916854f7b 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/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