use nss_wrapper code in samba3 when --enable-nss-wrapper is given

metze
(This used to be commit 96827929626a528bb3e1ec8366aef58c174d67e1)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index ef3a0c97ebf5458befa9f3704077e616c6663710..664f75ddc569ab80b1d4aff63005a11b7f7f8a86 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -273,11 +273,12 @@ RPC_PARSE_OBJ2 = rpc_parse/parse_rpc.o rpc_parse/parse_net.o rpc_parse/parse_srv
 LIBREPLACE_OBJ = @LIBREPLACE_OBJS@
 
 SOCKET_WRAPPER_OBJ = @SOCKET_WRAPPER_OBJS@
+NSS_WRAPPER_OBJ = @NSS_WRAPPER_OBJS@
 
 TALLOC_OBJ = lib/talloc/talloc.o
 
 
-LIB_WITHOUT_PROTO_OBJ = $(LIBREPLACE_OBJ) $(SOCKET_WRAPPER_OBJ) $(TALLOC_OBJ) \
+LIB_WITHOUT_PROTO_OBJ = $(LIBREPLACE_OBJ) $(SOCKET_WRAPPER_OBJ) $(NSS_WRAPPER_OBJ) $(TALLOC_OBJ) \
        lib/messages.o librpc/gen_ndr/ndr_messaging.o lib/messages_local.o \
        lib/messages_ctdbd.o lib/packet.o lib/ctdbd_conn.o lib/talloc_stack.o \
        lib/interfaces.o

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

diff --git a/source3/configure.in b/source3/configure.in
index 02ca8ac08bbea38e561a5282c7a2d7db5bb8d4d1..be2b2628d9b2bfc2165a239c0888bcb9d210478f 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -370,6 +370,7 @@ CFLAGS="${CFLAGS} -D_SAMBA_BUILD_=3"
 AC_LIBREPLACE_CC_CHECKS
 
 m4_include(lib/socket_wrapper/config.m4)
+m4_include(lib/nss_wrapper/config.m4)
 
 SWAT_SBIN_TARGETS='bin/swat$(EXEEXT)'
 SWAT_INSTALL_TARGETS=installswat