From 4f21301ea65886f3ad73706ea63d06912d899ad1 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 10 May 2000 14:17:21 +0000
Subject: in head as well ...

renamed ntdom to winbind
I think that using winbind in /etc/nsswitch.conf is better than ntdom
(This used to be commit 80f85b5359c26dc26f8f88b984f27cfa4ac34e61)
---
 source3/Makefile.in            | 10 +++++-----
 source3/nsswitch/common.c      |  4 ++--
 source3/nsswitch/pam_winbind.c |  4 ++--
 source3/nsswitch/winbind_nss.c |  4 ++--
 source3/nsswitch/winbindd.h    |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'source3')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index fa497c62f9..840d8c4b52 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -313,9 +313,9 @@ WINBINDD_OBJ = \
 		$(LIBNMB_OBJ) $(PARAM_OBJ) $(UBIQX_OBJ) $(LIB_OBJ) \
 		$(NSSWINS_OBJ) $(SIDDB_OBJ) $(LIBSMB_OBJ)
 
-NTDOM_OBJ = nsswitch/ntdom.o nsswitch/common.o
+WINBIND_NSS_OBJ = nsswitch/winbind.o nsswitch/common.o
 
-NTDOM_PICOBJS = $(NTDOM_OBJ:.o=.po)
+WINBIND_NSS_PICOBJS = $(WINBIND_NSS_OBJ:.o=.po)
 
 
 ######################################################################
@@ -538,15 +538,15 @@ bin/winbindd: $(WINBINDD_OBJ) bin/.dummy
 	@echo Linking $@
 	@$(LINK) -o $@ $(WINBINDD_OBJ) $(LIBS)
 
-nsswitch/libnss_ntdom.so: $(NTDOM_PICOBJS)
+nsswitch/libnss_winbind.so: $(WINBIND_NSS_PICOBJS)
 	@echo "Linking $@"
-	@$(LINK) -shared -o $@ $(NTDOM_PICOBJS)
+	@$(LINK) -shared -o $@ $(WINBIND_NSS_PICOBJS)
 
 nsswitch/pam_winbind.so: $(PAM_WINBIND_OBJ) bin/.dummy
 	@echo Linking $@
 	@$(LINK) -shared -o $@ $(PAM_WINBIND_OBJ)
 
-nsswitch: nsswitch/libnss_wins.so nsswitch/pam_winbind.so nsswitch/libnss_ntdom.so
+nsswitch: nsswitch/libnss_wins.so nsswitch/pam_winbind.so nsswitch/libnss_winbind.so
 
 install: installbin installman installscripts installcp installswat
 
diff --git a/source3/nsswitch/common.c b/source3/nsswitch/common.c
index be0b24cc5d..9719f07385 100644
--- a/source3/nsswitch/common.c
+++ b/source3/nsswitch/common.c
@@ -23,8 +23,8 @@
    Boston, MA  02111-1307, USA.   
 */
 
-#include "ntdom_config.h"
-#include "winbindd_ntdom.h"
+#include "winbind_nss_config.h"
+#include "winbindd_nss.h"
 
 /* Global variables.  These are effectively the client state information */
 
diff --git a/source3/nsswitch/pam_winbind.c b/source3/nsswitch/pam_winbind.c
index 549d8c9a8a..ece504411b 100644
--- a/source3/nsswitch/pam_winbind.c
+++ b/source3/nsswitch/pam_winbind.c
@@ -26,8 +26,8 @@
 #define PAM_USE_AUTHTOK_ARG (1<<1)
 #define PAM_UNKNOWN_OK_ARG (1<<2)
 
-#include "ntdom_config.h"
-#include "winbindd_ntdom.h"
+#include "winbind_nss_config.h"
+#include "winbindd_nss.h"
 
 /* prototypes from common.c */
 void init_request(struct winbindd_request *req,int rq_type);
diff --git a/source3/nsswitch/winbind_nss.c b/source3/nsswitch/winbind_nss.c
index 48dc1882b3..5c6227286d 100644
--- a/source3/nsswitch/winbind_nss.c
+++ b/source3/nsswitch/winbind_nss.c
@@ -22,8 +22,8 @@
    Boston, MA  02111-1307, USA.   
 */
 
-#include "ntdom_config.h"
-#include "winbindd_ntdom.h"
+#include "winbind_nss_config.h"
+#include "winbindd_nss.h"
 
 /* prototypes from common.c */
 void init_request(struct winbindd_request *req,int rq_type);
diff --git a/source3/nsswitch/winbindd.h b/source3/nsswitch/winbindd.h
index 706a1fcc70..d333b32bcf 100644
--- a/source3/nsswitch/winbindd.h
+++ b/source3/nsswitch/winbindd.h
@@ -28,7 +28,7 @@
 #include "includes.h"
 #include "nterr.h"
 
-#include "winbindd_ntdom.h"
+#include "winbindd_nss.h"
 
 /* Naughty global stuff */
 
-- 
cgit