Date: Mon, 21 May 2007 15:28:14 +0200 From: "Timur I. Bakeyev" <timur@gnu.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/112836: MAINTAINER-UPDATE: net/samba3 to 3.0.25 + SECURITY FIXES Message-ID: <20070521132808.GA4679@com.bat.ru> Resent-Message-ID: <200705211430.l4LEU8px059965@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 112836
>Category: ports
>Synopsis: MAINTAINER-UPDATE: net/samba3 to 3.0.25 + SECURITY FIXES
>Confidential: no
>Severity: critical
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon May 21 14:30:08 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Timur I. Bakeyev
>Release: FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD build-62 6.2-STABLE FreeBSD 6.2-STABLE #1: Thu Mar 22 13:39:14 CET 2007 root@build-62:/usr/src/sys/i386/compile/COMMON32 i386
>Description:
An update of net/samba3 to the 3.0.25 version plus security fixes.
Major features included in the 3.0.25 code base are:
o Significant improvements in the winbind off-line logon support.
o Support for secure DDNS updates as part of the 'net ads join'
process.
o Rewritten IdMap interface which allows for TTL based caching and
per domain backends.
o New plug-in interface for the "winbind nss info" parameter.
o New file change notify subsystem which is able to make use of
inotify on Linux.
o Support for passing Windows security descriptors to a VFS
plug-in allowing for multiple Unix ACL implements to running side
by side on the Same server.
o Improved compatibility with Windows Vista clients including
improved read performance with Linux servers.
o Man pages for IdMap and VFS plug-ins.
Security Fixes included in the Samba 3.0.25 release are:
o CVE-2007-2444
Versions: Samba 3.0.23d - 3.0.25pre2
Local SID/Name translation bug can result in
user privilege elevation
o CVE-2007-2446
Versions: Samba 3.0.0 - 3.0.24
Multiple heap overflows allow remote code execution
o CVE-2007-2447
Versions: Samba 3.0.0 - 3.0.24
Unescaped user input parameters are passed as
arguments to /bin/sh allowing for remote command
execution
>How-To-Repeat:
UPDATING:
20070514:
AFFECTS: users of net/samba3, japanese/samba3
AUTHOR: timur@gnu.org
ATTENTION! Besides security fixes this version of Samba3 significantly
changes a lot of options and behavior of Samba. Please, read WHATSNEW.txt
and other port documentation before upgrading production systems.
Off-line Logons and AD Site Support
===================================
Winbind's capability to support offline logons has been greatly
improved with the 3.0.25 release including support for locating
domain controllers asynchronously using Active Directory Site
information.
New IdMap Interface for Winbindd
================================
The 3.0.25 release of Samba includes a rewritten IdMap interface
for winbindd which replaces the "idmap backend" parameter. Please
refer to the "idmap domains" description in the smb.conf(5) man
page for more details.
Dynamic DNS Updates
===================
The "net ads join" command is now able to register the host's DNS A
records with Windows 2000 SP4 and 2003 DNS servers. This
feature must be enabled at compile time using the --with-dnsupdate
when running the ./configure script. There is also a related "net ads
dns" command for refreshing a host's records which could be launched
from a dhcp client script when a new IP address is obtained.
Support for Additional ACL Modules
==================================
Samba's POSIX ACL support has been moved inside of the VFS layer
which means it is now possible to support multiple ACL implementations
on the same server including NFSv4 and GPFS ACLs.
VFS ReadAhead Plugin
====================
Windows Vista introduces pipe-lined read support for improved
performance when transferring files. The new vfs_readahead plugin
allows Linux file servers to utilize additional Kernel buffers
for caching files in order to avoid Disk I/O wait time when serving
Vista clients. If you experience poor read performance between
Linux servers and Vista clients, please test the vfs_readahead
module by adding the following lines to the share definition
in smb.conf:
[file_share]
vfs objects = readahead
Note that this plugin will result in additional RAM requirements
due to the increased amount of kernel buffer caches used by smbd.
Please refer to vfs_readahead(8) for more information.
Windows Vista, Office 2007, and Offline Files
=============================================
Research surrounding offline files, Windows Vista, and Microsoft
Office 2007 has revealed a incompatibility between these
applications and the "map acl inherit = no" setting in smb.conf.
Users requiring support client side caching (csc) and offline
files are encouraged to enable the "map acl inherit" for any
affected share definitions in the server's configuration.
Future versions of Samba will enable this setting by default.
Please refer to the smb.conf(5) man page for more details on
"map acl inherit".
>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/root/ports/ports/net/samba3/Makefile,v
retrieving revision 1.157
diff -u -r1.157 Makefile
--- Makefile 7 Feb 2007 08:40:44 -0000 1.157
+++ Makefile 17 May 2007 21:09:37 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= samba
-PORTVERSION?= 3.0.24
+PORTVERSION?= 3.0.25
PORTREVISION?= 0
PORTEPOCH?= 1
CATEGORIES?= net
@@ -22,6 +22,8 @@
USE_ICONV= yes
GNU_CONFIGURE= yes
USE_AUTOTOOLS= autoconf:259 autoheader:259
+AUTOHEADER_ARGS= -I${WRKSRC} -I${WRKSRC}/lib/replace
+AUTOCONF_ARGS= -I${WRKSRC} -I${WRKSRC}/lib/replace
LATEST_LINK?= ${PKGNAMEPREFIX}${PORTNAME}3${PKGNAMESUFFIX}
EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
@@ -71,6 +73,7 @@
MSDFS "With MSDFS support" off \
PAM_SMBPASS "With PAM authentication vs passdb backends" off \
CLUSTER "With experimental cluster support" off \
+ DNSUPDATE "With dynamic DNS update" off \
EXP_MODULES "With experimental modules" off \
POPT "With system-wide POPT library" on \
MAX_DEBUG "With maximum debuging" off
@@ -98,7 +101,8 @@
CONFIGURE_ARGS+= --with-pam --with-readline --with-sendfile-support \
--without-libsmbclient --without-libmsrpc \
--without-libsmbsharemodes --without-python \
- --with-included-iniparser
+ --without-libaddns --with-included-iniparser \
+ --enable-largefile
.if !defined(WITHOUT_LDAP)
SAMBA_WANT_LDAP= yes
@@ -115,8 +119,8 @@
.if defined(WITH_MAX_DEBUG)
LIB_DEPENDS+= dmalloc.1:${PORTSDIR}/devel/dmalloc
-CPPFLAGS+= "-I${LOCALBASE}/include"
-LDFLAGS+= "-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+= --enable-debug --enable-developer --enable-krb5developer --enable-dmalloc --with-profiling-data
.else
@@ -213,6 +217,13 @@
CONFIGURE_ARGS+= --without-cluster-support
.endif
+.if defined(WITH_DNSUPDATE)
+LIB_DEPENDS+= uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid
+CONFIGURE_ARGS+= --with-dnsupdate
+.else
+CONFIGURE_ARGS+= --without-dnsupdate
+.endif
+
.if defined(WITH_AIO_SUPPORT)
IGNORE= broken kernel API until now (7-CURRENT). Disable AIO support
CONFIGURE_ARGS+= --with-aio-support
@@ -377,7 +388,7 @@
${INSTALL_PROGRAM} "${WRKSRC}/bin/smbwrapper.so" "${SAMBA_MODULEDIR}"
.endif
# Lib
- @${FIND} "${SAMBA_MODULEDIR}" -type f | ${SED} -E 's|^${PREFIX}/?||;' | ${EGREP} -F -v -f ${WRKDIR}/.PLIST.exclude | ${SORT} >> ${TMPPLIST}
+ @${FIND} "${SAMBA_MODULEDIR}" -type f -o -type l | ${SED} -E 's|^${PREFIX}/?||;' | ${EGREP} -F -v -f ${WRKDIR}/.PLIST.exclude | ${SORT} >> ${TMPPLIST}
@for d in `${FIND} "${SAMBA_MODULEDIR}" -type d | ${SORT} -r`; do \
${ECHO_CMD} "@unexec ${RMDIR} \"$$d\" 2>/dev/null || true" >> ${TMPPLIST}; \
done
Index: distinfo
===================================================================
RCS file: /home/ncvs/root/ports/ports/net/samba3/distinfo,v
retrieving revision 1.74
diff -u -r1.74 distinfo
--- distinfo 7 Feb 2007 08:40:44 -0000 1.74
+++ distinfo 17 May 2007 21:09:37 -0000
@@ -1,3 +1,3 @@
-MD5 (samba-3.0.24.tar.gz) = 89273f67a6d8067cbbecefaa13747153
-SHA256 (samba-3.0.24.tar.gz) = c4e8de3426fbbcee7f338f5cf09052cbdf9a36ae638aeeeca10498ef8d5343e2
-SIZE (samba-3.0.24.tar.gz) = 17708128
+MD5 (samba-3.0.25.tar.gz) = 267bd56b178a1b1285a41ec4cc1b75f0
+SHA256 (samba-3.0.25.tar.gz) = c88981d1ad221583ebcc96bcda81fb8f957ea82fe1828444fdef523ccf07db73
+SIZE (samba-3.0.25.tar.gz) = 18234944
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/root/ports/ports/net/samba3/pkg-plist,v
retrieving revision 1.67
diff -u -r1.67 pkg-plist
--- pkg-plist 7 Dec 2006 13:55:51 -0000 1.67
+++ pkg-plist 17 May 2007 21:09:37 -0000
@@ -32,6 +32,7 @@
%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/password-mature
%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/password-migration
%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/password-sync
+%%EXAMPLESDIR%%/%%SAMBA_CONFIG%%.sample
%%EXAMPLESDIR%%/LDAP/README
%%EXAMPLESDIR%%/LDAP/convertSambaAccount
%%EXAMPLESDIR%%/LDAP/get_next_oid
@@ -66,6 +67,7 @@
%%EXAMPLESDIR%%/logon/ntlogon/ntlogon.py
%%EXAMPLESDIR%%/misc/adssearch.pl
%%EXAMPLESDIR%%/misc/check_multiple_LDAP_entries.pl
+%%EXAMPLESDIR%%/misc/cldap.pl
%%EXAMPLESDIR%%/misc/extra_smbstatus
%%EXAMPLESDIR%%/misc/swat.pl
%%EXAMPLESDIR%%/misc/wall.perl
@@ -73,6 +75,29 @@
%%EXAMPLESDIR%%/nss/nss_winbind.h
%%EXAMPLESDIR%%/nss/wbtest.c
%%EXAMPLESDIR%%/pam_winbind/pam_winbind.conf
+%%EXAMPLESDIR%%/pcap2nbench/COPYING
+%%EXAMPLESDIR%%/pcap2nbench/Makefile
+%%EXAMPLESDIR%%/pcap2nbench/README
+%%EXAMPLESDIR%%/pcap2nbench/closerequest.cpp
+%%EXAMPLESDIR%%/pcap2nbench/closerequest.hpp
+%%EXAMPLESDIR%%/pcap2nbench/ethernet.cpp
+%%EXAMPLESDIR%%/pcap2nbench/ethernet.hpp
+%%EXAMPLESDIR%%/pcap2nbench/ip.cpp
+%%EXAMPLESDIR%%/pcap2nbench/ip.hpp
+%%EXAMPLESDIR%%/pcap2nbench/main.cpp
+%%EXAMPLESDIR%%/pcap2nbench/ntcreateandxrequest.cpp
+%%EXAMPLESDIR%%/pcap2nbench/ntcreateandxrequest.hpp
+%%EXAMPLESDIR%%/pcap2nbench/ntcreateandxresponse.cpp
+%%EXAMPLESDIR%%/pcap2nbench/ntcreateandxresponse.hpp
+%%EXAMPLESDIR%%/pcap2nbench/readandxrequest.cpp
+%%EXAMPLESDIR%%/pcap2nbench/readandxrequest.hpp
+%%EXAMPLESDIR%%/pcap2nbench/readandxresponse.hpp
+%%EXAMPLESDIR%%/pcap2nbench/smb.cpp
+%%EXAMPLESDIR%%/pcap2nbench/smb.hpp
+%%EXAMPLESDIR%%/pcap2nbench/tcp.cpp
+%%EXAMPLESDIR%%/pcap2nbench/tcp.hpp
+%%EXAMPLESDIR%%/pcap2nbench/writeandxrequest.cpp
+%%EXAMPLESDIR%%/pcap2nbench/writeandxrequest.hpp
%%EXAMPLESDIR%%/pdb/Makefile
%%EXAMPLESDIR%%/pdb/README
%%EXAMPLESDIR%%/pdb/test.c
@@ -110,7 +135,6 @@
%%EXAMPLESDIR%%/scripts/shares/python/smbparm.py
%%EXAMPLESDIR%%/scripts/wins_hook/README
%%EXAMPLESDIR%%/scripts/wins_hook/dns_update
-%%EXAMPLESDIR%%/%%SAMBA_CONFIG%%.sample
%%EXAMPLESDIR%%/smb.conf.default
%%EXAMPLESDIR%%/tridge/README
%%EXAMPLESDIR%%/tridge/smb.conf
@@ -141,6 +165,7 @@
@dirrm %%EXAMPLESDIR%%/printer-accounting
@dirrm %%EXAMPLESDIR%%/perfcounter
@dirrm %%EXAMPLESDIR%%/pdb
+@dirrm %%EXAMPLESDIR%%/pcap2nbench
@dirrm %%EXAMPLESDIR%%/pam_winbind
@dirrm %%EXAMPLESDIR%%/nss
@dirrm %%EXAMPLESDIR%%/misc
Index: pkg-plist.swat
===================================================================
RCS file: /home/ncvs/root/ports/ports/net/samba3/pkg-plist.swat,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist.swat
--- pkg-plist.swat 4 Sep 2006 19:00:17 -0000 1.1
+++ pkg-plist.swat 17 May 2007 21:09:37 -0000
@@ -202,7 +202,13 @@
share/swat/help/Samba3-HOWTO/unicode.html
share/swat/help/Samba3-HOWTO/upgrading-to-3.0.html
share/swat/help/Samba3-HOWTO/winbind.html
+share/swat/help/manpages/eventlogadm.8.html
share/swat/help/manpages/findsmb.1.html
+share/swat/help/manpages/idmap_ad.8.html
+share/swat/help/manpages/idmap_ldap.8.html
+share/swat/help/manpages/idmap_nss.8.html
+share/swat/help/manpages/idmap_rid.8.html
+share/swat/help/manpages/idmap_tdb.8.html
share/swat/help/manpages/index.html
share/swat/help/manpages/lmhosts.5.html
share/swat/help/manpages/log2pcap.1.html
@@ -237,8 +243,26 @@
share/swat/help/manpages/swat.8.html
share/swat/help/manpages/tdbbackup.8.html
share/swat/help/manpages/tdbdump.8.html
+share/swat/help/manpages/tdbtool.8.html
share/swat/help/manpages/testparm.1.html
share/swat/help/manpages/umount.cifs.8.html
+share/swat/help/manpages/vfs_audit.8.html
+share/swat/help/manpages/vfs_cacheprime.8.html
+share/swat/help/manpages/vfs_cap.8.html
+share/swat/help/manpages/vfs_catia.8.html
+share/swat/help/manpages/vfs_commit.8.html
+share/swat/help/manpages/vfs_default_quota.8.html
+share/swat/help/manpages/vfs_extd_audit.8.html
+share/swat/help/manpages/vfs_fake_perms.8.html
+share/swat/help/manpages/vfs_full_audit.8.html
+share/swat/help/manpages/vfs_gpfs.8.html
+share/swat/help/manpages/vfs_netatalk.8.html
+share/swat/help/manpages/vfs_notify_fam.8.html
+share/swat/help/manpages/vfs_prealloc.8.html
+share/swat/help/manpages/vfs_readahead.8.html
+share/swat/help/manpages/vfs_readonly.8.html
+share/swat/help/manpages/vfs_recycle.8.html
+share/swat/help/manpages/vfs_shadow_copy.8.html
share/swat/help/manpages/vfstest.1.html
share/swat/help/manpages/wbinfo.1.html
share/swat/help/manpages/winbindd.8.html
Index: files/patch-Makefile.in
===================================================================
RCS file: /home/ncvs/root/ports/ports/net/samba3/files/patch-Makefile.in,v
retrieving revision 1.8
diff -u -r1.8 patch-Makefile.in
--- files/patch-Makefile.in 12 Jul 2006 00:16:32 -0000 1.8
+++ files/patch-Makefile.in 17 May 2007 21:09:37 -0000
@@ -1,10 +1,11 @@
---- Makefile.in.orig Thu Apr 20 04:29:46 2006
-+++ Makefile.in Tue Apr 25 01:05:05 2006
-@@ -1410,7 +1410,7 @@
+--- ./Makefile.in.orig Mon Apr 9 19:31:00 2007
++++ ./Makefile.in Tue Apr 17 02:06:59 2007
+@@ -1558,8 +1558,7 @@
@echo Linking $@
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) script/tests/timelimit.o
+ @$(CC) $(FLAGS) -o $@ $(DYNEXP) script/tests/timelimit.o
--install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@
+-install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@ @INSTALL_LIBSMBSHAREMODES@
+-
+install: installservers installbin installscripts installdat installswat installmodules
install-everything: install installmodules
Index: files/patch-configure.in
===================================================================
RCS file: /home/ncvs/root/ports/ports/net/samba3/files/patch-configure.in,v
retrieving revision 1.19
diff -u -r1.19 patch-configure.in
--- files/patch-configure.in 7 Dec 2006 13:55:51 -0000 1.19
+++ files/patch-configure.in 17 May 2007 21:09:37 -0000
@@ -1,6 +1,6 @@
---- configure.in.orig Tue Nov 14 15:42:15 2006
-+++ configure.in Sat Nov 18 03:19:57 2006
-@@ -1088,6 +1088,21 @@
+--- configure.in.orig Mon Apr 9 19:31:00 2007
++++ configure.in Wed Apr 18 03:30:37 2007
+@@ -1040,6 +1040,21 @@
AC_DEFINE(HAVE_SIG_ATOMIC_T_TYPE,1,[Whether we have the atomic_t variable type])
fi
@@ -22,67 +22,145 @@
AC_CACHE_CHECK([for struct timespec type],samba_cv_struct_timespec, [
AC_TRY_COMPILE([
#include <sys/types.h>
-@@ -2463,32 +2478,40 @@
- # Check if FAM notifications are available. For FAM info, see
- # http://oss.sgi.com/projects/fam/
- # http://savannah.nongnu.org/projects/fam/
-+AC_ARG_ENABLE(fam,
-+[ --enable-fam Turn on FAM support (default=auto)])
+@@ -5075,7 +5090,7 @@
+ #################################################
+ # check for ACL support
--AC_CHECK_HEADERS(fam.h, [samba_cv_HAVE_FAM_H=yes], [samba_cv_HAVE_FAM_H=no])
--if test x"$samba_cv_HAVE_FAM_H" = x"yes"; then
-- # On IRIX, libfam requires libC, but other FAM implementations might not
-- # need it.
-- AC_CHECK_LIB(fam, FAMOpen2,
-- [samba_cv_HAVE_LIBFAM=yes; samba_fam_libs="-lfam"],
-- [samba_cv_HAVE_LIBFAM=no])
--
-- if test x"$samba_cv_HAVE_LIBFAM" = x"no" ; then
-- samba_fam_xtra=-lC
-- AC_CHECK_LIB_EXT(fam, samba_fam_xtra, FAMOpen2,
-- [samba_cv_HAVE_LIBFAM=yes; samba_fam_libs="-lfam -lC"],
-- [samba_cv_HAVE_LIBFAM=no])
-- unset samba_fam_xtra
-+if test x$enable_fam != xno; then
-+ AC_CHECK_HEADERS(fam.h, [samba_cv_HAVE_FAM_H=yes], [samba_cv_HAVE_FAM_H=no])
-+ if test x"$samba_cv_HAVE_FAM_H" = x"yes"; then
-+ # On IRIX, libfam requires libC, but other FAM implementations
-+ # might not need it.
-+ AC_CHECK_LIB(fam, FAMOpen2,
-+ [samba_cv_HAVE_LIBFAM=yes; samba_fam_libs="-lfam"],
-+ [samba_cv_HAVE_LIBFAM=no])
-+
-+ if test x"$samba_cv_HAVE_LIBFAM" = x"no" ; then
-+ samba_fam_xtra=-lC
-+ AC_CHECK_LIB_EXT(fam, samba_fam_xtra, FAMOpen2,
-+ [samba_cv_HAVE_LIBFAM=yes; samba_fam_libs="-lfam -lC"],
-+ [samba_cv_HAVE_LIBFAM=no])
-+ unset samba_fam_xtra
-+ fi
- fi
--fi
+-AC_MSG_CHECKING(whether to support ACLs)
++AC_MSG_NOTICE(checking whether to support ACLs...)
+ AC_ARG_WITH(acl-support,
+ [ --with-acl-support Include ACL support (default=no)],
+ [ case "$withval" in
+@@ -5083,42 +5098,37 @@
--if test x"$samba_cv_HAVE_LIBFAM" = x"yes" ; then
-- AC_DEFINE(HAVE_FAM_CHANGE_NOTIFY, 1,
-- [Whether FAM is file notifications are available])
-- AC_TRY_COMPILE([#include <fam.h>],
-- [FAMCodes code = FAMChanged;],
-- AC_DEFINE(HAVE_FAM_H_FAMCODES_TYPEDEF, 1,
-- [Whether fam.h contains a typedef for enum FAMCodes]),
-- [])
-+ if test x"$samba_cv_HAVE_LIBFAM" = x"yes" ; then
-+ AC_DEFINE(HAVE_FAM_CHANGE_NOTIFY, 1,
-+ [Whether FAM file notifications are available])
-+ AC_TRY_COMPILE([#include <fam.h>],
-+ [FAMCodes code = FAMChanged;],
-+ AC_DEFINE(HAVE_FAM_H_FAMCODES_TYPEDEF, 1,
-+ [Whether fam.h contains a typedef for enum FAMCodes]),
-+ [])
-+ fi
-+
-+ if test x$enable_fam = xyes && test x"$samba_cv_HAVE_LIBFAM" != xyes ; then
-+ AC_MSG_ERROR(FAM support requested but FAM library not available )
-+ fi
- fi
+ case "$host_os" in
+ *sysv5*)
+- AC_MSG_RESULT(Using UnixWare ACLs)
++ AC_MSG_NOTICE(Using UnixWare ACLs)
+ AC_DEFINE(HAVE_UNIXWARE_ACLS,1,[Whether UnixWare ACLs are available])
+ default_static_modules="$default_static_modules vfs_solarisacl"
+ ;;
+ *solaris*)
+- AC_MSG_RESULT(Using solaris ACLs)
+- AC_DEFINE(HAVE_SOLARIS_ACLS,1,[Whether solaris ACLs are available])
++ AC_MSG_NOTICE(Using Solaris ACLs)
++ AC_DEFINE(HAVE_SOLARIS_ACLS,1,[Whether Solaris ACLs are available])
+ ACL_LIBS="$ACL_LIBS -lsec"
+ default_static_modules="$default_static_modules vfs_solarisacl"
+ ;;
+ *hpux*)
+- AC_MSG_RESULT(Using HPUX ACLs)
++ AC_MSG_NOTICE(Using HPUX ACLs)
+ AC_DEFINE(HAVE_HPUX_ACLS,1,[Whether HPUX ACLs are available])
+ default_static_modules="$default_static_modules vfs_hpuxacl"
+ ;;
+ *irix*)
+- AC_MSG_RESULT(Using IRIX ACLs)
++ AC_MSG_NOTICE(Using IRIX ACLs)
+ AC_DEFINE(HAVE_IRIX_ACLS,1,[Whether IRIX ACLs are available])
+ default_static_modules="$default_static_modules vfs_irixacl"
+ ;;
+ *aix*)
+- AC_MSG_RESULT(Using AIX ACLs)
++ AC_MSG_NOTICE(Using AIX ACLs)
+ AC_DEFINE(HAVE_AIX_ACLS,1,[Whether AIX ACLs are available])
+ default_static_modules="$default_static_modules vfs_aixacl"
+ ;;
+ *osf*)
+- AC_MSG_RESULT(Using Tru64 ACLs)
++ AC_MSG_NOTICE(Using Tru64 ACLs)
+ AC_DEFINE(HAVE_TRU64_ACLS,1,[Whether Tru64 ACLs are available])
+ ACL_LIBS="$ACL_LIBS -lpacl"
+ default_static_modules="$default_static_modules vfs_tru64acl"
+ ;;
+- *freebsd[[5-9]]*)
+- AC_MSG_RESULT(Using FreeBSD posix ACLs)
+- AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether FreeBSD POSIX ACLs are available])
+- AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available])
+- ;;
+ *linux*)
+ AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"])
+ AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"])
+@@ -5139,7 +5149,7 @@
+ LIBS=$acl_LIBS
+ ])
+ if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
+- AC_MSG_RESULT(Using posix ACLs)
++ AC_MSG_NOTICE(Using posix ACLs)
+ AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether POSIX ACLs are available])
+ AC_CACHE_CHECK([for acl_get_perm_np],samba_cv_HAVE_ACL_GET_PERM_NP,[
+ acl_LIBS=$LIBS
+@@ -5160,12 +5170,18 @@
+ AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available])
+ fi
+ fi
+- ;;
++ ;;
+ *)
+- AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"])
+- AC_CACHE_CHECK([for ACL support],samba_cv_HAVE_POSIX_ACLS,[
++ AC_CHECK_LIB(acl,acl_get_file,[
++ ACL_LIBS="$ACL_LIBS -lacl"
++ samba_cv_acl_get_file=yes
++ ],[
++ AC_CHECK_FUNC(acl_get_file,[samba_cv_acl_get_file=yes])
++ ])
++ if test x"$samba_cv_acl_get_file" = x"yes"; then
++ AC_CACHE_CHECK([for POSIX ACL support],samba_cv_HAVE_POSIX_ACLS,[
+ acl_LIBS=$LIBS
+- LIBS="$LIBS -lacl"
++ LIBS="$LIBS $ACL_LIBS"
+ AC_TRY_LINK([
+ #include <sys/types.h>
+ #include <sys/acl.h>
+@@ -5178,20 +5194,20 @@
+ [samba_cv_HAVE_POSIX_ACLS=yes],
+ [samba_cv_HAVE_POSIX_ACLS=no])
+ LIBS=$acl_LIBS
+- ])
+- if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
+- AC_MSG_RESULT(Using posix ACLs)
++ ])
++ if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
++ AC_MSG_NOTICE(Using POSIX ACLs)
+ AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether POSIX ACLs are available])
+ AC_CACHE_CHECK([for acl_get_perm_np],samba_cv_HAVE_ACL_GET_PERM_NP,[
+ acl_LIBS=$LIBS
+- LIBS="$LIBS -lacl"
++ LIBS="$LIBS $ACL_LIBS"
+ AC_TRY_LINK([
+ #include <sys/types.h>
+ #include <sys/acl.h>
+ ],[
+ acl_permset_t permset_d;
+ acl_perm_t perm;
+- return acl_get_perm_np( permset_d, perm);
++ return acl_get_perm_np(permset_d, perm);
+ ],
+ [samba_cv_HAVE_ACL_GET_PERM_NP=yes],
+ [samba_cv_HAVE_ACL_GET_PERM_NP=no])
+@@ -5200,17 +5216,22 @@
+ if test x"$samba_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
+ AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available])
+ fi
++ fi
++ fi
++ if test x"$samba_cv_HAVE_POSIX_ACLS" != x"yes"; then
++ AC_MSG_NOTICE(No POSIX ACLs support is availble)
++ AC_DEFINE(HAVE_NO_ACLS,1,[Whether no ACLs support is available])
+ fi
+ ;;
+ esac
+ ;;
+ *)
+- AC_MSG_RESULT(no)
++ AC_MSG_NOTICE(No ACLs support is availble)
+ AC_DEFINE(HAVE_NO_ACLS,1,[Whether no ACLs support is available])
+ ;;
+ esac ],
++ AC_MSG_NOTICE(No ACLs support is built in)
+ AC_DEFINE(HAVE_NO_ACLS,1,[Whether no ACLs support should be built in])
+- AC_MSG_RESULT(no)
+ )
- #################################################
+ if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
Index: files/patch-include_includes.h
===================================================================
RCS file: /home/ncvs/root/ports/ports/net/samba3/files/patch-include_includes.h,v
retrieving revision 1.3
diff -u -r1.3 patch-include_includes.h
--- files/patch-include_includes.h 19 Sep 2006 01:39:21 -0000 1.3
+++ files/patch-include_includes.h 17 May 2007 21:09:37 -0000
@@ -1,6 +1,6 @@
---- include/includes.h.orig Wed Aug 23 18:16:38 2006
-+++ include/includes.h Fri Sep 8 00:12:44 2006
-@@ -475,10 +475,10 @@
+--- ./include/includes.h.orig Mon Apr 9 19:30:59 2007
++++ ./include/includes.h Tue Apr 17 02:06:59 2007
+@@ -209,10 +209,10 @@
#undef HAVE_LDAP
#endif
Index: files/patch-modules_vfs_posixacl.c
===================================================================
RCS file: files/patch-modules_vfs_posixacl.c
diff -N files/patch-modules_vfs_posixacl.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-modules_vfs_posixacl.c 17 May 2007 21:09:37 -0000
@@ -0,0 +1,15 @@
+--- modules/vfs_posixacl.c.orig Wed Apr 18 11:51:22 2007
++++ modules/vfs_posixacl.c Wed Apr 18 11:51:48 2007
+@@ -200,9 +200,9 @@
+ return False;
+ }
+ ace->a_perm = 0;
+- ace->a_perm |= (acl_get_perm(permset, ACL_READ) ? SMB_ACL_READ : 0);
+- ace->a_perm |= (acl_get_perm(permset, ACL_WRITE) ? SMB_ACL_WRITE : 0);
+- ace->a_perm |= (acl_get_perm(permset, ACL_EXECUTE) ? SMB_ACL_EXECUTE : 0);
++ ace->a_perm |= (acl_get_perm_np(permset, ACL_READ) ? SMB_ACL_READ : 0);
++ ace->a_perm |= (acl_get_perm_np(permset, ACL_WRITE) ? SMB_ACL_WRITE : 0);
++ ace->a_perm |= (acl_get_perm_np(permset, ACL_EXECUTE) ? SMB_ACL_EXECUTE : 0);
+ return True;
+ }
+
Index: files/patch-nsswitch_pam_winbind.c
===================================================================
RCS file: /home/ncvs/root/ports/ports/net/samba3/files/patch-nsswitch_pam_winbind.c,v
retrieving revision 1.3
diff -u -r1.3 patch-nsswitch_pam_winbind.c
--- files/patch-nsswitch_pam_winbind.c 4 Sep 2006 19:00:17 -0000 1.3
+++ files/patch-nsswitch_pam_winbind.c 17 May 2007 21:09:37 -0000
@@ -1,20 +1,11 @@
---- nsswitch/pam_winbind.c.orig Mon Aug 7 18:46:33 2006
-+++ nsswitch/pam_winbind.c Thu Aug 24 01:30:57 2006
-@@ -1016,7 +1016,7 @@
- }
- return PAM_USER_UNKNOWN;
+--- ./nsswitch/pam_winbind.c.orig Mon Apr 9 19:30:57 2007
++++ ./nsswitch/pam_winbind.c Tue Apr 17 02:06:59 2007
+@@ -1735,7 +1735,7 @@
+ ret = PAM_USER_UNKNOWN;
+ goto out;
case 0:
- pam_get_data( pamh, PAM_WINBIND_NEW_AUTHTOK_REQD, (const void **)&tmp);
+ pam_get_data( pamh, PAM_WINBIND_NEW_AUTHTOK_REQD, (void **)&tmp);
if (tmp != NULL) {
- retval = atoi(tmp);
- switch (retval) {
-@@ -1319,7 +1319,7 @@
- * By reaching here we have approved the passwords and must now
- * rebuild the password database file.
- */
-- pam_get_data( pamh, PAM_WINBIND_PWD_LAST_SET, (const void **)&pwdlastset_update);
-+ pam_get_data( pamh, PAM_WINBIND_PWD_LAST_SET, (void **)&pwdlastset_update);
-
- retval = winbind_chauthtok_request(pamh, ctrl, user, pass_old, pass_new, pwdlastset_update);
- if (retval) {
+ ret = atoi((const char *)tmp);
+ switch (ret) {
Index: files/patch-pam_smbpass_pam_smb_auth.c
===================================================================
RCS file: /home/ncvs/root/ports/ports/net/samba3/files/patch-pam_smbpass_pam_smb_auth.c,v
retrieving revision 1.1
diff -u -r1.1 patch-pam_smbpass_pam_smb_auth.c
--- files/patch-pam_smbpass_pam_smb_auth.c 4 Sep 2006 19:00:17 -0000 1.1
+++ files/patch-pam_smbpass_pam_smb_auth.c 17 May 2007 21:09:37 -0000
@@ -1,5 +1,5 @@
---- pam_smbpass/pam_smb_auth.c.orig Fri Jun 23 15:16:50 2006
-+++ pam_smbpass/pam_smb_auth.c Thu Aug 24 01:30:57 2006
+--- ./pam_smbpass/pam_smb_auth.c.orig Fri Jun 23 15:16:50 2006
++++ ./pam_smbpass/pam_smb_auth.c Tue Apr 17 02:06:59 2007
@@ -167,7 +167,7 @@
retval = PAM_SUCCESS;
Index: files/patch-pam_smbpass_pam_smb_passwd.c
===================================================================
RCS file: /home/ncvs/root/ports/ports/net/samba3/files/patch-pam_smbpass_pam_smb_passwd.c,v
retrieving revision 1.1
diff -u -r1.1 patch-pam_smbpass_pam_smb_passwd.c
--- files/patch-pam_smbpass_pam_smb_passwd.c 4 Sep 2006 19:00:17 -0000 1.1
+++ files/patch-pam_smbpass_pam_smb_passwd.c 17 May 2007 21:09:37 -0000
@@ -1,5 +1,5 @@
---- pam_smbpass/pam_smb_passwd.c.orig Thu Apr 20 04:29:22 2006
-+++ pam_smbpass/pam_smb_passwd.c Thu Aug 24 01:30:57 2006
+--- ./pam_smbpass/pam_smb_passwd.c.orig Thu Apr 20 04:29:22 2006
++++ ./pam_smbpass/pam_smb_passwd.c Tue Apr 17 02:06:59 2007
@@ -226,7 +226,7 @@
(const void **)&pass_old );
} else {
Index: files/patch-pam_smbpass_support.c
===================================================================
RCS file: /home/ncvs/root/ports/ports/net/samba3/files/patch-pam_smbpass_support.c,v
retrieving revision 1.1
diff -u -r1.1 patch-pam_smbpass_support.c
--- files/patch-pam_smbpass_support.c 4 Sep 2006 19:00:17 -0000 1.1
+++ files/patch-pam_smbpass_support.c 17 May 2007 21:09:37 -0000
@@ -1,5 +1,5 @@
---- pam_smbpass/support.c.orig Tue May 23 20:54:32 2006
-+++ pam_smbpass/support.c Thu Aug 24 01:30:57 2006
+--- ./pam_smbpass/support.c.orig Tue May 23 20:54:32 2006
++++ ./pam_smbpass/support.c Tue Apr 17 02:06:59 2007
@@ -384,7 +384,7 @@
if (newauth != NULL) {
Index: files/patch-python_setup.py
===================================================================
RCS file: files/patch-python_setup.py
diff -N files/patch-python_setup.py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-python_setup.py 17 May 2007 21:09:37 -0000
@@ -0,0 +1,11 @@
+--- python/setup.py.orig Tue May 15 13:41:41 2007
++++ python/setup.py Tue May 15 13:43:03 2007
+@@ -67,6 +67,8 @@
+ libraries.append(lib[2:])
+ elif lib[0:8] == ("-pthread"):
+ pass # Skip linker flags
++ elif lib[0:4] == ("-pie"):
++ pass # Skip linker flags
+ elif lib[0:2] == "-L":
+ library_dirs.append(lib[2:])
+ elif lib[0:2] in ("-W","-s"):
Index: files/patch-script_installbin.sh.in
===================================================================
RCS file: /home/ncvs/root/ports/ports/net/samba3/files/patch-script_installbin.sh.in,v
retrieving revision 1.1
diff -u -r1.1 patch-script_installbin.sh.in
--- files/patch-script_installbin.sh.in 12 Jul 2006 00:16:32 -0000 1.1
+++ files/patch-script_installbin.sh.in 17 May 2007 21:09:37 -0000
@@ -1,5 +1,5 @@
---- script/installbin.sh.in.orig Sun Jun 25 04:08:55 2006
-+++ script/installbin.sh.in Sun Jun 25 04:10:00 2006
+--- ./script/installbin.sh.in.orig Tue Jun 13 03:52:17 2006
++++ ./script/installbin.sh.in Tue Apr 17 02:06:59 2007
@@ -13,11 +13,7 @@
for p in $*; do
p2=`basename $p`
Index: files/patch-script_installswat.sh
===================================================================
RCS file: /home/ncvs/root/ports/ports/net/samba3/files/patch-script_installswat.sh,v
retrieving revision 1.4
diff -u -r1.4 patch-script_installswat.sh
--- files/patch-script_installswat.sh 12 Jul 2006 00:16:32 -0000 1.4
+++ files/patch-script_installswat.sh 17 May 2007 21:09:37 -0000
@@ -1,5 +1,5 @@
---- script/installswat.sh.orig Thu Apr 20 04:29:42 2006
-+++ script/installswat.sh Tue Apr 25 02:12:10 2006
+--- ./script/installswat.sh.orig Thu Mar 1 05:55:02 2007
++++ ./script/installswat.sh Tue Apr 17 02:06:59 2007
@@ -21,8 +21,7 @@
;;
esac
Index: files/patch-smbd_aio.c
===================================================================
RCS file: /home/ncvs/root/ports/ports/net/samba3/files/patch-smbd_aio.c,v
retrieving revision 1.1
diff -u -r1.1 patch-smbd_aio.c
--- files/patch-smbd_aio.c 9 Jan 2006 16:45:33 -0000 1.1
+++ files/patch-smbd_aio.c 17 May 2007 21:09:37 -0000
@@ -1,5 +1,5 @@
---- smbd/aio.c.orig Tue Jan 3 03:03:05 2006
-+++ smbd/aio.c Tue Jan 3 03:06:52 2006
+--- ./smbd/aio.c.orig Thu Mar 1 05:54:07 2007
++++ ./smbd/aio.c Tue Apr 17 02:06:59 2007
@@ -25,7 +25,17 @@
/* The signal we'll use to signify aio done. */
@@ -19,7 +19,7 @@
#endif
/****************************************************************************
-@@ -497,6 +507,11 @@
+@@ -531,6 +541,11 @@
static BOOL handle_aio_completed(struct aio_extra *aio_ex, int *perr)
{
int err;
Index: files/patch-smbd_statvfs.c
===================================================================
RCS file: /home/ncvs/root/ports/ports/net/samba3/files/patch-smbd_statvfs.c,v
retrieving revision 1.1
diff -u -r1.1 patch-smbd_statvfs.c
--- files/patch-smbd_statvfs.c 9 Jan 2006 16:45:33 -0000 1.1
+++ files/patch-smbd_statvfs.c 17 May 2007 21:09:37 -0000
@@ -1,5 +1,5 @@
---- smbd/statvfs.c.orig Wed Nov 9 19:28:55 2005
-+++ smbd/statvfs.c Thu Jan 5 04:26:54 2006
+--- ./smbd/statvfs.c.orig Thu Mar 1 05:54:06 2007
++++ ./smbd/statvfs.c Tue Apr 17 02:06:59 2007
@@ -3,6 +3,7 @@
VFS API's statvfs abstraction
Copyright (C) Alexander Bokovoy 2005
@@ -38,7 +38,7 @@
/*
@@ -53,6 +75,8 @@
{
- #if defined(LINUX)
+ #if defined(LINUX) && defined(HAVE_FSID_INT)
return linux_statvfs(path, statbuf);
+#elif defined(FREEBSD)
+ return bsd_statvfs(path, statbuf);
Index: files/patch-utils_net_time.c
===================================================================
RCS file: /home/ncvs/root/ports/ports/net/samba3/files/patch-utils_net_time.c,v
retrieving revision 1.2
diff -u -r1.2 patch-utils_net_time.c
--- files/patch-utils_net_time.c 4 Sep 2006 19:00:17 -0000 1.2
+++ files/patch-utils_net_time.c 17 May 2007 21:09:37 -0000
@@ -1,6 +1,6 @@
---- utils/net_time.c.orig Fri Jun 23 15:16:53 2006
-+++ utils/net_time.c Thu Aug 24 01:30:57 2006
-@@ -79,9 +79,16 @@
+--- ./utils/net_time.c.orig Thu Mar 1 05:54:59 2007
++++ ./utils/net_time.c Tue Apr 17 02:06:59 2007
+@@ -83,9 +83,16 @@
return "unknown";
}
Index: files/patch-zb
===================================================================
RCS file: files/patch-zb
diff -N files/patch-zb
--- files/patch-zb 9 Oct 2006 17:50:13 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
---- param/loadparm.c.orig Fri Aug 25 13:40:09 2006
-+++ param/loadparm.c Fri Aug 25 13:46:28 2006
-@@ -3852,7 +3852,7 @@
-
- BOOL dump_a_parameter(int snum, char *parm_name, FILE * f, BOOL isGlobal)
- {
-- service * pService = ServicePtrs[snum];
-+ service * pService = NULL;
- int i;
- BOOL result = False;
- parm_class p_class;
-@@ -3883,8 +3883,13 @@
- if (isGlobal) {
- p_class = P_GLOBAL;
- flag = FLAG_GLOBAL;
-- } else
-+ } else {
-+ if (!VALID_SNUM(snum)) {
-+ return False;
-+ }
-+ pService = ServicePtrs[snum];
- p_class = P_LOCAL;
-+ }
-
- for (i = 0; parm_table[i].label; i++) {
- if (strwicmp(parm_table[i].label, parm_name) == 0 &&
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070521132808.GA4679>