summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuenther Deschner <gd@samba.org>2007-10-11 15:12:12 +0200
committerGuenther Deschner <gd@samba.org>2007-10-11 15:12:12 +0200
commit6b441e9e74b11bee4b661eaa17682d6351c264ff (patch)
tree6262cac300e57ab244aea99abf6a498aace955bc
parent31152a498191f2dba07d730ed176fc59e8bd48ca (diff)
downloadsamba-6b441e9e74b11bee4b661eaa17682d6351c264ff.tar.gz
samba-6b441e9e74b11bee4b661eaa17682d6351c264ff.tar.bz2
samba-6b441e9e74b11bee4b661eaa17682d6351c264ff.zip
Rename krb5 locator plugin to "winbind_krb5_locator".
Guenther (This used to be commit 6ae4066bbb59536852036394ffdb89121198a39f)
-rw-r--r--source3/Makefile.in10
-rw-r--r--source3/configure.in6
-rw-r--r--source3/nsswitch/winbind_krb5_locator.c (renamed from source3/nsswitch/smb_krb5_locator.c)0
3 files changed, 8 insertions, 8 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 320c9bceef..50ad4d6f09 100644
--- a/source3/Makefile.in
+++ b/source3/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@EXEEXT@
timelimit : SHOWFLAGS bin/timelimit@EXEEXT@
nsswitch : SHOWFLAGS bin/winbindd@EXEEXT@ bin/wbinfo@EXEEXT@ @WINBIND_NSS@ \
- @WINBIND_WINS_NSS@ bin/pam_winbind.@SHLIBEXT@ @SMB_KRB5_LOCATOR@
+ @WINBIND_WINS_NSS@ bin/pam_winbind.@SHLIBEXT@ @WINBIND_KRB5_LOCATOR@
wins : SHOWFLAGS @WINBIND_WINS_NSS@
@@ -1453,9 +1453,9 @@ bin/winbindd@EXEEXT@: $(BINARY_PREREQS) $(WINBINDD_OBJ) @BUILD_POPT@
$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) \
@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
-bin/smb_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) $(SMB_KRB5_LOCATOR_OBJ)
+bin/winbind_krb5_locator.@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.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ)
diff --git a/source3/configure.in b/source3/configure.in
index db4e068524..a5f817ba68 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3751,8 +3751,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
@@ -6025,7 +6025,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/source3/nsswitch/smb_krb5_locator.c b/source3/nsswitch/winbind_krb5_locator.c
index 18a9fe3429..18a9fe3429 100644
--- a/source3/nsswitch/smb_krb5_locator.c
+++ b/source3/nsswitch/winbind_krb5_locator.c