[SCM] Samba Shared Repository branch, v3-2-test, updated. initial-v3-2-unstable-17-gfbe5ede

[Guenther Deschner]

The branch, v3-2-test has been updated
       via  fbe5edec375c99421d19af086c4f597e70c963b8 (commit)
       via  6ae4066bbb59536852036394ffdb89121198a39f (commit)
      from  1bf4c7fb2012a81e0b4e3d601a4df42d1113f5ef (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fbe5edec375c99421d19af086c4f597e70c963b8
Merge: 6ae4066bbb59536852036394ffdb89121198a39f 1bf4c7fb2012a81e0b4e3d601a4df42d1113f5ef
Author: Guenther Deschner <gd at samba.org>
Date:   Thu Oct 11 15:18:50 2007 +0200

    Merge commit 'origin/v3-2-test' into my_branch

commit 6ae4066bbb59536852036394ffdb89121198a39f
Author: Guenther Deschner <gd at samba.org>
Date:   Thu Oct 11 15:12:12 2007 +0200

    Rename krb5 locator plugin to "winbind_krb5_locator".
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source/Makefile.in                                 |   10 +++++-----
 source/configure.in                                |    6 +++---
 .../{smb_krb5_locator.c => winbind_krb5_locator.c} |    0 
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename source/nsswitch/{smb_krb5_locator.c => winbind_krb5_locator.c} (100%)


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index 320c9bc..50ad4d6 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -917,8 +917,8 @@ LDBADD_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbadd.o
 LDBDEL_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbdel.o
 LDBMODIFY_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbmodify.o
 
-SMB_KRB5_LOCATOR_OBJ1 = nsswitch/smb_krb5_locator.o
-SMB_KRB5_LOCATOR_OBJ = $(SMB_KRB5_LOCATOR_OBJ1) $(WBCOMMON_OBJ) $(LIBREPLACE_OBJ) $(SOCKET_WRAPPER_OBJ)
+WINBIND_KRB5_LOCATOR_OBJ1 = nsswitch/winbind_krb5_locator.o
+WINBIND_KRB5_LOCATOR_OBJ = $(WINBIND_KRB5_LOCATOR_OBJ1) $(WBCOMMON_OBJ) $(LIBREPLACE_OBJ) $(SOCKET_WRAPPER_OBJ)
 
 POPT_OBJ=popt/findme.o popt/popt.o popt/poptconfig.o \
           popt/popthelp.o popt/poptparse.o
@@ -997,7 +997,7 @@ replacetort : SHOWFLAGS bin/replacetort at EXEEXT@
 timelimit : SHOWFLAGS bin/timelimit at EXEEXT@
 
 nsswitch : SHOWFLAGS bin/winbindd at EXEEXT@ bin/wbinfo at EXEEXT@ @WINBIND_NSS@ \
-	@WINBIND_WINS_NSS@ bin/pam_winbind. at SHLIBEXT@ @SMB_KRB5_LOCATOR@
+	@WINBIND_WINS_NSS@ bin/pam_winbind. at SHLIBEXT@ @WINBIND_KRB5_LOCATOR@
 
 wins : SHOWFLAGS @WINBIND_WINS_NSS@
 
@@ -1453,9 +1453,9 @@ bin/winbindd at EXEEXT@: $(BINARY_PREREQS) $(WINBINDD_OBJ) @BUILD_POPT@
 		$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) \
 		@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
 
-bin/smb_krb5_locator. at SHLIBEXT@: $(BINARY_PREREQS) $(SMB_KRB5_LOCATOR_OBJ)
+bin/winbind_krb5_locator. at SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ)
 	@echo "Linking $@"
-	@$(SHLD) $(LDSHFLAGS) -o $@ $(SMB_KRB5_LOCATOR_OBJ) \
+	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) \
 		@SONAMEFLAG@`basename $@`
 
 bin/pam_winbind. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ)
diff --git a/source/configure.in b/source/configure.in
index 6fb4687..bcb973a 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -3762,8 +3762,8 @@ if test x"$with_ads_support" != x"no"; then
   fi
   AC_CHECK_HEADERS(krb5/locate_plugin.h)
   if test x"$ac_cv_header_krb5_locate_plugin_h" = x"yes"; then
-	SMB_KRB5_LOCATOR="bin/smb_krb5_locator.$SHLIBEXT"
-	EXTRA_ALL_TARGETS="$EXTRA_ALL_TARGETS $SMB_KRB5_LOCATOR"
+	WINBIND_KRB5_LOCATOR="bin/winbind_krb5_locator.$SHLIBEXT"
+	EXTRA_ALL_TARGETS="$EXTRA_ALL_TARGETS $WINBIND_KRB5_LOCATOR"
   fi
 fi
 
@@ -6036,7 +6036,7 @@ AC_SUBST(WINBIND_NSS_EXTRA_OBJS)
 AC_SUBST(WINBIND_NSS_EXTRA_LIBS)
 AC_SUBST(NSSSONAMEVERSIONSUFFIX)
 
-AC_SUBST(SMB_KRB5_LOCATOR)
+AC_SUBST(WINBIND_KRB5_LOCATOR)
 
 # Check the setting of --with-winbind
 
diff --git a/source/nsswitch/smb_krb5_locator.c b/source/nsswitch/winbind_krb5_locator.c
similarity index 100%
rename from source/nsswitch/smb_krb5_locator.c
rename to source/nsswitch/winbind_krb5_locator.c


-- 
Samba Shared Repository