Merge branch 'v3-2-stable' into my_branch
authorJelmer Vernooij <jelmer@samba.org>
Fri, 12 Oct 2007 17:41:01 +0000 (19:41 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 12 Oct 2007 17:41:01 +0000 (19:41 +0200)
(This used to be commit 754671b8be0bf73a9e1fe7ff420a1b7a1cd501b7)

1  2 
source3/Makefile.in

diff --combined source3/Makefile.in
index 50ad4d6f0945d5dbbb4635cdb7b587f5f2ff6422,d22542784b03f134a345bb7f410f463dde395893..ea1b69b45cd53ef0fdcebdd8468d8307945d6697
@@@ -917,8 -917,8 +917,8 @@@ LDBADD_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb
  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 +997,7 @@@ replacetort : SHOWFLAGS bin/replacetort
  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 +1453,9 @@@ bin/winbindd@EXEEXT@: $(BINARY_PREREQS
                $(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)
@@@ -2028,7 -2028,7 +2028,7 @@@ test: all torture timelimi
  
  valgrindtest: all torture timelimit
        @echo Running Test suite with valgrind
-       @NMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30" \
+       @NMBD_VALGRIND="xterm -n nmbd -e valgrind -q --db-attach=yes --num-callers=30" \
         SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30" \
         VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/st/valgrind.log" \
         $(srcdir)/script/tests/selftest.sh ${selftest_prefix}/st all "${smbtorture4_path}"