You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
395 lines
20 KiB
395 lines
20 KiB
Index: source/Makefile.in |
|
--- source/Makefile.in.orig 2006-11-14 15:42:15 +0100 |
|
+++ source/Makefile.in 2006-12-10 17:12:55 +0100 |
|
@@ -86,7 +86,7 @@ |
|
# or in smb.conf (see smb.conf(5)) |
|
LOGFILEBASE = @logfilebase@ |
|
CONFIGFILE = $(CONFIGDIR)/smb.conf |
|
-LMHOSTSFILE = $(CONFIGDIR)/lmhosts |
|
+LMHOSTSFILE = $(CONFIGDIR)/smb.hosts |
|
|
|
# This is where smbpasswd et al go |
|
PRIVATEDIR = @privatedir@ |
|
@@ -922,46 +922,46 @@ |
|
@echo Linking $@ |
|
@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) \ |
|
$(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \ |
|
- $(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) @POPTLIBS@ @SMBD_LIBS@ |
|
+ $(ACL_LIBS) $(PASSDB_LIBS) @POPTLIBS@ @SMBD_LIBS@ $(LIBS) |
|
|
|
bin/nmbd@EXEEXT@: $(NMBD_OBJ) @BUILD_POPT@ bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) |
|
|
|
bin/swat@EXEEXT@: $(SWAT_OBJ) @BUILD_POPT@ bin/.dummy |
|
@echo Linking $@ |
|
@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SWAT_OBJ) $(LDFLAGS) $(DYNEXP) $(PRINT_LIBS) \ |
|
- $(AUTH_LIBS) $(LIBS) $(PASSDB_LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) |
|
+ $(AUTH_LIBS) $(PASSDB_LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) |
|
|
|
bin/rpcclient@EXEEXT@: $(RPCCLIENT_OBJ) @BUILD_POPT@ bin/.dummy |
|
@echo Linking $@ |
|
@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(PASSDB_LIBS) $(RPCCLIENT_OBJ) \ |
|
- $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ \ |
|
- $(KRB5LIBS) $(LDAP_LIBS) |
|
+ $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) @POPTLIBS@ \ |
|
+ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) |
|
|
|
bin/smbclient@EXEEXT@: $(CLIENT_OBJ) @BUILD_POPT@ bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) |
|
|
|
bin/smbctool@EXEEXT@: $(TOOL_OBJ) @BUILD_POPT@ bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(TOOL_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) -Lbin -lsmbclient |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(TOOL_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) -Lbin -lsmbclient $(LIBS) |
|
|
|
bin/net@EXEEXT@: $(NET_OBJ) @BUILD_POPT@ bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) |
|
|
|
bin/profiles@EXEEXT@: $(PROFILES_OBJ) @BUILD_POPT@ bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@ $(LIBS) |
|
|
|
bin/smbspool@EXEEXT@: $(CUPS_OBJ) bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) |
|
|
|
bin/smbmount@EXEEXT@: $(MOUNT_OBJ) bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) |
|
|
|
bin/smbmnt@EXEEXT@: $(MNT_OBJ) bin/.dummy |
|
@echo Linking $@ |
|
@@ -981,47 +981,47 @@ |
|
|
|
bin/testparm@EXEEXT@: $(TESTPARM_OBJ) @BUILD_POPT@ bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) @POPTLIBS@ $(LIBS) |
|
|
|
bin/smbstatus@EXEEXT@: $(STATUS_OBJ) @BUILD_POPT@ bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ |
|
- @POPTLIBS@ |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP) \ |
|
+ @POPTLIBS@ $(LIBS) |
|
|
|
bin/smbcontrol@EXEEXT@: $(SMBCONTROL_OBJ) @BUILD_POPT@ bin/.dummy |
|
@echo Linking $@ |
|
@$(CC) -DUSING_SMBCONTROL $(FLAGS) @PIE_LDFLAGS@ -o $@ \ |
|
$(SMBCONTROL_OBJ) $(DYNEXP) $(LDFLAGS) \ |
|
- $(LIBS) @LIBUNWIND_PTRACE@ @POPTLIBS@ |
|
+ @LIBUNWIND_PTRACE@ @POPTLIBS@ $(LIBS) |
|
|
|
bin/smbtree@EXEEXT@: $(SMBTREE_OBJ) @BUILD_POPT@ bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBTREE_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBTREE_OBJ) $(LDFLAGS) $(DYNEXP) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) |
|
|
|
bin/smbpasswd@EXEEXT@: $(SMBPASSWD_OBJ) @BUILD_POPT@ bin/.dummy |
|
@echo Linking $@ |
|
@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBPASSWD_OBJ) $(LDFLAGS) $(PASSDB_LIBS) \ |
|
- $(DYNEXP) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) |
|
+ $(DYNEXP) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) |
|
|
|
bin/pdbedit@EXEEXT@: $(PDBEDIT_OBJ) @BUILD_POPT@ bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(PASSDB_LIBS) $(LDAP_LIBS) |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) @POPTLIBS@ $(PASSDB_LIBS) $(LDAP_LIBS) $(LIBS) |
|
|
|
bin/smbget@EXEEXT@: $(SMBGET_OBJ) @BUILD_POPT@ bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(LIBS) |
|
|
|
bin/samtest@EXEEXT@: $(SAMTEST_OBJ) @BUILD_POPT@ bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SAMTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(PASSDB_LIBS) $(KRB5LIBS) $(LDAP_LIBS) |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SAMTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) @POPTLIBS@ $(PASSDB_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) |
|
|
|
bin/nmblookup@EXEEXT@: $(NMBLOOKUP_OBJ) @BUILD_POPT@ bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(LDAP_LIBS) |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) @POPTLIBS@ $(LDAP_LIBS) $(LIBS) |
|
|
|
bin/smbtorture@EXEEXT@: $(SMBTORTURE_OBJ) bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(DYNEXP) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) |
|
|
|
bin/talloctort@EXEEXT@: $(TALLOCTORT_OBJ) bin/.dummy |
|
@echo Linking $@ |
|
@@ -1029,41 +1029,41 @@ |
|
|
|
bin/masktest@EXEEXT@: $(MASKTEST_OBJ) bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) |
|
|
|
bin/msgtest@EXEEXT@: $(MSGTEST_OBJ) bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) |
|
|
|
bin/smbcacls@EXEEXT@: $(SMBCACLS_OBJ) @BUILD_POPT@ bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCACLS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ \ |
|
- $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCACLS_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@ \ |
|
+ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(LIBS) |
|
|
|
bin/smbcquotas@EXEEXT@: $(SMBCQUOTAS_OBJ) @BUILD_POPT@ bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ \ |
|
- $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@ \ |
|
+ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(LIBS) |
|
|
|
bin/eventlogadm@EXEEXT@: $(EVTLOGADM_OBJ) @BUILD_POPT@ bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@ $(LIBS) |
|
|
|
bin/locktest@EXEEXT@: $(LOCKTEST_OBJ) bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) |
|
|
|
bin/nsstest@EXEEXT@: $(NSSTEST_OBJ) bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) |
|
|
|
bin/vfstest@EXEEXT@: $(VFSTEST_OBJ) @BUILD_POPT@ bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(ACL_LIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) @SMBD_LIBS@ $(NSCD_LIBS) |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(ACL_LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) @SMBD_LIBS@ $(NSCD_LIBS) $(LIBS) |
|
|
|
bin/smbiconv@EXEEXT@: $(SMBICONV_OBJ) @BUILD_POPT@ bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBICONV_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(LIBS) @POPTLIBS@ |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBICONV_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) @POPTLIBS@ $(LIBS) |
|
|
|
bin/log2pcap@EXEEXT@: $(LOG2PCAP_OBJ) @BUILD_POPT@ bin/.dummy |
|
@echo Linking $@ |
|
@@ -1071,11 +1071,11 @@ |
|
|
|
bin/locktest2@EXEEXT@: $(LOCKTEST2_OBJ) bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(DYNEXP) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) |
|
|
|
bin/rpctorture@EXEEXT@: $(RPCTORTURE_OBJ) bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(RPCTORTURE_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(RPCTORTURE_OBJ) $(DYNEXP) $(LDFLAGS) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) |
|
|
|
bin/debug2html@EXEEXT@: $(DEBUG2HTML_OBJ) bin/.dummy |
|
@echo Linking $@ |
|
@@ -1083,11 +1083,11 @@ |
|
|
|
bin/smbfilter@EXEEXT@: $(SMBFILTER_OBJ) bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) |
|
|
|
bin/smbw_sample@EXEEXT@: $(SMBW_OBJ) utils/smbw_sample.o bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBW_OBJ) utils/smbw_sample.o $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBW_OBJ) utils/smbw_sample.o $(LDFLAGS) $(DYNEXP) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) |
|
|
|
bin/smbsh@EXEEXT@: $(SMBSH_OBJ) bin/.dummy |
|
@echo Linking $@ |
|
@@ -1095,15 +1095,15 @@ |
|
|
|
bin/smbwrapper.@SHLIBEXT@: $(PICOBJS) bin/.dummy |
|
@echo Linking shared library $@ |
|
- @$(SHLD) $(LDSHFLAGS) -o $@ $(PICOBJS) $(LIBS) \ |
|
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(PICOBJS) \ |
|
$(KRB5LIBS) $(LDAP_LIBS) \ |
|
- @SONAMEFLAG@`basename $@` |
|
+ @SONAMEFLAG@`basename $@` $(LIBS) |
|
|
|
bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS) |
|
@echo Linking libsmbclient shared library $@ |
|
- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \ |
|
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) \ |
|
$(KRB5LIBS) $(LDAP_LIBS) \ |
|
- @SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR) |
|
+ @SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR) $(LIBS) |
|
|
|
bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS) |
|
@echo Linking libsmbclient non-shared library $@ |
|
@@ -1111,9 +1111,9 @@ |
|
|
|
bin/libsmbsharemodes.@SHLIBEXT@: $(LIBSMBSHAREMODES_PICOBJS) |
|
@echo Linking libsmbsharemodes shared library $@ |
|
- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBSHAREMODES_PICOBJS) $(LDFLAGS) $(LIBS) \ |
|
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBSHAREMODES_PICOBJS) $(LDFLAGS) \ |
|
$(KRB5LIBS) $(LDAP_LIBS) \ |
|
- @SONAMEFLAG@`basename $@`.$(LIBSMBSHAREMODES_MAJOR) |
|
+ @SONAMEFLAG@`basename $@`.$(LIBSMBSHAREMODES_MAJOR) $(LIBS) |
|
|
|
bin/libsmbsharemodes.a: $(LIBSMBSHAREMODES_PICOBJS) |
|
@echo Linking libsmbsharemodes non-shared library $@ |
|
@@ -1121,8 +1121,8 @@ |
|
|
|
bin/libmsrpc.@SHLIBEXT@: $(CAC_PICOBJS) |
|
@echo Linking libmsrpc shared library $@ |
|
- @$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_PICOBJS) $(LDFLAGS) $(LIBS) \ |
|
- @SONAMEFLAG@`basename $@`.$(LIBMSRPC_MAJOR) |
|
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_PICOBJS) $(LDFLAGS) \ |
|
+ @SONAMEFLAG@`basename $@`.$(LIBMSRPC_MAJOR) $(LIBS) |
|
|
|
bin/libmsrpc.a: $(CAC_PICOBJS) |
|
@echo Linking libmsrpc non-shared library $@ |
|
@@ -1131,9 +1131,9 @@ |
|
# This is probably wrong for anything other than the GNU linker. |
|
bin/libbigballofmud.@SHLIBEXT@: $(LIBBIGBALLOFMUD_PICOBJS) |
|
@echo Linking bigballofmud shared library $@ |
|
- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_PICOBJS) $(LIBS) \ |
|
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_PICOBJS) \ |
|
$(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \ |
|
- @SONAMEFLAG@`basename $@`.$(LIBBIGBALLOFMUD_MAJOR) |
|
+ @SONAMEFLAG@`basename $@`.$(LIBBIGBALLOFMUD_MAJOR) $(LIBS) |
|
ln -snf libbigballofmud.so bin/libbigballofmud.so.0 |
|
|
|
# It would be nice to build a static bigballofmud too, but when I try |
|
@@ -1212,8 +1212,8 @@ |
|
|
|
bin/winbindd@EXEEXT@: $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy |
|
@echo "Linking $@" |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(WINBINDD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ |
|
- @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(WINBINDD_OBJ) $(LDFLAGS) $(DYNEXP) \ |
|
+ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(LIBS) |
|
|
|
# Please don't add .o files to libnss_winbind, libnss_wins, or the pam_winbind |
|
# libraries. Add to the appropriate PICOBJ variable instead. |
|
@@ -1375,54 +1375,54 @@ |
|
|
|
bin/wbinfo@EXEEXT@: $(WBINFO_OBJ) @BUILD_POPT@ bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP) $(LIBS) @POPTLIBS@ |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP) @POPTLIBS@ $(LIBS) |
|
|
|
bin/ntlm_auth@EXEEXT@: $(NTLM_AUTH_OBJ) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \ |
|
@BUILD_POPT@ bin/.dummy |
|
@echo Linking $@ |
|
@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP) $(NTLM_AUTH_OBJ) \ |
|
- $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBS) \ |
|
- @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) |
|
+ $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \ |
|
+ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(LIBS) |
|
|
|
bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_PICOOBJ) |
|
@echo "Linking shared library $@" |
|
- @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(KRB5LIBS) |
|
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) $(LDAP_LIBS) $(KRB5LIBS) $(LIBS) |
|
|
|
bin/tdbbackup@EXEEXT@: $(TDBBACKUP_OBJ) bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS) $(TDBBACKUP_OBJ) @SOCKWRAP@ |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP) $(TDBBACKUP_OBJ) @SOCKWRAP@ $(LIBS) |
|
|
|
bin/tdbtool@EXEEXT@: $(TDBTOOL_OBJ) bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS) $(TDBTOOL_OBJ) @SOCKWRAP@ |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP) $(TDBTOOL_OBJ) @SOCKWRAP@ $(LIBS) |
|
|
|
bin/tdbdump@EXEEXT@: $(TDBDUMP_OBJ) bin/.dummy |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS) $(TDBDUMP_OBJ) @SOCKWRAP@ |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP) $(TDBDUMP_OBJ) @SOCKWRAP@ $(LIBS) |
|
|
|
bin/t_strcmp@EXEEXT@: bin/libbigballofmud.@SHLIBEXT@ torture/t_strcmp.o |
|
- $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS) torture/t_strcmp.o -L ./bin -lbigballofmud |
|
+ $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) torture/t_strcmp.o -L ./bin -lbigballofmud $(LIBS) |
|
|
|
bin/t_strstr@EXEEXT@: bin/libbigballofmud.@SHLIBEXT@ torture/t_strstr.o |
|
- $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS) torture/t_strstr.o -L ./bin -lbigballofmud |
|
+ $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) torture/t_strstr.o -L ./bin -lbigballofmud $(LIBS) |
|
|
|
bin/t_strappend@EXEEXT@: bin/libbigballofmud.@SHLIBEXT@ torture/t_strappend.o |
|
- $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS) torture/t_strappend.o -L ./bin -lbigballofmud |
|
+ $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) torture/t_strappend.o -L ./bin -lbigballofmud $(LIBS) |
|
|
|
bin/t_stringoverflow@EXEEXT@: bin/libbigballofmud.@SHLIBEXT@ torture/t_stringoverflow.o |
|
- $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) torture/t_stringoverflow.o -L./bin -lbigballofmud |
|
+ $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) torture/t_stringoverflow.o -L./bin -lbigballofmud $(LIBS) |
|
|
|
bin/t_doschar@EXEEXT@: bin/libbigballofmud.@SHLIBEXT@ torture/t_doschar.o |
|
- $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS) torture/t_doschar.o -L ./bin -lbigballofmud |
|
+ $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP)torture/t_doschar.o -L ./bin -lbigballofmud $(LIBS) |
|
bin/t_push_ucs2@EXEEXT@: bin/libbigballofmud.@SHLIBEXT@ torture/t_push_ucs2.o |
|
- $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS) torture/t_push_ucs2.o -L ./bin -lbigballofmud |
|
+ $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) torture/t_push_ucs2.o -L ./bin -lbigballofmud $(LIBS) |
|
|
|
bin/t_snprintf@EXEEXT@: lib/snprintf.c |
|
- $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) -DTEST_SNPRINTF lib/snprintf.c -lm |
|
+ $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) -DTEST_SNPRINTF lib/snprintf.c -lm $(LIBS) |
|
|
|
bin/timelimit@EXEEXT@: script/tests/timelimit.o |
|
@echo Linking $@ |
|
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) script/tests/timelimit.o |
|
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) script/tests/timelimit.o $(LIBS) |
|
|
|
install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@ |
|
|
|
@@ -1513,7 +1513,7 @@ |
|
fi |
|
PYTHON_OBJS="$(PYTHON_PICOBJS)" \ |
|
PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS) $(FLAGS)" \ |
|
- LIBS="$(LDFLAGS) $(LIBS) $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS)" \ |
|
+ LIBS="$(LDFLAGS) $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)" \ |
|
$(PYTHON) python/setup.py build |
|
|
|
python_install: $(PYTHON_PICOBJS) |
|
Index: source/lib/sysquotas_4A.c |
|
--- source/lib/sysquotas_4A.c.orig 2005-09-29 23:52:43 +0200 |
|
+++ source/lib/sysquotas_4A.c 2006-12-10 17:08:04 +0100 |
|
@@ -72,6 +72,10 @@ |
|
#define dqb_curinodes dqb_curfiles |
|
#endif |
|
|
|
+#if defined(_LINUX_QUOTA_VERSION) && _LINUX_QUOTA_VERSION-0 >= 2 |
|
+#define dqb_curblocks dqb_curspace |
|
+#endif |
|
+ |
|
#ifdef INITQFNAMES |
|
#define USERQUOTAFILE_EXTENSION ".user" |
|
#else |
|
Index: source/nsswitch/winbindd_util.c |
|
--- source/nsswitch/winbindd_util.c.orig 2006-11-14 15:42:13 +0100 |
|
+++ source/nsswitch/winbindd_util.c 2006-12-10 17:08:04 +0100 |
|
@@ -935,7 +935,7 @@ |
|
{ |
|
if (_winbindd_priv_socket == -1) { |
|
_winbindd_priv_socket = create_pipe_sock( |
|
- get_winbind_priv_pipe_dir(), WINBINDD_SOCKET_NAME, 0750); |
|
+ get_winbind_priv_pipe_dir(), WINBINDD_SOCKET_NAME, 0755); |
|
DEBUG(10, ("open_winbindd_priv_socket: opened socket fd %d\n", |
|
_winbindd_priv_socket)); |
|
} |
|
Index: source/smbd/uid.c |
|
--- source/smbd/uid.c.orig 2006-04-20 04:29:19 +0200 |
|
+++ source/smbd/uid.c 2006-12-10 17:08:04 +0100 |
|
@@ -152,6 +152,10 @@ |
|
BOOL must_free_token = False; |
|
NT_USER_TOKEN *token = NULL; |
|
|
|
+ if (vuser) |
|
+ DEBUG(9,("change_to_user: SMB user \"%s\" (unix user \"%s\", vuid %d)\n", |
|
+ vuser->user.smb_name ? vuser->user.smb_name : "?", vuser->user.unix_name ? vuser->user.unix_name : "?", vuid)); |
|
+ |
|
if (!conn) { |
|
DEBUG(2,("change_to_user: Connection not open\n")); |
|
return(False);
|
|
|