From 28aa4bff8d6be031c6089fe5c7ab010f1cc48340 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 14 Sep 2007 12:03:58 +0000 Subject: [PATCH] r25154: move winbindd code into winbindd/ metze (This used to be commit 3ac7566ae14c48ff9b0f6b232e0ec4b2f73df558) --- source3/Makefile.in | 68 +++++++++---------- source3/configure.in | 20 +++--- source3/{nsswitch => winbindd}/idmap.c | 0 source3/{nsswitch => winbindd}/idmap_ad.c | 0 source3/{nsswitch => winbindd}/idmap_cache.c | 0 source3/{nsswitch => winbindd}/idmap_ldap.c | 0 source3/{nsswitch => winbindd}/idmap_nss.c | 0 source3/{nsswitch => winbindd}/idmap_passdb.c | 0 source3/{nsswitch => winbindd}/idmap_rid.c | 0 source3/{nsswitch => winbindd}/idmap_tdb.c | 0 source3/{nsswitch => winbindd}/idmap_util.c | 0 source3/{nsswitch => winbindd}/nss_info.c | 0 .../nss_info_template.c | 0 source3/{nsswitch => winbindd}/winbindd.c | 0 source3/{nsswitch => winbindd}/winbindd.h | 2 +- source3/{nsswitch => winbindd}/winbindd_ads.c | 0 .../{nsswitch => winbindd}/winbindd_async.c | 0 .../{nsswitch => winbindd}/winbindd_cache.c | 0 .../winbindd_ccache_access.c | 0 source3/{nsswitch => winbindd}/winbindd_cm.c | 0 .../winbindd_cred_cache.c | 0 .../{nsswitch => winbindd}/winbindd_creds.c | 0 .../{nsswitch => winbindd}/winbindd_dual.c | 0 .../{nsswitch => winbindd}/winbindd_group.c | 0 .../{nsswitch => winbindd}/winbindd_misc.c | 0 source3/{nsswitch => winbindd}/winbindd_pam.c | 0 .../{nsswitch => winbindd}/winbindd_passdb.c | 0 .../winbindd_reconnect.c | 0 source3/{nsswitch => winbindd}/winbindd_rpc.c | 0 source3/{nsswitch => winbindd}/winbindd_sid.c | 0 .../winbindd_sockinit.c | 0 .../{nsswitch => winbindd}/winbindd_user.c | 0 .../{nsswitch => winbindd}/winbindd_util.c | 0 .../{nsswitch => winbindd}/winbindd_wins.c | 0 34 files changed, 44 insertions(+), 46 deletions(-) rename source3/{nsswitch => winbindd}/idmap.c (100%) rename source3/{nsswitch => winbindd}/idmap_ad.c (100%) rename source3/{nsswitch => winbindd}/idmap_cache.c (100%) rename source3/{nsswitch => winbindd}/idmap_ldap.c (100%) rename source3/{nsswitch => winbindd}/idmap_nss.c (100%) rename source3/{nsswitch => winbindd}/idmap_passdb.c (100%) rename source3/{nsswitch => winbindd}/idmap_rid.c (100%) rename source3/{nsswitch => winbindd}/idmap_tdb.c (100%) rename source3/{nsswitch => winbindd}/idmap_util.c (100%) rename source3/{nsswitch => winbindd}/nss_info.c (100%) rename source3/{nsswitch => winbindd}/nss_info_template.c (100%) rename source3/{nsswitch => winbindd}/winbindd.c (100%) rename source3/{nsswitch => winbindd}/winbindd.h (99%) rename source3/{nsswitch => winbindd}/winbindd_ads.c (100%) rename source3/{nsswitch => winbindd}/winbindd_async.c (100%) rename source3/{nsswitch => winbindd}/winbindd_cache.c (100%) rename source3/{nsswitch => winbindd}/winbindd_ccache_access.c (100%) rename source3/{nsswitch => winbindd}/winbindd_cm.c (100%) rename source3/{nsswitch => winbindd}/winbindd_cred_cache.c (100%) rename source3/{nsswitch => winbindd}/winbindd_creds.c (100%) rename source3/{nsswitch => winbindd}/winbindd_dual.c (100%) rename source3/{nsswitch => winbindd}/winbindd_group.c (100%) rename source3/{nsswitch => winbindd}/winbindd_misc.c (100%) rename source3/{nsswitch => winbindd}/winbindd_pam.c (100%) rename source3/{nsswitch => winbindd}/winbindd_passdb.c (100%) rename source3/{nsswitch => winbindd}/winbindd_reconnect.c (100%) rename source3/{nsswitch => winbindd}/winbindd_rpc.c (100%) rename source3/{nsswitch => winbindd}/winbindd_sid.c (100%) rename source3/{nsswitch => winbindd}/winbindd_sockinit.c (100%) rename source3/{nsswitch => winbindd}/winbindd_user.c (100%) rename source3/{nsswitch => winbindd}/winbindd_util.c (100%) rename source3/{nsswitch => winbindd}/winbindd_wins.c (100%) diff --git a/source3/Makefile.in b/source3/Makefile.in index f2f62825096..ffb5d93d50b 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 031d530f65c..67cec381096 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 similarity index 100% rename from source3/nsswitch/idmap.c rename to source3/winbindd/idmap.c diff --git a/source3/nsswitch/idmap_ad.c b/source3/winbindd/idmap_ad.c similarity index 100% rename from source3/nsswitch/idmap_ad.c rename to source3/winbindd/idmap_ad.c diff --git a/source3/nsswitch/idmap_cache.c b/source3/winbindd/idmap_cache.c similarity index 100% rename from source3/nsswitch/idmap_cache.c rename to source3/winbindd/idmap_cache.c diff --git a/source3/nsswitch/idmap_ldap.c b/source3/winbindd/idmap_ldap.c similarity index 100% rename from source3/nsswitch/idmap_ldap.c rename to source3/winbindd/idmap_ldap.c diff --git a/source3/nsswitch/idmap_nss.c b/source3/winbindd/idmap_nss.c similarity index 100% rename from source3/nsswitch/idmap_nss.c rename to source3/winbindd/idmap_nss.c diff --git a/source3/nsswitch/idmap_passdb.c b/source3/winbindd/idmap_passdb.c similarity index 100% rename from source3/nsswitch/idmap_passdb.c rename to source3/winbindd/idmap_passdb.c diff --git a/source3/nsswitch/idmap_rid.c b/source3/winbindd/idmap_rid.c similarity index 100% rename from source3/nsswitch/idmap_rid.c rename to source3/winbindd/idmap_rid.c diff --git a/source3/nsswitch/idmap_tdb.c b/source3/winbindd/idmap_tdb.c similarity index 100% rename from source3/nsswitch/idmap_tdb.c rename to source3/winbindd/idmap_tdb.c diff --git a/source3/nsswitch/idmap_util.c b/source3/winbindd/idmap_util.c similarity index 100% rename from source3/nsswitch/idmap_util.c rename to source3/winbindd/idmap_util.c diff --git a/source3/nsswitch/nss_info.c b/source3/winbindd/nss_info.c similarity index 100% rename from source3/nsswitch/nss_info.c rename to source3/winbindd/nss_info.c diff --git a/source3/nsswitch/nss_info_template.c b/source3/winbindd/nss_info_template.c similarity index 100% rename from source3/nsswitch/nss_info_template.c rename to source3/winbindd/nss_info_template.c diff --git a/source3/nsswitch/winbindd.c b/source3/winbindd/winbindd.c similarity index 100% rename from source3/nsswitch/winbindd.c rename to source3/winbindd/winbindd.c diff --git a/source3/nsswitch/winbindd.h b/source3/winbindd/winbindd.h similarity index 99% rename from source3/nsswitch/winbindd.h rename to source3/winbindd/winbindd.h index 27406ac4384..e7119c332f5 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 similarity index 100% rename from source3/nsswitch/winbindd_ads.c rename to source3/winbindd/winbindd_ads.c diff --git a/source3/nsswitch/winbindd_async.c b/source3/winbindd/winbindd_async.c similarity index 100% rename from source3/nsswitch/winbindd_async.c rename to source3/winbindd/winbindd_async.c diff --git a/source3/nsswitch/winbindd_cache.c b/source3/winbindd/winbindd_cache.c similarity index 100% rename from source3/nsswitch/winbindd_cache.c rename to source3/winbindd/winbindd_cache.c diff --git a/source3/nsswitch/winbindd_ccache_access.c b/source3/winbindd/winbindd_ccache_access.c similarity index 100% rename from source3/nsswitch/winbindd_ccache_access.c rename to source3/winbindd/winbindd_ccache_access.c diff --git a/source3/nsswitch/winbindd_cm.c b/source3/winbindd/winbindd_cm.c similarity index 100% rename from source3/nsswitch/winbindd_cm.c rename to source3/winbindd/winbindd_cm.c diff --git a/source3/nsswitch/winbindd_cred_cache.c b/source3/winbindd/winbindd_cred_cache.c similarity index 100% rename from source3/nsswitch/winbindd_cred_cache.c rename to source3/winbindd/winbindd_cred_cache.c diff --git a/source3/nsswitch/winbindd_creds.c b/source3/winbindd/winbindd_creds.c similarity index 100% rename from source3/nsswitch/winbindd_creds.c rename to source3/winbindd/winbindd_creds.c diff --git a/source3/nsswitch/winbindd_dual.c b/source3/winbindd/winbindd_dual.c similarity index 100% rename from source3/nsswitch/winbindd_dual.c rename to source3/winbindd/winbindd_dual.c diff --git a/source3/nsswitch/winbindd_group.c b/source3/winbindd/winbindd_group.c similarity index 100% rename from source3/nsswitch/winbindd_group.c rename to source3/winbindd/winbindd_group.c diff --git a/source3/nsswitch/winbindd_misc.c b/source3/winbindd/winbindd_misc.c similarity index 100% rename from source3/nsswitch/winbindd_misc.c rename to source3/winbindd/winbindd_misc.c diff --git a/source3/nsswitch/winbindd_pam.c b/source3/winbindd/winbindd_pam.c similarity index 100% rename from source3/nsswitch/winbindd_pam.c rename to source3/winbindd/winbindd_pam.c diff --git a/source3/nsswitch/winbindd_passdb.c b/source3/winbindd/winbindd_passdb.c similarity index 100% rename from source3/nsswitch/winbindd_passdb.c rename to source3/winbindd/winbindd_passdb.c diff --git a/source3/nsswitch/winbindd_reconnect.c b/source3/winbindd/winbindd_reconnect.c similarity index 100% rename from source3/nsswitch/winbindd_reconnect.c rename to source3/winbindd/winbindd_reconnect.c diff --git a/source3/nsswitch/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c similarity index 100% rename from source3/nsswitch/winbindd_rpc.c rename to source3/winbindd/winbindd_rpc.c diff --git a/source3/nsswitch/winbindd_sid.c b/source3/winbindd/winbindd_sid.c similarity index 100% rename from source3/nsswitch/winbindd_sid.c rename to source3/winbindd/winbindd_sid.c diff --git a/source3/nsswitch/winbindd_sockinit.c b/source3/winbindd/winbindd_sockinit.c similarity index 100% rename from source3/nsswitch/winbindd_sockinit.c rename to source3/winbindd/winbindd_sockinit.c diff --git a/source3/nsswitch/winbindd_user.c b/source3/winbindd/winbindd_user.c similarity index 100% rename from source3/nsswitch/winbindd_user.c rename to source3/winbindd/winbindd_user.c diff --git a/source3/nsswitch/winbindd_util.c b/source3/winbindd/winbindd_util.c similarity index 100% rename from source3/nsswitch/winbindd_util.c rename to source3/winbindd/winbindd_util.c diff --git a/source3/nsswitch/winbindd_wins.c b/source3/winbindd/winbindd_wins.c similarity index 100% rename from source3/nsswitch/winbindd_wins.c rename to source3/winbindd/winbindd_wins.c -- 2.34.1