in head as well ...

renamed ntdom to winbind
I think that using winbind in /etc/nsswitch.conf is better than ntdom

diff --git a/source/Makefile.in b/source/Makefile.in
index fa497c62f911fac28472d08384af93b4ebe41f94..840d8c4b522b083290625679bb89e539135858a0 100644 (file)
--- a/source/Makefile.in
+++ b/source/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/source/nsswitch/common.c b/source/nsswitch/common.c
index be0b24cc5d898a42960d17004f909d9107b68a57..9719f073852f782307b0f9f3bcf278e086bce60f 100644 (file)
--- a/source/nsswitch/common.c
+++ b/source/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/source/nsswitch/pam_winbind.c b/source/nsswitch/pam_winbind.c
index 549d8c9a8a8ccd4add6ca743b8d6711d0b4cbab2..ece504411b35b6f550eac34faff54b4d6f4fb3d9 100644 (file)
--- a/source/nsswitch/pam_winbind.c
+++ b/source/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/source/nsswitch/winbind_nss.c b/source/nsswitch/winbind_nss.c
index 48dc1882b3c8cebe0a59cff64f8577434e0bf1ae..5c6227286dca9a065a88bf645368273fca110f56 100644 (file)
--- a/source/nsswitch/winbind_nss.c
+++ b/source/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/source/nsswitch/winbindd.h b/source/nsswitch/winbindd.h
index 706a1fcc704719e0b636456c1638517da7c7dfa3..d333b32bcfc06b9613ba7ff891a39685a1560954 100644 (file)
--- a/source/nsswitch/winbindd.h
+++ b/source/nsswitch/winbindd.h
@@ -28,7 +28,7 @@
 #include "includes.h"
 #include "nterr.h"
 
-#include "winbindd_ntdom.h"
+#include "winbindd_nss.h"
 
 /* Naughty global stuff */