forked from Lainports/freebsd-ports
43160f58a8
o Fix update of machine account passwords.
o Fix SMB signing issue on Windows Vista with MS Hotfix KB955302.
o Fix Winbind crashes.
o Correctly detect if the current dc is the closest one.
o Add saf_join_store() function to memorize the dc used at join time.
This avoids problems caused by replication delays shortly after domain
joins.
o Fix write list in setups using "security = share".
42 lines
1.6 KiB
Text
42 lines
1.6 KiB
Text
--- Makefile.in.orig 2009-01-19 10:40:09.000000000 +0000
|
|
+++ Makefile.in 2009-01-20 15:50:59.000000000 +0000
|
|
@@ -91,7 +91,7 @@
|
|
# These can be overridden by command line switches (see smbd(8))
|
|
# or in smb.conf (see smb.conf(5))
|
|
LOGFILEBASE = @logfilebase@
|
|
-CONFIGFILE = $(CONFIGDIR)/smb.conf
|
|
+CONFIGFILE = $(CONFIGDIR)/%%SAMBA_CONFIG%%
|
|
LMHOSTSFILE = $(CONFIGDIR)/lmhosts
|
|
|
|
# This is where smbpasswd et al go
|
|
@@ -424,6 +424,7 @@
|
|
VFS_HPUXACL_OBJ = modules/vfs_hpuxacl.o
|
|
VFS_IRIXACL_OBJ = modules/vfs_irixacl.o
|
|
VFS_TRU64ACL_OBJ = modules/vfs_tru64acl.o
|
|
+VFS_ZFSACL_OBJ = modules/vfs_zfsacl.o
|
|
VFS_CATIA_OBJ = modules/vfs_catia.o
|
|
VFS_CACHEPRIME_OBJ = modules/vfs_cacheprime.o
|
|
VFS_PREALLOC_OBJ = modules/vfs_prealloc.o
|
|
@@ -748,8 +749,8 @@
|
|
$(RPC_NTSVCS_OBJ) $(RPC_INITSHUTDOWN_OBJ) utils/passwd_util.o \
|
|
$(LIBGPO_OBJ) $(NSS_INFO_OBJ)
|
|
|
|
-WINBIND_WINS_NSS_OBJ = nsswitch/wins.o $(PARAM_OBJ) \
|
|
- $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ) $(SECRETS_OBJ)
|
|
+WINBIND_WINS_NSS_OBJ = $(PARAM_OBJ) $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) \
|
|
+ $(NSSWINS_OBJ) $(KRBCLIENT_OBJ) $(SECRETS_OBJ) @WINBIND_WINS_NSS_EXTRA_OBJS@
|
|
|
|
PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
|
|
pam_smbpass/pam_smb_acct.o pam_smbpass/support.o
|
|
@@ -1484,6 +1485,11 @@
|
|
@$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_TRU64ACL_OBJ) \
|
|
@SONAMEFLAG@`basename $@`
|
|
|
|
+bin/zfsacl.@SHLIBEXT@: $(VFS_ZFSACL_OBJ)
|
|
+ @echo "Building plugin $@"
|
|
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_ZFSACL_OBJ) \
|
|
+ @SONAMEFLAG@`basename $@`
|
|
+
|
|
bin/catia.@SHLIBEXT@: proto_exists $(VFS_CATIA_OBJ)
|
|
@echo "Building plugin $@"
|
|
@$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_CATIA_OBJ) \
|