r25154: move winbindd code into winbindd/

metze
(This used to be commit 3ac7566ae14c48ff9b0f6b232e0ec4b2f73df558)

34 files changed, 44 insertions, 46 deletions

diff --git a/source3/Makefile.in b/source3/Makefile.in
index f2f6282509..ffb5d93d50 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -852,33 +852,31 @@ PAM_SMBPASS_OBJ = $(PAM_SMBPASS_OBJ_0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_
 		$(SECRETS_OBJ) $(SMBLDAP_OBJ) $(LIBSAMBA_OBJ) \
 		$(RPC_PARSE_OBJ1) $(DOSERR_OBJ) $(LDB_OBJ) $(ERRORMAP_OBJ)
 
-IDMAP_OBJ     = nsswitch/idmap.o nsswitch/idmap_cache.o nsswitch/idmap_util.o @IDMAP_STATIC@
+IDMAP_OBJ     = winbindd/idmap.o winbindd/idmap_cache.o winbindd/idmap_util.o @IDMAP_STATIC@
 
-NSS_INFO_OBJ = nsswitch/nss_info.o @NSS_INFO_STATIC@
-
-IDMAP_NSS_OBJ = sam/idmap_nss.o @IDMAP_NSS_STATIC@
+NSS_INFO_OBJ = winbindd/nss_info.o @NSS_INFO_STATIC@
 
 WINBINDD_OBJ1 = \
-		nsswitch/winbindd.o       \
-		nsswitch/winbindd_sockinit.o \
-		nsswitch/winbindd_user.o  \
-		nsswitch/winbindd_group.o \
-		nsswitch/winbindd_util.o  \
-		nsswitch/winbindd_cache.o \
-		nsswitch/winbindd_pam.o   \
-		nsswitch/winbindd_sid.o   \
-		nsswitch/winbindd_misc.o  \
-		nsswitch/winbindd_cm.o \
-		nsswitch/winbindd_wins.o \
-		nsswitch/winbindd_rpc.o \
-		nsswitch/winbindd_reconnect.o \
-		nsswitch/winbindd_ads.o \
-		nsswitch/winbindd_passdb.o \
-		nsswitch/winbindd_dual.o \
-		nsswitch/winbindd_async.o \
-		nsswitch/winbindd_creds.o \
-		nsswitch/winbindd_cred_cache.o \
-		nsswitch/winbindd_ccache_access.o \
+		winbindd/winbindd.o       \
+		winbindd/winbindd_sockinit.o \
+		winbindd/winbindd_user.o  \
+		winbindd/winbindd_group.o \
+		winbindd/winbindd_util.o  \
+		winbindd/winbindd_cache.o \
+		winbindd/winbindd_pam.o   \
+		winbindd/winbindd_sid.o   \
+		winbindd/winbindd_misc.o  \
+		winbindd/winbindd_cm.o \
+		winbindd/winbindd_wins.o \
+		winbindd/winbindd_rpc.o \
+		winbindd/winbindd_reconnect.o \
+		winbindd/winbindd_ads.o \
+		winbindd/winbindd_passdb.o \
+		winbindd/winbindd_dual.o \
+		winbindd/winbindd_async.o \
+		winbindd/winbindd_creds.o \
+		winbindd/winbindd_cred_cache.o \
+		winbindd/winbindd_ccache_access.o \
 		auth/token_util.o
 
 WINBINDD_OBJ = \
@@ -1549,17 +1547,17 @@ bin/smbpasswd.@SHLIBEXT@: $(BINARY_PREREQS) passdb/pdb_smbpasswd.o
 	@echo "Building plugin $@"
 	@$(SHLD_MODULE) passdb/pdb_smbpasswd.o
 
-bin/rid.@SHLIBEXT@: $(BINARY_PREREQS) nsswitch/idmap_rid.o
+bin/rid.@SHLIBEXT@: $(BINARY_PREREQS) winbindd/idmap_rid.o
 	@echo "Building plugin $@"
-	@$(SHLD_MODULE) nsswitch/idmap_rid.o
+	@$(SHLD_MODULE) winbindd/idmap_rid.o
 
-bin/ad.@SHLIBEXT@: $(BINARY_PREREQS) nsswitch/idmap_ad.o
+bin/ad.@SHLIBEXT@: $(BINARY_PREREQS) winbindd/idmap_ad.o
 	@echo "Building plugin $@"
-	@$(SHLD_MODULE) nsswitch/idmap_ad.o
+	@$(SHLD_MODULE) winbindd/idmap_ad.o
 
-bin/ldap.@SHLIBEXT@: $(BINARY_PREREQS) nsswitch/idmap_ldap.o
+bin/ldap.@SHLIBEXT@: $(BINARY_PREREQS) winbindd/idmap_ldap.o
 	@echo "Building plugin $@"
-	@$(SHLD_MODULE) nsswitch/idmap_ldap.o
+	@$(SHLD_MODULE) winbindd/idmap_ldap.o
 
 bin/weird.@SHLIBEXT@: $(BINARY_PREREQS) $(DEVEL_HELP_WEIRD_OBJ)
 	@echo "Building plugin $@"
@@ -1962,14 +1960,14 @@ clean: delheaders python_clean
 # removed by "make clean" this will always be run when you do anything
 # afterwards.
 proto_exists: include/proto.h include/build_env.h \
-	nsswitch/winbindd_proto.h web/swat_proto.h \
+	winbindd/winbindd_proto.h web/swat_proto.h \
 	client/client_proto.h utils/net_proto.h utils/ntlm_auth_proto.h smbd/build_options.c
 	@touch proto_exists
 
 delheaders:
 	@echo Removing prototype headers
 	@rm -f include/proto.h include/build_env.h \
-		nsswitch/winbindd_proto.h web/swat_proto.h \
+		winbindd/winbindd_proto.h web/swat_proto.h \
 		client/client_proto.h utils/net_proto.h \
 		smbd/build_options.c utils/ntlm_auth_proto.h \
 		utils/passwd_proto.h
@@ -1987,9 +1985,9 @@ include/build_env.h: script/build_env.sh
 	@$(SHELL) $(srcdir)/script/build_env.sh $(srcdir) $(builddir) $(CC) \
 	  > $(builddir)/include/build_env.h
 
-nsswitch/winbindd_proto.h:
+winbindd/winbindd_proto.h:
 	@cd $(srcdir) && $(SHELL) $(MKPROTO_SH) $(AWK) \
-	  -h _WINBINDD_PROTO_H_ $(builddir)/nsswitch/winbindd_proto.h \
+	  -h _WINBINDD_PROTO_H_ $(builddir)/winbindd/winbindd_proto.h \
 	  $(WINBINDD_OBJ1)
 
 web/swat_proto.h:
@@ -2025,7 +2023,7 @@ headers:
 	$(MAKE) smbd/build_options.c; \
 	$(MAKE) include/proto.h; \
 	$(MAKE) include/build_env.h; \
-	$(MAKE) nsswitch/winbindd_proto.h; \
+	$(MAKE) winbindd/winbindd_proto.h; \
 	$(MAKE) web/swat_proto.h; \
 	$(MAKE) client/client_proto.h; \
 	$(MAKE) utils/ntlm_auth_proto.h; \
diff --git a/source3/configure.in b/source3/configure.in
index 031d530f65..67cec38109 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6333,16 +6333,16 @@ SMB_MODULE(rpc_unixinfo, \$(RPC_UNIXINFO_OBJ), "bin/librpc_unixinfo.$SHLIBEXT",
 SMB_MODULE(rpc_epmapper, \$(RPC_EPMAPPER_OBJ), "bin/librpc_epmapper.$SHLIBEXT", RPC)
 SMB_SUBSYSTEM(RPC,smbd/server.o)
 
-SMB_MODULE(idmap_ldap, nsswitch/idmap_ldap.o, "bin/ldap.$SHLIBEXT", IDMAP)
-SMB_MODULE(idmap_tdb, nsswitch/idmap_tdb.o, "bin/tdb.$SHLIBEXT", IDMAP)
-SMB_MODULE(idmap_passdb, nsswitch/idmap_passdb.o, "bin/passdb.$SHLIBEXT", IDMAP)
-SMB_MODULE(idmap_nss, nsswitch/idmap_nss.o, "bin/nss.$SHLIBEXT", IDMAP)
-SMB_MODULE(idmap_rid, nsswitch/idmap_rid.o, "bin/rid.$SHLIBEXT", IDMAP)
-SMB_MODULE(idmap_ad, nsswitch/idmap_ad.o, "bin/ad.$SHLIBEXT", IDMAP)
-SMB_SUBSYSTEM(IDMAP, nsswitch/idmap.o)
-
-SMB_MODULE(nss_info_template, nsswitch/nss_info_template.o, "bin/template.$SHLIBEXT", NSS_INFO)
-SMB_SUBSYSTEM(NSS_INFO, nsswitch/nss_info.o)
+SMB_MODULE(idmap_ldap, winbindd/idmap_ldap.o, "bin/ldap.$SHLIBEXT", IDMAP)
+SMB_MODULE(idmap_tdb, winbindd/idmap_tdb.o, "bin/tdb.$SHLIBEXT", IDMAP)
+SMB_MODULE(idmap_passdb, winbindd/idmap_passdb.o, "bin/passdb.$SHLIBEXT", IDMAP)
+SMB_MODULE(idmap_nss, winbindd/idmap_nss.o, "bin/nss.$SHLIBEXT", IDMAP)
+SMB_MODULE(idmap_rid, winbindd/idmap_rid.o, "bin/rid.$SHLIBEXT", IDMAP)
+SMB_MODULE(idmap_ad, winbindd/idmap_ad.o, "bin/ad.$SHLIBEXT", IDMAP)
+SMB_SUBSYSTEM(IDMAP, winbindd/idmap.o)
+
+SMB_MODULE(nss_info_template, winbindd/nss_info_template.o, "bin/template.$SHLIBEXT", NSS_INFO)
+SMB_SUBSYSTEM(NSS_INFO, winbindd/nss_info.o)
 
 SMB_MODULE(charset_weird, modules/weird.o, "bin/weird.$SHLIBEXT", CHARSET)
 SMB_MODULE(charset_CP850, modules/CP850.o, "bin/CP850.$SHLIBEXT", CHARSET)
diff --git a/source3/nsswitch/idmap.c b/source3/winbindd/idmap.c
index 2c7acc185c..2c7acc185c 100644
--- a/source3/nsswitch/idmap.c
+++ b/source3/winbindd/idmap.c
diff --git a/source3/nsswitch/idmap_ad.c b/source3/winbindd/idmap_ad.c
index 41dbb471f9..41dbb471f9 100644
--- a/source3/nsswitch/idmap_ad.c
+++ b/source3/winbindd/idmap_ad.c
diff --git a/source3/nsswitch/idmap_cache.c b/source3/winbindd/idmap_cache.c
index 4f01cb1392..4f01cb1392 100644
--- a/source3/nsswitch/idmap_cache.c
+++ b/source3/winbindd/idmap_cache.c
diff --git a/source3/nsswitch/idmap_ldap.c b/source3/winbindd/idmap_ldap.c
index 3b63915b05..3b63915b05 100644
--- a/source3/nsswitch/idmap_ldap.c
+++ b/source3/winbindd/idmap_ldap.c
diff --git a/source3/nsswitch/idmap_nss.c b/source3/winbindd/idmap_nss.c
index 5bb2389c93..5bb2389c93 100644
--- a/source3/nsswitch/idmap_nss.c
+++ b/source3/winbindd/idmap_nss.c
diff --git a/source3/nsswitch/idmap_passdb.c b/source3/winbindd/idmap_passdb.c
index 17afd71ab8..17afd71ab8 100644
--- a/source3/nsswitch/idmap_passdb.c
+++ b/source3/winbindd/idmap_passdb.c
diff --git a/source3/nsswitch/idmap_rid.c b/source3/winbindd/idmap_rid.c
index 8e5f1302f7..8e5f1302f7 100644
--- a/source3/nsswitch/idmap_rid.c
+++ b/source3/winbindd/idmap_rid.c
diff --git a/source3/nsswitch/idmap_tdb.c b/source3/winbindd/idmap_tdb.c
index 97000689fa..97000689fa 100644
--- a/source3/nsswitch/idmap_tdb.c
+++ b/source3/winbindd/idmap_tdb.c
diff --git a/source3/nsswitch/idmap_util.c b/source3/winbindd/idmap_util.c
index 077c599739..077c599739 100644
--- a/source3/nsswitch/idmap_util.c
+++ b/source3/winbindd/idmap_util.c
diff --git a/source3/nsswitch/nss_info.c b/source3/winbindd/nss_info.c
index ea51e9dde8..ea51e9dde8 100644
--- a/source3/nsswitch/nss_info.c
+++ b/source3/winbindd/nss_info.c
diff --git a/source3/nsswitch/nss_info_template.c b/source3/winbindd/nss_info_template.c
index aaf02e4abe..aaf02e4abe 100644
--- a/source3/nsswitch/nss_info_template.c
+++ b/source3/winbindd/nss_info_template.c
diff --git a/source3/nsswitch/winbindd.c b/source3/winbindd/winbindd.c
index 17915fb01b..17915fb01b 100644
--- a/source3/nsswitch/winbindd.c
+++ b/source3/winbindd/winbindd.c
diff --git a/source3/nsswitch/winbindd.h b/source3/winbindd/winbindd.h
index 27406ac438..e7119c332f 100644
--- a/source3/nsswitch/winbindd.h
+++ b/source3/winbindd/winbindd.h
@@ -352,7 +352,7 @@ struct winbindd_tdc_domain {
 };
 
 
-#include "nsswitch/winbindd_proto.h"
+#include "winbindd/winbindd_proto.h"
 
 #define WINBINDD_ESTABLISH_LOOP 30
 #define WINBINDD_RESCAN_FREQ lp_winbind_cache_time()
diff --git a/source3/nsswitch/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index 65cc00bb97..65cc00bb97 100644
--- a/source3/nsswitch/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
diff --git a/source3/nsswitch/winbindd_async.c b/source3/winbindd/winbindd_async.c
index 5d31ff0a41..5d31ff0a41 100644
--- a/source3/nsswitch/winbindd_async.c
+++ b/source3/winbindd/winbindd_async.c
diff --git a/source3/nsswitch/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index e5090dfacf..e5090dfacf 100644
--- a/source3/nsswitch/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
diff --git a/source3/nsswitch/winbindd_ccache_access.c b/source3/winbindd/winbindd_ccache_access.c
index 99c5c0c4d1..99c5c0c4d1 100644
--- a/source3/nsswitch/winbindd_ccache_access.c
+++ b/source3/winbindd/winbindd_ccache_access.c
diff --git a/source3/nsswitch/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 9ffb3dfb23..9ffb3dfb23 100644
--- a/source3/nsswitch/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
diff --git a/source3/nsswitch/winbindd_cred_cache.c b/source3/winbindd/winbindd_cred_cache.c
index 65dcbe5a00..65dcbe5a00 100644
--- a/source3/nsswitch/winbindd_cred_cache.c
+++ b/source3/winbindd/winbindd_cred_cache.c
diff --git a/source3/nsswitch/winbindd_creds.c b/source3/winbindd/winbindd_creds.c
index 62facb6769..62facb6769 100644
--- a/source3/nsswitch/winbindd_creds.c
+++ b/source3/winbindd/winbindd_creds.c
diff --git a/source3/nsswitch/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 67cf6abc2b..67cf6abc2b 100644
--- a/source3/nsswitch/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
diff --git a/source3/nsswitch/winbindd_group.c b/source3/winbindd/winbindd_group.c
index 9a4b02f734..9a4b02f734 100644
--- a/source3/nsswitch/winbindd_group.c
+++ b/source3/winbindd/winbindd_group.c
diff --git a/source3/nsswitch/winbindd_misc.c b/source3/winbindd/winbindd_misc.c
index 9c3f634534..9c3f634534 100644
--- a/source3/nsswitch/winbindd_misc.c
+++ b/source3/winbindd/winbindd_misc.c
diff --git a/source3/nsswitch/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 50b24864b5..50b24864b5 100644
--- a/source3/nsswitch/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
diff --git a/source3/nsswitch/winbindd_passdb.c b/source3/winbindd/winbindd_passdb.c
index 5c36c0c327..5c36c0c327 100644
--- a/source3/nsswitch/winbindd_passdb.c
+++ b/source3/winbindd/winbindd_passdb.c
diff --git a/source3/nsswitch/winbindd_reconnect.c b/source3/winbindd/winbindd_reconnect.c
index a1f96a0359..a1f96a0359 100644
--- a/source3/nsswitch/winbindd_reconnect.c
+++ b/source3/winbindd/winbindd_reconnect.c
diff --git a/source3/nsswitch/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index 6d2dd35080..6d2dd35080 100644
--- a/source3/nsswitch/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
diff --git a/source3/nsswitch/winbindd_sid.c b/source3/winbindd/winbindd_sid.c
index 48e84d35e5..48e84d35e5 100644
--- a/source3/nsswitch/winbindd_sid.c
+++ b/source3/winbindd/winbindd_sid.c
diff --git a/source3/nsswitch/winbindd_sockinit.c b/source3/winbindd/winbindd_sockinit.c
index 50c53a5045..50c53a5045 100644
--- a/source3/nsswitch/winbindd_sockinit.c
+++ b/source3/winbindd/winbindd_sockinit.c
diff --git a/source3/nsswitch/winbindd_user.c b/source3/winbindd/winbindd_user.c
index fac2832f56..fac2832f56 100644
--- a/source3/nsswitch/winbindd_user.c
+++ b/source3/winbindd/winbindd_user.c
diff --git a/source3/nsswitch/winbindd_util.c b/source3/winbindd/winbindd_util.c
index 37d29e1765..37d29e1765 100644
--- a/source3/nsswitch/winbindd_util.c
+++ b/source3/winbindd/winbindd_util.c
diff --git a/source3/nsswitch/winbindd_wins.c b/source3/winbindd/winbindd_wins.c
index f84dfdf2de..f84dfdf2de 100644
--- a/source3/nsswitch/winbindd_wins.c
+++ b/source3/winbindd/winbindd_wins.c