diff options
| author | taca <taca> | 2010-02-16 16:24:15 +0000 |
|---|---|---|
| committer | taca <taca> | 2010-02-16 16:24:15 +0000 |
| commit | dd56ec4198de6046699243b00cfebccf26b195e8 (patch) | |
| tree | 4c3caf16db65485c343f48ecca950410b712affd | |
| parent | 039c81649427da4e5997dc2939cf0067fefaf3d1 (diff) | |
| download | pkgsrc-dd56ec4198de6046699243b00cfebccf26b195e8.tar.gz | |
Importing Samba 3.3.10 as net/samba33.
This isn't latest release, but diffrence from current package is minimal
supported release.
Since changes are too huge to write here, please refer each release notes:
http://www.samba.org/samba/history/
And this pacakge already contain fix for CVE-2009-3297.
27 files changed, 1734 insertions, 0 deletions
diff --git a/net/samba33/Makefile b/net/samba33/Makefile new file mode 100644 index 00000000000..a7bb9926e18 --- /dev/null +++ b/net/samba33/Makefile @@ -0,0 +1,150 @@ +# $NetBSD: Makefile,v 1.1.1.1 2010/02/16 16:24:15 taca Exp $ + +.include "../../net/samba/Makefile.mirrors" + +DISTNAME= samba-${VERSION} +CATEGORIES= net +MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/} + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://www.samba.org/ +COMMENT= SMB/CIFS protocol server suite +LICENSE= gnu-gpl-v3 + +VERSION= 3.3.10 +CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* \ + winbind-[0-9]* +MAKE_JOBS_SAFE= NO + +PKG_DESTDIR_SUPPORT= user-destdir + +FILESDIR= ${PKGDIR}/../samba/files +DESCR_SRC= ${PKGDIR}/../samba/DESCR +MESSAGE_SRC= ${PKGDIR}/../samba/MESSAGE +WRKSRC= ${WRKDIR}/${DISTNAME}/source +GNU_CONFIGURE= yes +BUILD_DEFS+= VARBASE +CHECK_WRKREF_SKIP= * + +.include "../../mk/bsd.prefs.mk" + +PKG_SYSCONFSUBDIR?= samba +SAMBA_ETCDIR?= ${PKG_SYSCONFDIR} +SAMBA_LIBDIR?= ${PREFIX}/lib +SAMBA_LOCKDIR?= ${SAMBA_VARDIR}/run/samba +SAMBA_LOGDIR?= ${SAMBA_VARDIR}/log +SAMBA_MODULESDIR?= ${SAMBA_LIBDIR}/samba +SAMBA_PIDDIR?= ${SAMBA_VARDIR}/run +SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private +SAMBA_STATEDIR?= ${SAMBA_VARDIR}/db/samba +SAMBA_VARDIR?= ${VARBASE} +WINBINDD_RCD_SCRIPT= # empty + +FILES_SUBST+= SAMBA_ETCDIR=${SAMBA_ETCDIR:Q} +FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR:Q} +FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR:Q} +FILES_SUBST+= SAMBA_PIDDIR=${SAMBA_PIDDIR:Q} +FILES_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE:Q} +FILES_SUBST+= SAMBA_STATEDIR=${SAMBA_STATEDIR:Q} +FILES_SUBST+= SAMBA_VARDIR=${SAMBA_VARDIR:Q} +FILES_SUBST+= WINBINDD_RCD_SCRIPT=${WINBINDD_RCD_SCRIPT:Q} + +CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR:Q} +CONFIGURE_ARGS+= --libdir=${SAMBA_LIBDIR:Q} +CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR:Q} +CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR:Q} +CONFIGURE_ARGS+= --with-modulesdir=${SAMBA_MODULESDIR:Q} +CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR:Q} +CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE:Q} +CONFIGURE_ARGS+= --with-statedir=${SAMBA_STATEDIR:Q} +CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR:Q} + +CONFIGURE_ARGS+= --with-mandir=${PREFIX:Q}/${PKGMANDIR:Q} +CONFIGURE_ARGS+= --with-swatdir=${PREFIX:Q}/share/samba/swat + +.include "../../converters/libiconv/buildlink3.mk" +CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv} + +USE_GNU_READLINE= yes +.include "../../devel/readline/buildlink3.mk" +CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} + +.include "../../net/samba/options.mk" + +# Only Linux supports mount.cifs for mounting a CIFS share into the +# filesystem. +# +PLIST_VARS+= cifsmount +.if ${OPSYS} == "Linux" +CONFIGURE_ARGS+= --with-cifsmount +PLIST.cifsmount= yes +.endif + +# mktemp is useful for the replacement adduser script, but don't require +# a full dependency since it's not actually needed by samba. +# +USE_TOOLS+= mktemp + +# findsmb uses perl +# +USE_TOOLS+= perl:run +REPLACE_PERL= script/findsmb.in + +.if !defined(PWD_MKDB) +PWD_MKDB!= ${TYPE} pwd_mkdb 2>&1 | \ + ${AWK} '/not found/ { print "pwd_mkdb"; exit } { print $$3 }' +MAKEFLAGS+= PWD_MKDB=${PWD_MKDB:Q} +.endif +FILES_SUBST+= MKTEMP=${MKTEMP:Q} +FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q} + +DOCDIR= share/doc/${PKGBASE} +EGDIR= share/examples/${PKGBASE} + +INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR} + +CONF_FILES= ${PREFIX}/${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf +MAKE_DIRS= ${SAMBA_VARDIR} ${SAMBA_LOGDIR} ${SAMBA_PIDDIR} +OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR} ${SAMBA_STATEDIR} +OWN_DIRS_PERMS= ${SAMBA_PRIVATE} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700 +RCD_SCRIPTS+= samba nmbd smbd ${WINBINDD_RCD_SCRIPT} + +SUBST_CLASSES+= paths +SUBST_FILES.paths= ${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh +SUBST_SED.paths+= -e 's,@AWK@,${AWK},g' +SUBST_SED.paths+= -e 's,@CAT@,${CAT},g' +SUBST_SED.paths+= -e 's,@MKTEMP@,${MKTEMP},g' +SUBST_SED.paths+= -e 's,@RM@,${RM},g' +SUBST_SED.paths+= -e 's,@PWD_MKDB@,${PWD_MKDB},g' +SUBST_SED.paths+= -e 's,@SH@,${SH},g' +SUBST_STAGE.paths= post-patch + +post-extract: + ${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR} + +post-install: + ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/js + ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/ja/include + ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/ja/images + ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/ja/js + ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/tr/include + ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/tr/js + for d in gpext idmap pdb rpc; do \ + ${RMDIR} ${DESTDIR}${SAMBA_MODULESDIR}/$$d; \ + done + cd ${WRKDIR}/${DISTNAME}/docs/registry; for f in *.reg; do \ + ${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/${DOCDIR}/$${f}; \ + done + ${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh ${DESTDIR}${PREFIX}/${EGDIR}/adduser.sh + ${INSTALL_SCRIPT} ${WRKDIR}/deluser.sh ${DESTDIR}${PREFIX}/${EGDIR}/deluser.sh + cd ${WRKDIR}/${DISTNAME}/examples; \ + ${INSTALL_DATA} LDAP/samba.schema ${DESTDIR}${PREFIX}/${EGDIR}; \ + ${INSTALL_DATA} smb.conf.default ${DESTDIR}${PREFIX}/${EGDIR} + cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mknissmbpasswd.sh ${DESTDIR}${PREFIX}/${EGDIR} + cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mknissmbpwdtbl.sh ${DESTDIR}${PREFIX}/${EGDIR} + cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mksmbpasswd.sh ${DESTDIR}${PREFIX}/${EGDIR} + cd ${WRKSRC}/script; ${INSTALL_SCRIPT} updatesmbpasswd.sh ${DESTDIR}${PREFIX}/${EGDIR} + ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/include/*.h + +.include "../../devel/popt/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/net/samba33/PLIST b/net/samba33/PLIST new file mode 100644 index 00000000000..5268201213b --- /dev/null +++ b/net/samba33/PLIST @@ -0,0 +1,684 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2010/02/16 16:24:15 taca Exp $ +bin/eventlogadm +bin/findsmb +bin/ldbadd +bin/ldbdel +bin/ldbedit +bin/ldbmodify +bin/ldbrename +bin/ldbsearch +bin/net +bin/nmblookup +bin/ntlm_auth +bin/pdbedit +bin/profiles +bin/rpcclient +bin/sharesec +bin/smbcacls +bin/smbclient +bin/smbcontrol +bin/smbcquotas +bin/smbget +bin/smbpasswd +bin/smbspool +bin/smbstatus +bin/smbtar +bin/smbtree +bin/tdbbackup +bin/tdbdump +bin/tdbtool +bin/testparm +${PLIST.winbind}bin/wbinfo +include/libsmbclient.h +include/netapi.h +include/smb_share_modes.h +include/talloc.h +include/tdb.h +include/wbclient.h +lib/libnetapi.so +lib/libnetapi.so.0 +lib/libsmbclient.so +lib/libsmbclient.so.0 +lib/libsmbsharemodes.so +lib/libsmbsharemodes.so.0 +lib/libtalloc.so +lib/libtalloc.so.1 +lib/libtdb.so +lib/libtdb.so.1 +lib/libwbclient.so +lib/libwbclient.so.0 +${PLIST.winbind}${NSS_WINBIND} +${PLIST.winbind}${NSS_WINS} +lib/samba/auth/script.so +lib/samba/charset/CP437.so +lib/samba/charset/CP850.so +lib/samba/de.msg +lib/samba/en.msg +lib/samba/fi.msg +lib/samba/fr.msg +lib/samba/it.msg +lib/samba/ja.msg +lib/samba/lowcase.dat +lib/samba/nl.msg +lib/samba/pl.msg +lib/samba/tr.msg +lib/samba/upcase.dat +lib/samba/valid.dat +lib/samba/vfs/acl_tdb.so +lib/samba/vfs/acl_xattr.so +lib/samba/vfs/audit.so +lib/samba/vfs/cap.so +lib/samba/vfs/default_quota.so +lib/samba/vfs/expand_msdfs.so +lib/samba/vfs/extd_audit.so +lib/samba/vfs/fake_perms.so +lib/samba/vfs/full_audit.so +lib/samba/vfs/netatalk.so +${PLIST.fam}lib/samba/vfs/notify_fam.so +lib/samba/vfs/preopen.so +lib/samba/vfs/readahead.so +lib/samba/vfs/readonly.so +lib/samba/vfs/recycle.so +lib/samba/vfs/shadow_copy.so +lib/samba/vfs/shadow_copy2.so +lib/samba/vfs/smb_traffic_analyzer.so +lib/samba/vfs/streams_depot.so +lib/samba/vfs/streams_xattr.so +lib/samba/vfs/xattr_tdb.so +${PLIST.pam}lib/security/pam_smbpass.so +${PLIST.pam}${PLIST.winbind}lib/security/pam_winbind.so +${PLIST.cups}libexec/cups/backend/smb +man/man1/findsmb.1 +man/man1/ldbadd.1 +man/man1/ldbdel.1 +man/man1/ldbedit.1 +man/man1/ldbmodify.1 +man/man1/ldbrename.1 +man/man1/ldbsearch.1 +man/man1/log2pcap.1 +man/man1/nmblookup.1 +man/man1/ntlm_auth.1 +man/man1/profiles.1 +man/man1/rpcclient.1 +man/man1/sharesec.1 +man/man1/smbcacls.1 +man/man1/smbclient.1 +man/man1/smbcontrol.1 +man/man1/smbcquotas.1 +man/man1/smbget.1 +man/man1/smbstatus.1 +man/man1/smbtar.1 +man/man1/smbtree.1 +man/man1/testparm.1 +man/man1/vfstest.1 +man/man1/wbinfo.1 +man/man5/lmhosts.5 +man/man5/smb.conf.5 +man/man5/smbgetrc.5 +man/man5/smbpasswd.5 +man/man7/libsmbclient.7 +man/man7/samba.7 +man/man7/winbind_krb5_locator.7 +man/man8/eventlogadm.8 +man/man8/idmap_ad.8 +man/man8/idmap_adex.8 +man/man8/idmap_hash.8 +man/man8/idmap_ldap.8 +man/man8/idmap_nss.8 +man/man8/idmap_rid.8 +man/man8/idmap_tdb.8 +man/man8/idmap_tdb2.8 +man/man8/mount.cifs.8 +man/man8/net.8 +man/man8/nmbd.8 +man/man8/pam_winbind.8 +man/man8/pdbedit.8 +man/man8/smbd.8 +man/man8/smbpasswd.8 +man/man8/smbspool.8 +man/man8/swat.8 +man/man8/tdbbackup.8 +man/man8/tdbdump.8 +man/man8/tdbtool.8 +man/man8/umount.cifs.8 +man/man8/vfs_acl_tdb.8 +man/man8/vfs_acl_xattr.8 +man/man8/vfs_audit.8 +man/man8/vfs_cacheprime.8 +man/man8/vfs_cap.8 +man/man8/vfs_catia.8 +man/man8/vfs_commit.8 +man/man8/vfs_default_quota.8 +man/man8/vfs_dirsort.8 +man/man8/vfs_extd_audit.8 +man/man8/vfs_fake_perms.8 +man/man8/vfs_fileid.8 +man/man8/vfs_full_audit.8 +man/man8/vfs_gpfs.8 +man/man8/vfs_netatalk.8 +man/man8/vfs_notify_fam.8 +man/man8/vfs_prealloc.8 +man/man8/vfs_preopen.8 +man/man8/vfs_readahead.8 +man/man8/vfs_readonly.8 +man/man8/vfs_recycle.8 +man/man8/vfs_shadow_copy.8 +man/man8/vfs_shadow_copy2.8 +man/man8/vfs_smb_traffic_analyzer.8 +man/man8/vfs_streams_depot.8 +man/man8/vfs_streams_xattr.8 +man/man8/vfs_xattr_tdb.8 +man/man8/winbindd.8 +${PLIST.cifsmount}sbin/mount.cifs +sbin/nmbd +sbin/smbd +sbin/swat +${PLIST.cifsmount}sbin/umount.cifs +${PLIST.winbind}sbin/winbindd +share/doc/samba/NT4-Locking.reg +share/doc/samba/NT4_PlainPassword.reg +${PLIST.pam}share/doc/samba/README.pam_smbpass +share/doc/samba/Win-2Kx-XPP-DeleteCachedProfiles.reg +share/doc/samba/Win-2Kx-XPP-ForceLocalProfile.reg +share/doc/samba/Win-NT-DeleteRoamingProfile.reg +share/doc/samba/Win2000_PlainPassword.reg +share/doc/samba/Win7_Samba3DomainMember.reg +share/doc/samba/Win95_PlainPassword.reg +share/doc/samba/Win98_PlainPassword.reg +share/doc/samba/Win9X-CacheHandling.reg +share/doc/samba/WinME_PlainPassword.reg +share/doc/samba/WinXP_PlainPassword.reg +share/doc/samba/WindowsTerminalServer.reg +share/examples/rc.d/nmbd +share/examples/rc.d/samba +share/examples/rc.d/smbd +${PLIST.winbind}share/examples/rc.d/winbindd +share/examples/samba/adduser.sh +share/examples/samba/deluser.sh +share/examples/samba/mknissmbpasswd.sh +share/examples/samba/mknissmbpwdtbl.sh +share/examples/samba/mksmbpasswd.sh +${PLIST.pam}share/examples/samba/pam_smbpass/kdc-pdc +${PLIST.pam}share/examples/samba/pam_smbpass/password-mature +${PLIST.pam}share/examples/samba/pam_smbpass/password-migration +${PLIST.pam}share/examples/samba/pam_smbpass/password-sync +share/examples/samba/samba.schema +share/examples/samba/smb.conf.default +share/examples/samba/updatesmbpasswd.sh +share/locale/de/LC_MESSAGES/pam_winbind.mo +share/samba/swat/help/Samba3-ByExample/2000users.html +share/samba/swat/help/Samba3-ByExample/Big500users.html +share/samba/swat/help/Samba3-ByExample/DMSMig.html +share/samba/swat/help/Samba3-ByExample/DomApps.html +share/samba/swat/help/Samba3-ByExample/ExNetworks.html +share/samba/swat/help/Samba3-ByExample/HA.html +share/samba/swat/help/Samba3-ByExample/RefSection.html +share/samba/swat/help/Samba3-ByExample/apa.html +share/samba/swat/help/Samba3-ByExample/appendix.html +share/samba/swat/help/Samba3-ByExample/ch14.html +share/samba/swat/help/Samba3-ByExample/go01.html +share/samba/swat/help/Samba3-ByExample/happy.html +share/samba/swat/help/Samba3-ByExample/images/AccountingNetwork.png +share/samba/swat/help/Samba3-ByExample/images/Charity-Network.png +share/samba/swat/help/Samba3-ByExample/images/HostAnnouncment.png +share/samba/swat/help/Samba3-ByExample/images/NullConnect.png +share/samba/swat/help/Samba3-ByExample/images/UNIX-Samba-and-LDAP.png +share/samba/swat/help/Samba3-ByExample/images/UserConnect.png +share/samba/swat/help/Samba3-ByExample/images/UserMgrNT4.png +share/samba/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture.png +share/samba/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture2.png +share/samba/swat/help/Samba3-ByExample/images/WindowsXP-NullConnection.png +share/samba/swat/help/Samba3-ByExample/images/WindowsXP-UserConnection.png +share/samba/swat/help/Samba3-ByExample/images/XP-screen001.png +share/samba/swat/help/Samba3-ByExample/images/acct2net.png +share/samba/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.png +share/samba/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP.png +share/samba/swat/help/Samba3-ByExample/images/ch7-fail-overLDAP.png +share/samba/swat/help/Samba3-ByExample/images/ch7-singleLDAP.png +share/samba/swat/help/Samba3-ByExample/images/ch8-migration.png +share/samba/swat/help/Samba3-ByExample/images/chap4-net.png +share/samba/swat/help/Samba3-ByExample/images/chap5-net.png +share/samba/swat/help/Samba3-ByExample/images/chap6-net.png +share/samba/swat/help/Samba3-ByExample/images/chap7-idresol.png +share/samba/swat/help/Samba3-ByExample/images/chap7-net-Ar.png +share/samba/swat/help/Samba3-ByExample/images/chap7-net2-Br.png +share/samba/swat/help/Samba3-ByExample/images/chap9-ADSDC.png +share/samba/swat/help/Samba3-ByExample/images/chap9-SambaDC.png +share/samba/swat/help/Samba3-ByExample/images/imc-usermanager2.png +share/samba/swat/help/Samba3-ByExample/images/lam-config.png +share/samba/swat/help/Samba3-ByExample/images/lam-group-members.png +share/samba/swat/help/Samba3-ByExample/images/lam-groups.png +share/samba/swat/help/Samba3-ByExample/images/lam-hosts.png +share/samba/swat/help/Samba3-ByExample/images/lam-login.png +share/samba/swat/help/Samba3-ByExample/images/lam-users.png +share/samba/swat/help/Samba3-ByExample/images/openmag.png +share/samba/swat/help/Samba3-ByExample/images/wxpp001.png +share/samba/swat/help/Samba3-ByExample/images/wxpp004.png +share/samba/swat/help/Samba3-ByExample/images/wxpp006.png +share/samba/swat/help/Samba3-ByExample/images/wxpp007.png +share/samba/swat/help/Samba3-ByExample/images/wxpp008.png +share/samba/swat/help/Samba3-ByExample/index.html +share/samba/swat/help/Samba3-ByExample/ix01.html +share/samba/swat/help/Samba3-ByExample/kerberos.html +share/samba/swat/help/Samba3-ByExample/ntmigration.html +share/samba/swat/help/Samba3-ByExample/nw4migration.html +share/samba/swat/help/Samba3-ByExample/pr01.html +share/samba/swat/help/Samba3-ByExample/pr02.html +share/samba/swat/help/Samba3-ByExample/pr03.html +share/samba/swat/help/Samba3-ByExample/preface.html +share/samba/swat/help/Samba3-ByExample/primer.html +share/samba/swat/help/Samba3-ByExample/secure.html +share/samba/swat/help/Samba3-ByExample/simple.html +share/samba/swat/help/Samba3-ByExample/small.html +share/samba/swat/help/Samba3-ByExample/unixclients.html +share/samba/swat/help/Samba3-ByExample/upgrades.html +share/samba/swat/help/Samba3-Developers-Guide/CodingSuggestions.html +share/samba/swat/help/Samba3-Developers-Guide/Packaging.html +share/samba/swat/help/Samba3-Developers-Guide/architecture.html +share/samba/swat/help/Samba3-Developers-Guide/contributing.html +share/samba/swat/help/Samba3-Developers-Guide/debug.html +share/samba/swat/help/Samba3-Developers-Guide/devprinting.html +share/samba/swat/help/Samba3-Developers-Guide/index.html +share/samba/swat/help/Samba3-Developers-Guide/internals.html +share/samba/swat/help/Samba3-Developers-Guide/modules.html +share/samba/swat/help/Samba3-Developers-Guide/ntdomain.html +share/samba/swat/help/Samba3-Developers-Guide/parsing.html +share/samba/swat/help/Samba3-Developers-Guide/pr01.html +share/samba/swat/help/Samba3-Developers-Guide/pt01.html +share/samba/swat/help/Samba3-Developers-Guide/pt02.html +share/samba/swat/help/Samba3-Developers-Guide/pt03.html +share/samba/swat/help/Samba3-Developers-Guide/pt04.html +share/samba/swat/help/Samba3-Developers-Guide/pt05.html +share/samba/swat/help/Samba3-Developers-Guide/pwencrypt.html +share/samba/swat/help/Samba3-Developers-Guide/rpc-plugin.html +share/samba/swat/help/Samba3-Developers-Guide/tracing.html +share/samba/swat/help/Samba3-Developers-Guide/unix-smb.html +share/samba/swat/help/Samba3-Developers-Guide/vfs.html +share/samba/swat/help/Samba3-Developers-Guide/wins.html +share/samba/swat/help/Samba3-HOWTO/AccessControls.html +share/samba/swat/help/Samba3-HOWTO/AdvancedNetworkManagement.html +share/samba/swat/help/Samba3-HOWTO/Appendix.html +share/samba/swat/help/Samba3-HOWTO/Backup.html +share/samba/swat/help/Samba3-HOWTO/CUPS-printing.html +share/samba/swat/help/Samba3-HOWTO/ChangeNotes.html +share/samba/swat/help/Samba3-HOWTO/ClientConfig.html +share/samba/swat/help/Samba3-HOWTO/DNSDHCP.html +share/samba/swat/help/Samba3-HOWTO/FastStart.html +share/samba/swat/help/Samba3-HOWTO/InterdomainTrusts.html +share/samba/swat/help/Samba3-HOWTO/IntroSMB.html +share/samba/swat/help/Samba3-HOWTO/NT4Migration.html +share/samba/swat/help/Samba3-HOWTO/NetCommand.html +share/samba/swat/help/Samba3-HOWTO/NetworkBrowsing.html +share/samba/swat/help/Samba3-HOWTO/Other-Clients.html +share/samba/swat/help/Samba3-HOWTO/PolicyMgmt.html +share/samba/swat/help/Samba3-HOWTO/Portability.html +share/samba/swat/help/Samba3-HOWTO/ProfileMgmt.html +share/samba/swat/help/Samba3-HOWTO/SWAT.html +share/samba/swat/help/Samba3-HOWTO/SambaHA.html +share/samba/swat/help/Samba3-HOWTO/ServerType.html +share/samba/swat/help/Samba3-HOWTO/StandAloneServer.html +share/samba/swat/help/Samba3-HOWTO/TOSHpreface.html +share/samba/swat/help/Samba3-HOWTO/VFS.html +share/samba/swat/help/Samba3-HOWTO/apa.html +share/samba/swat/help/Samba3-HOWTO/bugreport.html +share/samba/swat/help/Samba3-HOWTO/cfgsmarts.html +share/samba/swat/help/Samba3-HOWTO/ch-ldap-tls.html +share/samba/swat/help/Samba3-HOWTO/ch47.html +share/samba/swat/help/Samba3-HOWTO/classicalprinting.html +share/samba/swat/help/Samba3-HOWTO/compiling.html +share/samba/swat/help/Samba3-HOWTO/diagnosis.html +share/samba/swat/help/Samba3-HOWTO/domain-member.html +share/samba/swat/help/Samba3-HOWTO/go01.html +share/samba/swat/help/Samba3-HOWTO/groupmapping.html +share/samba/swat/help/Samba3-HOWTO/idmapper.html +share/samba/swat/help/Samba3-HOWTO/images/10small.png +share/samba/swat/help/Samba3-HOWTO/images/11small.png +share/samba/swat/help/Samba3-HOWTO/images/12small.png +share/samba/swat/help/Samba3-HOWTO/images/13small.png +share/samba/swat/help/Samba3-HOWTO/images/14small.png +share/samba/swat/help/Samba3-HOWTO/images/1small.png +share/samba/swat/help/Samba3-HOWTO/images/2small.png +share/samba/swat/help/Samba3-HOWTO/images/3small.png +share/samba/swat/help/Samba3-HOWTO/images/4small.png +share/samba/swat/help/Samba3-HOWTO/images/5small.png +share/samba/swat/help/Samba3-HOWTO/images/6small.png +share/samba/swat/help/Samba3-HOWTO/images/7small.png +share/samba/swat/help/Samba3-HOWTO/images/8small.png +share/samba/swat/help/Samba3-HOWTO/images/9small.png +share/samba/swat/help/Samba3-HOWTO/images/WME001.png +share/samba/swat/help/Samba3-HOWTO/images/WME002.png +share/samba/swat/help/Samba3-HOWTO/images/WME003.png +share/samba/swat/help/Samba3-HOWTO/images/WME005.png +share/samba/swat/help/Samba3-HOWTO/images/WME009.png +share/samba/swat/help/Samba3-HOWTO/images/WME010.png +share/samba/swat/help/Samba3-HOWTO/images/WME013.png +share/samba/swat/help/Samba3-HOWTO/images/WME014.png +share/samba/swat/help/Samba3-HOWTO/images/WXPP002.png +share/samba/swat/help/Samba3-HOWTO/images/WXPP003.png +share/samba/swat/help/Samba3-HOWTO/images/WXPP005.png +share/samba/swat/help/Samba3-HOWTO/images/WXPP009.png +share/samba/swat/help/Samba3-HOWTO/images/WXPP014.png +share/samba/swat/help/Samba3-HOWTO/images/a_small.png +share/samba/swat/help/Samba3-HOWTO/images/access1.png +share/samba/swat/help/Samba3-HOWTO/images/browsing1.png +share/samba/swat/help/Samba3-HOWTO/images/cups1.png +share/samba/swat/help/Samba3-HOWTO/images/cups2.png +share/samba/swat/help/Samba3-HOWTO/images/domain.png +share/samba/swat/help/Samba3-HOWTO/images/ethereal1.png +share/samba/swat/help/Samba3-HOWTO/images/ethereal2.png +share/samba/swat/help/Samba3-HOWTO/images/idmap-gid2sid.png +share/samba/swat/help/Samba3-HOWTO/images/idmap-sid2gid.png +share/samba/swat/help/Samba3-HOWTO/images/idmap-sid2uid.png +share/samba/swat/help/Samba3-HOWTO/images/idmap-store-gid2sid.png +share/samba/swat/help/Samba3-HOWTO/images/idmap-uid2sid.png +share/samba/swat/help/Samba3-HOWTO/images/idmap_winbind_no_loop.png +share/samba/swat/help/Samba3-HOWTO/images/pdftoepsonusb.png +share/samba/swat/help/Samba3-HOWTO/images/pdftosocket.png +share/samba/swat/help/Samba3-HOWTO/images/trusts1.png +share/samba/swat/help/Samba3-HOWTO/images/w2kp001.png +share/samba/swat/help/Samba3-HOWTO/images/w2kp002.png +share/samba/swat/help/Samba3-HOWTO/images/w2kp003.png +share/samba/swat/help/Samba3-HOWTO/images/w2kp004.png +share/samba/swat/help/Samba3-HOWTO/images/w2kp005.png +share/samba/swat/help/Samba3-HOWTO/images/wxpp001.png +share/samba/swat/help/Samba3-HOWTO/images/wxpp004.png +share/samba/swat/help/Samba3-HOWTO/images/wxpp006.png +share/samba/swat/help/Samba3-HOWTO/images/wxpp007.png +share/samba/swat/help/Samba3-HOWTO/images/wxpp008.png +share/samba/swat/help/Samba3-HOWTO/index.html +share/samba/swat/help/Samba3-HOWTO/install.html +share/samba/swat/help/Samba3-HOWTO/integrate-ms-networks.html +share/samba/swat/help/Samba3-HOWTO/introduction.html +share/samba/swat/help/Samba3-HOWTO/ix01.html +share/samba/swat/help/Samba3-HOWTO/largefile.html +share/samba/swat/help/Samba3-HOWTO/locking.html +share/samba/swat/help/Samba3-HOWTO/migration.html +share/samba/swat/help/Samba3-HOWTO/msdfs.html +share/samba/swat/help/Samba3-HOWTO/optional.html +share/samba/swat/help/Samba3-HOWTO/pam.html +share/samba/swat/help/Samba3-HOWTO/passdb.html +share/samba/swat/help/Samba3-HOWTO/pr01.html +share/samba/swat/help/Samba3-HOWTO/pr02.html +share/samba/swat/help/Samba3-HOWTO/pr03.html +share/samba/swat/help/Samba3-HOWTO/problems.html +share/samba/swat/help/Samba3-HOWTO/rights.html +share/samba/swat/help/Samba3-HOWTO/samba-bdc.html +share/samba/swat/help/Samba3-HOWTO/samba-pdc.html +share/samba/swat/help/Samba3-HOWTO/securing-samba.html +share/samba/swat/help/Samba3-HOWTO/speed.html +share/samba/swat/help/Samba3-HOWTO/tdb.html +share/samba/swat/help/Samba3-HOWTO/troubleshooting.html +share/samba/swat/help/Samba3-HOWTO/type.html +share/samba/swat/help/Samba3-HOWTO/unicode.html +share/samba/swat/help/Samba3-HOWTO/upgrading-to-3.0.html +share/samba/swat/help/Samba3-HOWTO/winbind.html +share/samba/swat/help/manpages/cifs.upcall.8.html +share/samba/swat/help/manpages/eventlogadm.8.html +share/samba/swat/help/manpages/findsmb.1.html +share/samba/swat/help/manpages/idmap_ad.8.html +share/samba/swat/help/manpages/idmap_adex.8.html +share/samba/swat/help/manpages/idmap_hash.8.html +share/samba/swat/help/manpages/idmap_ldap.8.html +share/samba/swat/help/manpages/idmap_nss.8.html +share/samba/swat/help/manpages/idmap_rid.8.html +share/samba/swat/help/manpages/idmap_tdb.8.html +share/samba/swat/help/manpages/idmap_tdb2.8.html +share/samba/swat/help/manpages/index.html +share/samba/swat/help/manpages/ldb.3.html +share/samba/swat/help/manpages/ldbadd.1.html +share/samba/swat/help/manpages/ldbdel.1.html +share/samba/swat/help/manpages/ldbedit.1.html +share/samba/swat/help/manpages/ldbmodify.1.html +share/samba/swat/help/manpages/ldbrename.1.html +share/samba/swat/help/manpages/ldbsearch.1.html +share/samba/swat/help/manpages/libsmbclient.7.html +share/samba/swat/help/manpages/lmhosts.5.html +share/samba/swat/help/manpages/log2pcap.1.html +share/samba/swat/help/manpages/mount.cifs.8.html +share/samba/swat/help/manpages/net.8.html +share/samba/swat/help/manpages/nmbd.8.html +share/samba/swat/help/manpages/nmblookup.1.html +share/samba/swat/help/manpages/ntlm_auth.1.html +share/samba/swat/help/manpages/pam_winbind.8.html +share/samba/swat/help/manpages/pdbedit.8.html +share/samba/swat/help/manpages/profiles.1.html +share/samba/swat/help/manpages/rpcclient.1.html +share/samba/swat/help/manpages/samba.7.html +share/samba/swat/help/manpages/sharesec.1.html +share/samba/swat/help/manpages/smb.conf.5.html +share/samba/swat/help/manpages/smbcacls.1.html +share/samba/swat/help/manpages/smbclient.1.html +share/samba/swat/help/manpages/smbcontrol.1.html +share/samba/swat/help/manpages/smbcquotas.1.html +share/samba/swat/help/manpages/smbd.8.html +share/samba/swat/help/manpages/smbget.1.html +share/samba/swat/help/manpages/smbgetrc.5.html +share/samba/swat/help/manpages/smbpasswd.5.html +share/samba/swat/help/manpages/smbpasswd.8.html +share/samba/swat/help/manpages/smbspool.8.html +share/samba/swat/help/manpages/smbstatus.1.html +share/samba/swat/help/manpages/smbtar.1.html +share/samba/swat/help/manpages/smbtree.1.html +share/samba/swat/help/manpages/swat.8.html +share/samba/swat/help/manpages/tdbbackup.8.html +share/samba/swat/help/manpages/tdbdump.8.html +share/samba/swat/help/manpages/tdbtool.8.html +share/samba/swat/help/manpages/testparm.1.html +share/samba/swat/help/manpages/umount.cifs.8.html +share/samba/swat/help/manpages/vfs_acl_tdb.8.html +share/samba/swat/help/manpages/vfs_acl_xattr.8.html +share/samba/swat/help/manpages/vfs_audit.8.html +share/samba/swat/help/manpages/vfs_cacheprime.8.html +share/samba/swat/help/manpages/vfs_cap.8.html +share/samba/swat/help/manpages/vfs_catia.8.html +share/samba/swat/help/manpages/vfs_commit.8.html +share/samba/swat/help/manpages/vfs_default_quota.8.html +share/samba/swat/help/manpages/vfs_dirsort.8.html +share/samba/swat/help/manpages/vfs_extd_audit.8.html +share/samba/swat/help/manpages/vfs_fake_perms.8.html +share/samba/swat/help/manpages/vfs_fileid.8.html +share/samba/swat/help/manpages/vfs_full_audit.8.html +share/samba/swat/help/manpages/vfs_gpfs.8.html +share/samba/swat/help/manpages/vfs_netatalk.8.html +share/samba/swat/help/manpages/vfs_notify_fam.8.html +share/samba/swat/help/manpages/vfs_prealloc.8.html +share/samba/swat/help/manpages/vfs_preopen.8.html +share/samba/swat/help/manpages/vfs_readahead.8.html +share/samba/swat/help/manpages/vfs_readonly.8.html +share/samba/swat/help/manpages/vfs_recycle.8.html +share/samba/swat/help/manpages/vfs_shadow_copy.8.html +share/samba/swat/help/manpages/vfs_shadow_copy2.8.html +share/samba/swat/help/manpages/vfs_smb_traffic_analyzer.8.html +share/samba/swat/help/manpages/vfs_streams_depot.8.html +share/samba/swat/help/manpages/vfs_streams_xattr.8.html +share/samba/swat/help/manpages/vfs_xattr_tdb.8.html +share/samba/swat/help/manpages/vfstest.1.html +share/samba/swat/help/manpages/wbinfo.1.html +share/samba/swat/help/manpages/winbind_krb5_locator.7.html +share/samba/swat/help/manpages/winbindd.8.html +share/samba/swat/help/welcome-no-samba-doc.html +share/samba/swat/help/welcome.html +share/samba/swat/images/globals.gif +share/samba/swat/images/home.gif +share/samba/swat/images/passwd.gif +share/samba/swat/images/printers.gif +share/samba/swat/images/samba.gif +share/samba/swat/images/shares.gif +share/samba/swat/images/status.gif +share/samba/swat/images/viewconfig.gif +share/samba/swat/images/wizard.gif +share/samba/swat/include/footer.html +share/samba/swat/include/header.html +share/samba/swat/lang/ja/help/welcome.html +share/samba/swat/lang/tr/help/welcome.html +share/samba/swat/lang/tr/images/globals.gif +share/samba/swat/lang/tr/images/home.gif +share/samba/swat/lang/tr/images/passwd.gif +share/samba/swat/lang/tr/images/printers.gif +share/samba/swat/lang/tr/images/samba.gif +share/samba/swat/lang/tr/images/shares.gif +share/samba/swat/lang/tr/images/status.gif +share/samba/swat/lang/tr/images/viewconfig.gif +share/samba/swat/using_samba/appa.html +share/samba/swat/using_samba/appb.html +share/samba/swat/using_samba/appc.html +share/samba/swat/using_samba/appd.html +share/samba/swat/using_samba/appe.html +share/samba/swat/using_samba/appf.html +share/samba/swat/using_samba/appg.html +share/samba/swat/using_samba/ch00.html +share/samba/swat/using_samba/ch01.html +share/samba/swat/using_samba/ch02.html +share/samba/swat/using_samba/ch03.html +share/samba/swat/using_samba/ch04.html +share/samba/swat/using_samba/ch05.html +share/samba/swat/using_samba/ch06.html +share/samba/swat/using_samba/ch07.html +share/samba/swat/using_samba/ch08.html +share/samba/swat/using_samba/ch09.html +share/samba/swat/using_samba/ch10.html +share/samba/swat/using_samba/ch11.html +share/samba/swat/using_samba/ch12.html +share/samba/swat/using_samba/figs/sam2_0101.gif +share/samba/swat/using_samba/figs/sam2_0102.gif +share/samba/swat/using_samba/figs/sam2_0103.gif +share/samba/swat/using_samba/figs/sam2_0104.gif +share/samba/swat/using_samba/figs/sam2_0105.gif +share/samba/swat/using_samba/figs/sam2_0106.gif +share/samba/swat/using_samba/figs/sam2_0107.gif +share/samba/swat/using_samba/figs/sam2_0108.gif +share/samba/swat/using_samba/figs/sam2_0109.gif +share/samba/swat/using_samba/figs/sam2_0110.gif +share/samba/swat/using_samba/figs/sam2_0111.gif +share/samba/swat/using_samba/figs/sam2_0112.gif +share/samba/swat/using_samba/figs/sam2_0113.gif +share/samba/swat/using_samba/figs/sam2_0114.gif +share/samba/swat/using_samba/figs/sam2_0201.gif +share/samba/swat/using_samba/figs/sam2_0202.gif +share/samba/swat/using_samba/figs/sam2_0203.gif +share/samba/swat/using_samba/figs/sam2_0204.gif +share/samba/swat/using_samba/figs/sam2_0301.gif +share/samba/swat/using_samba/figs/sam2_0302.gif +share/samba/swat/using_samba/figs/sam2_0303.gif +share/samba/swat/using_samba/figs/sam2_0304.gif +share/samba/swat/using_samba/figs/sam2_0305.gif +share/samba/swat/using_samba/figs/sam2_0306.gif +share/samba/swat/using_samba/figs/sam2_0307.gif +share/samba/swat/using_samba/figs/sam2_0308.gif +share/samba/swat/using_samba/figs/sam2_0309.gif +share/samba/swat/using_samba/figs/sam2_0310.gif +share/samba/swat/using_samba/figs/sam2_0311.gif +share/samba/swat/using_samba/figs/sam2_0312.gif +share/samba/swat/using_samba/figs/sam2_0313.gif +share/samba/swat/using_samba/figs/sam2_0314.gif +share/samba/swat/using_samba/figs/sam2_0315.gif +share/samba/swat/using_samba/figs/sam2_0316.gif +share/samba/swat/using_samba/figs/sam2_0317.gif +share/samba/swat/using_samba/figs/sam2_0318.gif +share/samba/swat/using_samba/figs/sam2_0319.gif +share/samba/swat/using_samba/figs/sam2_0320.gif +share/samba/swat/using_samba/figs/sam2_0321.gif +share/samba/swat/using_samba/figs/sam2_0322.gif +share/samba/swat/using_samba/figs/sam2_0323.gif +share/samba/swat/using_samba/figs/sam2_0324.gif +share/samba/swat/using_samba/figs/sam2_0325.gif +share/samba/swat/using_samba/figs/sam2_0326.gif +share/samba/swat/using_samba/figs/sam2_0327.gif +share/samba/swat/using_samba/figs/sam2_0328.gif +share/samba/swat/using_samba/figs/sam2_0329.gif +share/samba/swat/using_samba/figs/sam2_0330.gif +share/samba/swat/using_samba/figs/sam2_0331.gif +share/samba/swat/using_samba/figs/sam2_0332.gif +share/samba/swat/using_samba/figs/sam2_0333.gif +share/samba/swat/using_samba/figs/sam2_0334.gif +share/samba/swat/using_samba/figs/sam2_0335.gif +share/samba/swat/using_samba/figs/sam2_0336.gif +share/samba/swat/using_samba/figs/sam2_0337.gif +share/samba/swat/using_samba/figs/sam2_0338.gif +share/samba/swat/using_samba/figs/sam2_0339.gif +share/samba/swat/using_samba/figs/sam2_0340.gif +share/samba/swat/using_samba/figs/sam2_0341.gif +share/samba/swat/using_samba/figs/sam2_0342.gif +share/samba/swat/using_samba/figs/sam2_0343.gif +share/samba/swat/using_samba/figs/sam2_0344.gif +share/samba/swat/using_samba/figs/sam2_0345.gif +share/samba/swat/using_samba/figs/sam2_0346.gif +share/samba/swat/using_samba/figs/sam2_0347.gif +share/samba/swat/using_samba/figs/sam2_0348.gif +share/samba/swat/using_samba/figs/sam2_0349.gif +share/samba/swat/using_samba/figs/sam2_0350.gif +share/samba/swat/using_samba/figs/sam2_0351.gif +share/samba/swat/using_samba/figs/sam2_0352.gif +share/samba/swat/using_samba/figs/sam2_0353.gif +share/samba/swat/using_samba/figs/sam2_0354.gif +share/samba/swat/using_samba/figs/sam2_0355.gif +share/samba/swat/using_samba/figs/sam2_0356.gif +share/samba/swat/using_samba/figs/sam2_0357.gif +share/samba/swat/using_samba/figs/sam2_0358.gif +share/samba/swat/using_samba/figs/sam2_0359.gif +share/samba/swat/using_samba/figs/sam2_0360.gif +share/samba/swat/using_samba/figs/sam2_0361.gif +share/samba/swat/using_samba/figs/sam2_0401.gif +share/samba/swat/using_samba/figs/sam2_0402.gif +share/samba/swat/using_samba/figs/sam2_0403.gif +share/samba/swat/using_samba/figs/sam2_0404.gif +share/samba/swat/using_samba/figs/sam2_0405.gif +share/samba/swat/using_samba/figs/sam2_0406.gif +share/samba/swat/using_samba/figs/sam2_0407.gif +share/samba/swat/using_samba/figs/sam2_0408.gif +share/samba/swat/using_samba/figs/sam2_0409.gif +share/samba/swat/using_samba/figs/sam2_0410.gif +share/samba/swat/using_samba/figs/sam2_0411.gif +share/samba/swat/using_samba/figs/sam2_0412.gif +share/samba/swat/using_samba/figs/sam2_0413.gif +share/samba/swat/using_samba/figs/sam2_0414.gif +share/samba/swat/using_samba/figs/sam2_0415.gif +share/samba/swat/using_samba/figs/sam2_0416.gif +share/samba/swat/using_samba/figs/sam2_0417.gif +share/samba/swat/using_samba/figs/sam2_0501.gif +share/samba/swat/using_samba/figs/sam2_0502.gif +share/samba/swat/using_samba/figs/sam2_0503.gif +share/samba/swat/using_samba/figs/sam2_0504.gif +share/samba/swat/using_samba/figs/sam2_0505.gif +share/samba/swat/using_samba/figs/sam2_0506.gif +share/samba/swat/using_samba/figs/sam2_0507.gif +share/samba/swat/using_samba/figs/sam2_0508.gif +share/samba/swat/using_samba/figs/sam2_0601.gif +share/samba/swat/using_samba/figs/sam2_0602.gif +share/samba/swat/using_samba/figs/sam2_0603.gif +share/samba/swat/using_samba/figs/sam2_0604.gif +share/samba/swat/using_samba/figs/sam2_0605.gif +share/samba/swat/using_samba/figs/sam2_0701.gif +share/samba/swat/using_samba/figs/sam2_0801.gif +share/samba/swat/using_samba/figs/sam2_0802.gif +share/samba/swat/using_samba/figs/sam2_0803.gif +share/samba/swat/using_samba/figs/sam2_0804.gif +share/samba/swat/using_samba/figs/sam2_0805.gif +share/samba/swat/using_samba/figs/sam2_0806.gif +share/samba/swat/using_samba/figs/sam2_0807.gif +share/samba/swat/using_samba/figs/sam2_0808.gif +share/samba/swat/using_samba/figs/sam2_0809.gif +share/samba/swat/using_samba/figs/sam2_0810.gif +share/samba/swat/using_samba/figs/sam2_0811.gif +share/samba/swat/using_samba/figs/sam2_0901.gif +share/samba/swat/using_samba/figs/sam2_0902.gif +share/samba/swat/using_samba/figs/sam2_0903.gif +share/samba/swat/using_samba/figs/sam2_1001.gif +share/samba/swat/using_samba/figs/sam2_1002.gif +share/samba/swat/using_samba/figs/sam2_1003.gif +share/samba/swat/using_samba/figs/sam2_1004.gif +share/samba/swat/using_samba/figs/sam2_1005.gif +share/samba/swat/using_samba/figs/sam2_1006.gif +share/samba/swat/using_samba/figs/sam2_1101.gif +share/samba/swat/using_samba/figs/sam2_1102.gif +share/samba/swat/using_samba/figs/sam2_af01.gif +share/samba/swat/using_samba/figs/sam2_af02.gif +share/samba/swat/using_samba/figs/sam2_af03.gif +share/samba/swat/using_samba/figs/sam2_af04.gif +share/samba/swat/using_samba/figs/sam2_af05.gif +share/samba/swat/using_samba/figs/sam2_af06.gif +share/samba/swat/using_samba/figs/sam2_af07.gif +share/samba/swat/using_samba/inx.html +share/samba/swat/using_samba/samba2_s.gif +share/samba/swat/using_samba/samba2_xs.gif +share/samba/swat/using_samba/toc.html diff --git a/net/samba33/distinfo b/net/samba33/distinfo new file mode 100644 index 00000000000..9400e3188af --- /dev/null +++ b/net/samba33/distinfo @@ -0,0 +1,29 @@ +$NetBSD: distinfo,v 1.1.1.1 2010/02/16 16:24:15 taca Exp $ + +SHA1 (samba-3.3.10.tar.gz) = c98e67468ad9b63dada656b7ac23a875929a8a72 +RMD160 (samba-3.3.10.tar.gz) = da0da8a23ba5f10051ed4257a02b5701602b60a3 +Size (samba-3.3.10.tar.gz) = 26133606 bytes +SHA1 (patch-aa) = 4bcaa0e4fbc2e61e659dcbc779894c34c260ebcf +SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567 +SHA1 (patch-ac) = dfddc9fa7f76126e523c7859ac66ce9dd432d732 +SHA1 (patch-ad) = 447aaf4ea4cc98f0ccd5a3a22e1ffec0e69a3971 +SHA1 (patch-ae) = 6698c698dc64c0f3df159157d182eae6aaa70958 +SHA1 (patch-af) = 02293c56207899656fea2516101f2541e1939dcd +SHA1 (patch-ag) = ef8421c3d17deeb0a4621ed50a57b51c755fdd1f +SHA1 (patch-ah) = d8603bf8ed0e93070dd9d86cb229d8494fde937b +SHA1 (patch-ai) = 07619c24084bfa380302a5c215ba5283d7be94a8 +SHA1 (patch-aj) = 8b3014935317efcfe63017e1e76aad0791cf48a7 +SHA1 (patch-ak) = cb51a96310eb7dde14351e4f12b68ce8d52c92c3 +SHA1 (patch-al) = f347808c376922da057256d3614a34b556721a66 +SHA1 (patch-am) = 13744f8a5cce3016c37002079eba3c47077e8d6d +SHA1 (patch-an) = 372cf214a92fa8c2398e1877af36b325d934c514 +SHA1 (patch-ao) = 2b926a77906741c3ec0a74e272acea54b5544d74 +SHA1 (patch-ap) = 91880af078b83bd4dba2de08a3f5f289fbedba77 +SHA1 (patch-aq) = d6245dde6f4e66f589424d5ed4004e982dc6671f +SHA1 (patch-ar) = 5213b0a3d95d106939c2e268a8538c5e2901079a +SHA1 (patch-as) = a9fcb1813d55d598bf1226cf004de85701c93e61 +SHA1 (patch-at) = dcfbe79496065559380e5713a758816e538e728b +SHA1 (patch-au) = f94b27a5792acfa3742b4c07b23b3395b73eba84 +SHA1 (patch-av) = e3ebea3cf0a44fc43c8878c1563972ca2c2b60a9 +SHA1 (patch-aw) = 8dafe1df0661ce8f662716804cf39516c2499add +SHA1 (patch-ax) = 86ba06f64069a837b6422f5ea1d7b16bed7915b0 diff --git a/net/samba33/patches/patch-aa b/net/samba33/patches/patch-aa new file mode 100644 index 00000000000..8c99a442050 --- /dev/null +++ b/net/samba33/patches/patch-aa @@ -0,0 +1,36 @@ +$NetBSD: patch-aa,v 1.1.1.1 2010/02/16 16:24:15 taca Exp $ + +--- ../docs/manpages/smb.conf.5.orig 2010-01-14 10:18:02.000000000 +0000 ++++ ../docs/manpages/smb.conf.5 +@@ -6955,6 +6955,15 @@ Example: + \fI\fIpasswd chat\fR\fR\fI = \fR\fI"*Enter NEW password*" %n\en "*Reenter NEW password*" %n\en "*Password changed*"\fR\fI \fR + .RE + ++passwd expand gecos (G) ++.PP ++.RS 4 ++This boolean specifies if ampersand characters in the GECOS field of a passwd database entry should be replaced with the capitalized login name for that entry when the information is used by various Samba programs\&. This parameter is off by default\&. ++.sp ++Default: \fB\fIpasswd expand gecos\fR = no \fR ++.TP 3n ++.sp ++ + passwd program (G) + .\" passwd program + .PP +@@ -9003,6 +9012,15 @@ Default: + \fI\fIstat cache\fR\fR\fI = \fR\fIyes\fR\fI \fR + .RE + ++state directory (G) ++.PP ++.RS 4 ++This parameter defines the directory the Samba daemon processes will use for storing state files that must persist across machine reboots. ++.sp ++Default: ++\fB\fIstate directory\fR = /var/db/samba \fR ++.RE ++ + store dos attributes (S) + .\" store dos attributes + .PP diff --git a/net/samba33/patches/patch-ab b/net/samba33/patches/patch-ab new file mode 100644 index 00000000000..d8df2893447 --- /dev/null +++ b/net/samba33/patches/patch-ab @@ -0,0 +1,57 @@ +$NetBSD: patch-ab,v 1.1.1.1 2010/02/16 16:24:15 taca Exp $ + +--- ../examples/smb.conf.default.orig 2010-01-14 10:12:10.000000000 +0000 ++++ ../examples/smb.conf.default +@@ -26,7 +26,7 @@ + workgroup = MYGROUP + + # server string is the equivalent of the NT Description field +- server string = Samba Server ++ server string = Samba %v (%h) + + # Security mode. Defines in which mode Samba will operate. Possible + # values are share, user, server, domain and ads. Most people will want +@@ -63,10 +63,10 @@ + + # this tells Samba to use a separate log file for each machine + # that connects +- log file = /usr/local/samba/var/log.%m ++; log file = @VARBASE@/log/log.%m + + # Put a capping on the size of the log files (in Kb). +- max log size = 50 ++; max log size = 50 + + # Use password server option only with security = server + # The argument list may include: +@@ -145,7 +145,7 @@ + + # DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names + # via DNS nslookups. The default is NO. +- dns proxy = no ++; dns proxy = no + + # These scripts are used on a domain controller or stand-alone + # machine to add or delete corresponding unix accounts +@@ -182,14 +182,14 @@ + + # NOTE: If you have a BSD-style print system there is no need to + # specifically define each individual printer +-[printers] +- comment = All Printers +- path = /usr/spool/samba +- browseable = no ++;[printers] ++; comment = All Printers ++; path = /usr/spool/samba ++; browseable = no + # Set public = yes to allow user 'guest account' to print +- guest ok = no +- writable = no +- printable = yes ++; guest ok = no ++; writable = no ++; printable = yes + + # This one is useful for people to share files + ;[tmp] diff --git a/net/samba33/patches/patch-ac b/net/samba33/patches/patch-ac new file mode 100644 index 00000000000..dd1c839986a --- /dev/null +++ b/net/samba33/patches/patch-ac @@ -0,0 +1,99 @@ +$NetBSD: patch-ac,v 1.1.1.1 2010/02/16 16:24:15 taca Exp $ + +--- Makefile.in.orig 2010-01-14 10:12:10.000000000 +0000 ++++ Makefile.in +@@ -1432,7 +1432,7 @@ bin/smbget@EXEEXT@: $(BINARY_PREREQS) $( + @echo Linking $@ + @$(CC) $(FLAGS) -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ + $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \ +- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) ++ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(PASSDB_LIBS) + + bin/nmblookup@EXEEXT@: $(BINARY_PREREQS) $(NMBLOOKUP_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ + @echo Linking $@ +@@ -1478,18 +1478,18 @@ bin/smbcacls@EXEEXT@: $(BINARY_PREREQS) + @echo Linking $@ + @$(CC) $(FLAGS) -o $@ $(SMBCACLS_OBJ) $(DYNEXP) $(LDFLAGS) \ + $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \ +- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) ++ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(PASSDB_LIBS) + + bin/smbcquotas@EXEEXT@: $(BINARY_PREREQS) $(SMBCQUOTAS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ + @echo Linking $@ + @$(CC) $(FLAGS) -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) \ + $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \ +- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) ++ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(PASSDB_LIBS) + + bin/eventlogadm@EXEEXT@: $(BINARY_PREREQS) $(EVTLOGADM_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ + @echo Linking $@ + @$(CC) $(FLAGS) -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS) \ +- $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) ++ $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(PASSDB_LIBS) + + bin/sharesec@EXEEXT@: $(BINARY_PREREQS) $(SHARESEC_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ + @echo Linking $@ +@@ -2488,13 +2488,13 @@ bin/ntlm_auth@EXEEXT@: $(BINARY_PREREQS) + @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(NTLM_AUTH_OBJ) \ + $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBS) \ + $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \ +- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) ++ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(PASSDB_LIBS) + + bin/pam_smbpass.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_SMBPASS_OBJ) @LIBTALLOC_SHARED@ @LIBWBCLIENT_SHARED@ @LIBTDB_SHARED@ + @echo "Linking shared library $@" + @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) \ + $(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \ +- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) ++ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(PASSDB_LIBS) + + bin/tdbbackup@EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ + @echo Linking $@ +@@ -2544,7 +2544,7 @@ bin/rpc_open_tcp@EXEEXT@: $(BINARY_PRERE + + install:: installservers installbin @INSTALL_CIFSMOUNT@ @INSTALL_CIFSUPCALL@ installman \ + installscripts installdat installmodules @SWAT_INSTALL_TARGETS@ \ +- @INSTALL_PAM_MODULES@ installlibs installmo ++ @INSTALL_PAM_MODULES@ installlibs installmo @INSTALL_LIBADDNS@ + + install-everything:: install installmodules + +@@ -2557,7 +2557,7 @@ install-everything:: install installmodu + # is not used + + installdirs:: +- @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(BINDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(PRIVATEDIR) $(PIDDIR) $(LOCKDIR) $(MANDIR) $(CODEPAGEDIR) $(MODULESDIR) $(LOCALEDIR) ++ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(BINDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(STATEDIR) $(PRIVATEDIR) $(PIDDIR) $(LOCKDIR) $(MANDIR) $(CODEPAGEDIR) $(MODULESDIR) $(LOCALEDIR) + + installservers:: all installdirs + @$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(SBINDIR) $(SBIN_PROGS) +@@ -2580,7 +2580,9 @@ installmodules:: modules installdirs + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(PDBLIBDIR) $(PDB_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(RPCLIBDIR) $(RPC_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(IDMAPLIBDIR) $(IDMAP_MODULES) +- @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(NSSINFOLIBDIR) $(NSS_INFO_MODULES) ++ @if [ -n "$(NSS_INFO_MODULES)" ]; then \ ++ @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(NSSINFOLIBDIR) $(NSS_INFO_MODULES); \ ++ fi + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(CHARSETLIBDIR) $(CHARSET_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(AUTHLIBDIR) $(AUTH_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(GPEXTLIBDIR) $(GPEXT_MODULES) +@@ -2591,7 +2593,9 @@ installmodules:: modules installdirs + @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) sam.@SHLIBEXT@ sam_ignoredomain.@SHLIBEXT@ + @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) domain.@SHLIBEXT@ trustdomain.@SHLIBEXT@ ntdomain.@SHLIBEXT@ + @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) builtin.@SHLIBEXT@ guest.@SHLIBEXT@ fixed_challenge.@SHLIBEXT@ name_to_ntstatus.@SHLIBEXT@ +- @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(NSSINFOLIBDIR) ../idmap/ad.@SHLIBEXT@ rfc2307.@SHLIBEXT@ sfu.@SHLIBEXT@ sfu20.@SHLIBEXT@ ++ @if [ -n "$(NSS_INFO_MODULES)" ]; then \ ++ @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(NSSINFOLIBDIR) ../idmap/ad.@SHLIBEXT@ rfc2307.@SHLIBEXT@ sfu.@SHLIBEXT@ sfu20.@SHLIBEXT@; \ ++ fi + @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(NSSINFOLIBDIR) ../idmap/adex.@SHLIBEXT@ adex.@SHLIBEXT@ + @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(NSSINFOLIBDIR) ../idmap/hash.@SHLIBEXT@ hash.@SHLIBEXT@ + +@@ -2640,6 +2644,7 @@ showlayout:: + @echo " privatedir: $(PRIVATE_DIR)" + @echo " configdir: $(CONFIGDIR)" + @echo " lockdir: $(LOCKDIR)" ++ @echo " statedir: $(STATEDIR)" + @echo " piddir: $(PIDDIR)" + @echo " swatdir: $(SWATDIR)" + @echo " codepagedir: $(CODEPAGEDIR)" diff --git a/net/samba33/patches/patch-ad b/net/samba33/patches/patch-ad new file mode 100644 index 00000000000..0a09d6e1650 --- /dev/null +++ b/net/samba33/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1.1.1 2010/02/16 16:24:15 taca Exp $ + +--- VERSION.orig 2010-01-14 10:12:10.000000000 +0000 ++++ VERSION +@@ -84,7 +84,7 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT= + # SAMBA_VERSION_VENDOR_FUNCTION # + # # + ######################################################## +-SAMBA_VERSION_VENDOR_SUFFIX= ++SAMBA_VERSION_VENDOR_SUFFIX="pkgsrc" + SAMBA_VERSION_VENDOR_PATCH= + + ######################################################## diff --git a/net/samba33/patches/patch-ae b/net/samba33/patches/patch-ae new file mode 100644 index 00000000000..cb1cf2e5592 --- /dev/null +++ b/net/samba33/patches/patch-ae @@ -0,0 +1,15 @@ +$NetBSD: patch-ae,v 1.1.1.1 2010/02/16 16:24:15 taca Exp $ + +--- auth/pampass.c.orig 2010-01-14 10:12:10.000000000 +0000 ++++ auth/pampass.c +@@ -46,6 +46,10 @@ + #include <pam/pam_appl.h> + #endif + ++#if defined(PAM_AUTHTOK_RECOVERY_ERR) && !defined(PAM_AUTHTOK_RECOVER_ERR) ++#define PAM_AUTHTOK_RECOVER_ERR PAM_AUTHTOK_RECOVERY_ERR ++#endif ++ + /* + * Structure used to communicate between the conversation function + * and the server_login/change password functions. diff --git a/net/samba33/patches/patch-af b/net/samba33/patches/patch-af new file mode 100644 index 00000000000..afd7c90a41b --- /dev/null +++ b/net/samba33/patches/patch-af @@ -0,0 +1,196 @@ +$NetBSD: patch-af,v 1.1.1.1 2010/02/16 16:24:16 taca Exp $ + +--- configure.orig 2010-01-14 10:38:54.000000000 +0000 ++++ configure +@@ -899,6 +899,7 @@ with_fhs + with_privatedir + with_rootsbindir + with_lockdir ++with_statedir + with_piddir + with_swatdir + with_configdir +@@ -1637,6 +1638,8 @@ Optional Packages: + ($ac_default_prefix/sbin) + --with-lockdir=DIR Where to put lock files + ($ac_default_prefix/var/locks) ++ --with-statedir=DIR Where to put state files ++ ($ac_default_prefix/var/locks) + --with-piddir=DIR Where to put pid files + ($ac_default_prefix/var/locks) + --with-swatdir=DIR Where to put SWAT files ($ac_default_prefix/swat) +@@ -2403,6 +2406,7 @@ echo "LIBREPLACE_LOCATION_CHECKS: END" + + rootsbindir="\${SBINDIR}" + lockdir="\${VARDIR}/locks" ++statedir="\${VARDIR}/locks" + piddir="\${VARDIR}/locks" + test "${mandir}" || mandir="\${prefix}/man" + logfilebase="\${VARDIR}" +@@ -2422,7 +2426,8 @@ localedir="\${prefix}/share/locale" + if test "${with_fhs+set}" = set; then + withval=$with_fhs; case "$withval" in + yes) +- lockdir="\${VARDIR}/lib/samba" ++ lockdir="\${VARDIR}/run/samba" ++ statedir="\${VARDIR}/db/samba" + piddir="\${VARDIR}/run" + mandir="\${prefix}/share/man" + logfilebase="\${VARDIR}/log/samba" +@@ -2505,6 +2510,26 @@ fi + + + ################################################# ++# set state directory location ++ ++# Check whether --with-statedir was given. ++if test "${with_statedir+set}" = set; then ++ withval=$with_statedir; case "$withval" in ++ yes|no) ++ # ++ # Just in case anybody calls it without argument ++ # ++ { $as_echo "$as_me:$LINENO: WARNING: --with-statedir called without argument - will use default" >&5 ++$as_echo "$as_me: WARNING: --with-statedir called without argument - will use default" >&2;} ++ ;; ++ * ) ++ statedir="$withval" ++ ;; ++ esac ++fi ++ ++ ++################################################# + # set pid directory location + + # Check whether --with-piddir was given. +@@ -40236,7 +40261,7 @@ done + + + +-for ac_func in getdents getdents64 ++for ac_func in getdents getdents64 getpwent_r + do + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +@@ -60703,9 +60728,9 @@ LIBS="-lcrypto $KRB5_LIBS $LIBS" + + + +- { $as_echo "$as_me:$LINENO: checking for des_set_key in -lcrypto" >&5 +-$as_echo_n "checking for des_set_key in -lcrypto... " >&6; } +-if test "${ac_cv_lib_ext_crypto_des_set_key+set}" = set; then ++ { $as_echo "$as_me:$LINENO: checking for EVP_des_cbc -lcrypto" >&5 ++$as_echo_n "checking for EVP_des_cbc in -lcrypto... " >&6; } ++if test "${ac_cv_lib_ext_crypto_EVP_des_cbc+set}" = set; then + $as_echo_n "(cached) " >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -60721,11 +60746,11 @@ cat >>conftest.$ac_ext <<_ACEOF + #ifdef __cplusplus + extern "C" + #endif +-char des_set_key (); ++char EVP_des_cbc (); + int + main () + { +-return des_set_key (); ++return EVP_des_cbc (); + ; + return 0; + } +@@ -60751,13 +60776,13 @@ $as_echo "$ac_try_echo") >&5 + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then +- ac_cv_lib_ext_crypto_des_set_key=yes; ++ ac_cv_lib_ext_crypto_EVP_des_cbc=yes; + ac_cv_lib_ext_crypto=yes + else + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_ext_crypto_des_set_key=no; ++ ac_cv_lib_ext_crypto_EVP_des_cbc=no; + ac_cv_lib_ext_crypto=no + fi + +@@ -60766,11 +60791,11 @@ rm -f core conftest.err conftest.$ac_obj + conftest$ac_exeext conftest.$ac_ext + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_crypto_des_set_key" >&5 +-$as_echo "$ac_cv_lib_ext_crypto_des_set_key" >&6; } +- if test $ac_cv_lib_ext_crypto_des_set_key = yes; then ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_crypto_EVP_des_cbc" >&5 ++$as_echo "$ac_cv_lib_ext_crypto_EVP_des_cbc" >&6; } ++ if test $ac_cv_lib_ext_crypto_EVP_des_cbc = yes; then + cat >>confdefs.h <<_ACEOF +-#define HAVE_DES_SET_KEY 1 ++#define HAVE_EVP_DES_CBC 1 + _ACEOF + + fi +@@ -76724,31 +76749,39 @@ case "$host_os" in + NSSSONAMEVERSIONSUFFIX=".2" + WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o" + ;; +- *freebsd[5-9]*) +- # FreeBSD winbind client is implemented as a wrapper around +- # the Linux version. +- NSSSONAMEVERSIONSUFFIX=".1" +- WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \ +- nsswitch/winbind_nss_linux.o" +- WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT" +- WINBIND_WINS_NSS="nsswitch/nss_wins.$SHLIBEXT" +- ;; +- +- *netbsd*[3-9]*) +- # NetBSD winbind client is implemented as a wrapper +- # around the Linux version. It needs getpwent_r() to +- # indicate libc's use of the correct nsdispatch API. +- # +- if test x"$ac_cv_func_getpwent_r" = x"yes"; then +- WINBIND_NSS_EXTRA_OBJS="\ +- nsswitch/winbind_nss_netbsd.o \ ++ *freebsd*) ++ case "$UNAME_R" in ++ [5-9]*) ++ # FreeBSD winbind client is implemented as a wrapper ++ # around the Linux version. ++ NSSSONAMEVERSIONSUFFIX=".1" ++ WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \ + nsswitch/winbind_nss_linux.o" + WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT" + WINBIND_WINS_NSS="nsswitch/nss_wins.$SHLIBEXT" +- else +- HAVE_WINBIND=no +- winbind_no_reason=", getpwent_r is missing on $host_os so winbind is unsupported" +- fi ++ ;; ++ esac ++ ;; ++ ++ *netbsd*) ++ case "$UNAME_R" in ++ [3-9]*) ++ # NetBSD winbind client is implemented as a wrapper ++ # around the Linux version. It needs getpwent_r() to ++ # indicate libc's use of the correct nsdispatch API. ++ # ++ if test x"$ac_cv_func_getpwent_r" = x"yes"; then ++ WINBIND_NSS_EXTRA_OBJS="\ ++ nsswitch/winbind_nss_netbsd.o \ ++ nsswitch/winbind_nss_linux.o" ++ WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT" ++ WINBIND_WINS_NSS="nsswitch/nss_wins.$SHLIBEXT" ++ else ++ HAVE_WINBIND=no ++ winbind_no_reason=", getpwent_r is missing on $host_os so winbind is unsupported" ++ fi ++ ;; ++ esac + ;; + *irix*) + # IRIX has differently named shared libraries diff --git a/net/samba33/patches/patch-ag b/net/samba33/patches/patch-ag new file mode 100644 index 00000000000..cd47346d189 --- /dev/null +++ b/net/samba33/patches/patch-ag @@ -0,0 +1,26 @@ +$NetBSD: patch-ag,v 1.1.1.1 2010/02/16 16:24:16 taca Exp $ + +--- dynconfig.c.orig 2010-01-14 10:12:10.000000000 +0000 ++++ dynconfig.c +@@ -79,20 +79,7 @@ DEFINE_DYN_CONFIG_PARAM(LOCKDIR) + DEFINE_DYN_CONFIG_PARAM(PIDDIR) + DEFINE_DYN_CONFIG_PARAM(SMB_PASSWD_FILE) + DEFINE_DYN_CONFIG_PARAM(PRIVATE_DIR) +- +-/* In non-FHS mode, these should be configurable using 'lock dir ='; +- but in FHS mode, they are their own directory. Implement as wrapper +- functions so that everything can still be kept in dynconfig.c. +- */ +- +-const char *get_dyn_STATEDIR(void) +-{ +-#ifdef FHS_COMPATIBLE +- return STATEDIR; +-#else +- return lp_lockdir(); +-#endif +-} ++DEFINE_DYN_CONFIG_PARAM(STATEDIR) + + const char *get_dyn_CACHEDIR(void) + { diff --git a/net/samba33/patches/patch-ah b/net/samba33/patches/patch-ah new file mode 100644 index 00000000000..ce2cc01fb6b --- /dev/null +++ b/net/samba33/patches/patch-ah @@ -0,0 +1,15 @@ +$NetBSD: patch-ah,v 1.1.1.1 2010/02/16 16:24:16 taca Exp $ + +--- include/dynconfig.h.orig 2010-01-14 10:12:10.000000000 +0000 ++++ include/dynconfig.h +@@ -71,6 +71,10 @@ const char *get_dyn_PIDDIR(void); + const char *set_dyn_PIDDIR(const char *newpath); + bool is_default_dyn_PIDDIR(void); + ++const char *get_dyn_STATEDIR(void); ++const char *set_dyn_STATEDIR(const char *newpath); ++bool is_default_dyn_STATEDIR(void); ++ + const char *get_dyn_SMB_PASSWD_FILE(void); + const char *set_dyn_SMB_PASSWD_FILE(const char *newpath); + bool is_default_dyn_SMB_PASSWD_FILE(void); diff --git a/net/samba33/patches/patch-ai b/net/samba33/patches/patch-ai new file mode 100644 index 00000000000..f6488d59f0b --- /dev/null +++ b/net/samba33/patches/patch-ai @@ -0,0 +1,17 @@ +$NetBSD: patch-ai,v 1.1.1.1 2010/02/16 16:24:16 taca Exp $ + +--- include/local.h.orig 2010-01-14 10:12:10.000000000 +0000 ++++ include/local.h +@@ -170,10 +170,10 @@ + * Default passwd chat script. + */ + +-#define DEFAULT_PASSWD_CHAT "*new*password* %n\\n *new*password* %n\\n *changed*" ++#define DEFAULT_PASSWD_CHAT "*\\n*ew\\spassword* %n\\n *ew\\spassword* %n\\n *updating\\sthe\\sdatabase...\\npasswd:\\sdone\\n" + + /* Minimum length of allowed password when changing UNIX password. */ +-#define MINPASSWDLENGTH 5 ++#define MINPASSWDLENGTH 6 + + /* maximum ID number used for session control. This cannot be larger + than 62*62 for the current code */ diff --git a/net/samba33/patches/patch-aj b/net/samba33/patches/patch-aj new file mode 100644 index 00000000000..31fd8c73397 --- /dev/null +++ b/net/samba33/patches/patch-aj @@ -0,0 +1,12 @@ +$NetBSD: patch-aj,v 1.1.1.1 2010/02/16 16:24:16 taca Exp $ + +--- include/proto.h.orig 2010-01-14 10:12:10.000000000 +0000 ++++ include/proto.h +@@ -5629,6 +5629,7 @@ char *lp_addprinter_cmd(void); + char *lp_deleteprinter_cmd(void); + char *lp_os2_driver_map(void); + char *lp_lockdir(void); ++char *lp_statedir(void); + char *lp_piddir(void); + char *lp_mangling_method(void); + int lp_mangle_prefix(void); diff --git a/net/samba33/patches/patch-ak b/net/samba33/patches/patch-ak new file mode 100644 index 00000000000..dacc7833606 --- /dev/null +++ b/net/samba33/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.1.1.1 2010/02/16 16:24:16 taca Exp $ + +--- intl/lang_tdb.c.orig 2010-01-14 10:12:10.000000000 +0000 ++++ intl/lang_tdb.c +@@ -139,7 +139,7 @@ bool lang_tdb_init(const char *lang) + goto done; + } + +- if (asprintf(&path, "%s%s.tdb", lock_path("lang_"), lang) == -1) { ++ if (asprintf(&path, "%s%s.tdb", state_path("lang_"), lang) == -1) { + DEBUG(0, ("asprintf failed\n")); + goto done; + } diff --git a/net/samba33/patches/patch-al b/net/samba33/patches/patch-al new file mode 100644 index 00000000000..4cb20d797dc --- /dev/null +++ b/net/samba33/patches/patch-al @@ -0,0 +1,19 @@ +$NetBSD: patch-al,v 1.1.1.1 2010/02/16 16:24:16 taca Exp $ + +--- lib/ldb/tests/test-schema.sh.orig 2010-01-14 10:12:10.000000000 +0000 ++++ lib/ldb/tests/test-schema.sh +@@ -19,12 +19,12 @@ $VALGRIND bin/ldbmodify $LDBDIR/tests/sc + $VALGRIND bin/ldbmodify $LDBDIR/tests/schema-tests/schema-mod-test-2.ldif || exit 1 + $VALGRIND bin/ldbmodify $LDBDIR/tests/schema-tests/schema-mod-test-3.ldif || exit 1 + $VALGRIND bin/ldbmodify $LDBDIR/tests/schema-tests/schema-mod-test-4.ldif +-if [ "$?" == "0" ]; then ++if [ "$?" = "0" ]; then + echo "test failed!" + exit 1 + fi + $VALGRIND bin/ldbmodify $LDBDIR/tests/schema-tests/schema-mod-test-5.ldif +-if [ "$?" == "0" ]; then ++if [ "$?" = "0" ]; then + echo "test failed!" + exit 1 + fi diff --git a/net/samba33/patches/patch-am b/net/samba33/patches/patch-am new file mode 100644 index 00000000000..e59feee9855 --- /dev/null +++ b/net/samba33/patches/patch-am @@ -0,0 +1,78 @@ +$NetBSD: patch-am,v 1.1.1.1 2010/02/16 16:24:16 taca Exp $ + +Add support for "passwd expand gecos". + +--- lib/util_pw.c.orig 2010-01-14 10:12:10.000000000 +0000 ++++ lib/util_pw.c +@@ -4,6 +4,7 @@ + Safe versions of getpw* calls + + Copyright (C) Andrew Bartlett 2002 ++ Copyright (C) Luke Mewburn 2004 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -21,9 +22,12 @@ + + #include "includes.h" + ++static char *passwd_expand_gecos(const struct passwd *); ++ + struct passwd *tcopy_passwd(TALLOC_CTX *mem_ctx, const struct passwd *from) + { + struct passwd *ret = TALLOC_P(mem_ctx, struct passwd); ++ char *gecos; + if (!ret) { + return NULL; + } +@@ -31,7 +35,10 @@ struct passwd *tcopy_passwd(TALLOC_CTX * + ret->pw_passwd = talloc_strdup(ret, from->pw_passwd); + ret->pw_uid = from->pw_uid; + ret->pw_gid = from->pw_gid; +- ret->pw_gecos = talloc_strdup(ret, from->pw_gecos); ++ gecos = (from->pw_gecos != NULL) ? passwd_expand_gecos(from) : NULL; ++ ret->pw_gecos = talloc_strdup(ret, gecos); ++ if (gecos != NULL) ++ SAFE_FREE(gecos); + ret->pw_dir = talloc_strdup(ret, from->pw_dir); + ret->pw_shell = talloc_strdup(ret, from->pw_shell); + return ret; +@@ -85,3 +92,38 @@ struct passwd *getpwuid_alloc(TALLOC_CTX + + return tcopy_passwd(mem_ctx, temp); + } ++ ++ ++/**************************************************************** ++ Expand any `&' characters in pw_gecos with a capitalized pw_name. ++****************************************************************/ ++ ++static char *passwd_expand_gecos(const struct passwd *pw) ++{ ++ char *p, *bp, *buf; ++ size_t ac, buflen; ++ ++ if (!lp_passwd_expand_gecos()) { ++ return smb_xstrdup(pw->pw_gecos); ++ } ++ ++ ac = 0; ++ /* count number of `&' in pw_gecos */ ++ for (p = pw->pw_gecos; *p; p++) { ++ if (*p == '&') ++ ac++; ++ } ++ buflen = strlen(pw->pw_gecos) + (ac * (strlen(pw->pw_name) - 1)) + 1; ++ buf = smb_xmalloc_array(sizeof(char), buflen); ++ bp = buf; ++ for (p = pw->pw_gecos; *p; p++) { ++ if (*p == '&') { /* replace & with capitalized pw_name */ ++ ac = snprintf(bp, buflen - (bp - buf), ++ "%s", pw->pw_name); ++ *bp = toupper((unsigned char)*bp); ++ bp += ac; ++ } else ++ *bp++ = *p; ++ } ++ return buf; ++} diff --git a/net/samba33/patches/patch-an b/net/samba33/patches/patch-an new file mode 100644 index 00000000000..369a6685619 --- /dev/null +++ b/net/samba33/patches/patch-an @@ -0,0 +1,13 @@ +$NetBSD: patch-an,v 1.1.1.1 2010/02/16 16:24:16 taca Exp $ + +--- modules/vfs_acl_tdb.c.orig 2010-01-14 10:12:10.000000000 +0000 ++++ modules/vfs_acl_tdb.c +@@ -44,7 +44,7 @@ static bool acl_tdb_init(struct db_conte + return true; + } + +- dbname = lock_path("file_ntacls.tdb"); ++ dbname = state_path("file_ntacls.tdb"); + + if (dbname == NULL) { + errno = ENOSYS; diff --git a/net/samba33/patches/patch-ao b/net/samba33/patches/patch-ao new file mode 100644 index 00000000000..55b4ef20562 --- /dev/null +++ b/net/samba33/patches/patch-ao @@ -0,0 +1,13 @@ +$NetBSD: patch-ao,v 1.1.1.1 2010/02/16 16:24:16 taca Exp $ + +--- modules/vfs_xattr_tdb.c.orig 2010-01-14 10:12:10.000000000 +0000 ++++ modules/vfs_xattr_tdb.c +@@ -576,7 +576,7 @@ static bool xattr_tdb_init(int snum, str + const char *dbname; + + dbname = lp_parm_const_string(snum, "xattr_tdb", "file", +- lock_path("xattr.tdb")); ++ state_path("xattr.tdb")); + + if (dbname == NULL) { + errno = ENOSYS; diff --git a/net/samba33/patches/patch-ap b/net/samba33/patches/patch-ap new file mode 100644 index 00000000000..fabde499d6a --- /dev/null +++ b/net/samba33/patches/patch-ap @@ -0,0 +1,15 @@ +$NetBSD: patch-ap,v 1.1.1.1 2010/02/16 16:24:16 taca Exp $ + +--- nmbd/nmbd.c.orig 2010-01-14 10:12:10.000000000 +0000 ++++ nmbd/nmbd.c +@@ -909,6 +909,10 @@ static bool open_sockets(bool isdaemon, + mkdir(lp_lockdir(), 0755); + } + ++ if (!directory_exist(lp_statedir(), NULL)) { ++ mkdir(lp_statedir(), 0755); ++ } ++ + pidfile_create("nmbd"); + + if (!reinit_after_fork(nmbd_messaging_context(), diff --git a/net/samba33/patches/patch-aq b/net/samba33/patches/patch-aq new file mode 100644 index 00000000000..0dd75460d6b --- /dev/null +++ b/net/samba33/patches/patch-aq @@ -0,0 +1,98 @@ +$NetBSD: patch-aq,v 1.1.1.1 2010/02/16 16:24:16 taca Exp $ + +Add support for: + + passwd expand gecos + state directory + +--- param/loadparm.c.orig 2010-01-14 10:12:10.000000000 +0000 ++++ param/loadparm.c +@@ -121,6 +121,7 @@ struct global { + char *szDeletePrinterCommand; + char *szOs2DriverMap; + char *szLockDir; ++ char *szStateDir; + char *szPidDir; + char *szRootdir; + char *szDefaultService; +@@ -297,6 +298,7 @@ struct global { + bool bUnixPasswdSync; + bool bPasswdChatDebug; + int iPasswdChatTimeout; ++ bool bPasswdExpandGecos; + bool bTimestampLogs; + bool bNTSmbSupport; + bool bNTPipeSupport; +@@ -589,7 +591,7 @@ static struct service sDefault = { + True, /* bLevel2OpLocks */ + False, /* bOnlyUser */ + True, /* bMangledNames */ +- True, /* bWidelinks */ ++ False, /* bWidelinks */ + True, /* bSymlinks */ + False, /* bSyncAlways */ + False, /* bStrictAllocate */ +@@ -1248,6 +1250,15 @@ static struct parm_struct parm_table[] = + .flags = FLAG_ADVANCED, + }, + { ++ .label = "passwd expand gecos", ++ .type = P_BOOL, ++ .p_class = P_GLOBAL, ++ .ptr = &Globals.bPasswdExpandGecos, ++ .special = NULL, ++ .enum_list = NULL, ++ .flags = FLAG_ADVANCED, ++ }, ++ { + .label = "check password script", + .type = P_STRING, + .p_class = P_GLOBAL, +@@ -3729,6 +3740,15 @@ static struct parm_struct parm_table[] = + .flags = FLAG_HIDE, + }, + { ++ .label = "state directory", ++ .type = P_STRING, ++ .p_class = P_GLOBAL, ++ .ptr = &Globals.szStateDir, ++ .special = NULL, ++ .enum_list = NULL, ++ .flags = FLAG_ADVANCED ++ }, ++ { + .label = "pid directory", + .type = P_STRING, + .p_class = P_GLOBAL, +@@ -4667,6 +4687,7 @@ static void init_globals(bool first_time + string_set(&Globals.szPasswdProgram, ""); + string_set(&Globals.szPidDir, get_dyn_PIDDIR()); + string_set(&Globals.szLockDir, get_dyn_LOCKDIR()); ++ string_set(&Globals.szStateDir, get_dyn_STATEDIR()); + string_set(&Globals.szSocketAddress, "0.0.0.0"); + + if (asprintf(&s, "Samba %s", SAMBA_VERSION_STRING) < 0) { +@@ -4759,6 +4780,7 @@ static void init_globals(bool first_time + Globals.bPamPasswordChange = False; + Globals.bPasswdChatDebug = False; + Globals.iPasswdChatTimeout = 2; /* 2 second default. */ ++ Globals.bPasswdExpandGecos = False; + Globals.bNTPipeSupport = True; /* Do NT pipes by default. */ + Globals.bNTStatusSupport = True; /* Use NT status by default. */ + Globals.bStatCache = True; /* use stat cache by default */ +@@ -4999,6 +5021,7 @@ FN_GLOBAL_STRING(lp_addprinter_cmd, &Glo + FN_GLOBAL_STRING(lp_deleteprinter_cmd, &Globals.szDeletePrinterCommand) + FN_GLOBAL_STRING(lp_os2_driver_map, &Globals.szOs2DriverMap) + FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir) ++FN_GLOBAL_STRING(lp_statedir, &Globals.szStateDir) + FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir) + FN_GLOBAL_STRING(lp_mangling_method, &Globals.szManglingMethod) + FN_GLOBAL_INTEGER(lp_mangle_prefix, &Globals.mangle_prefix) +@@ -5178,6 +5201,7 @@ FN_GLOBAL_BOOL(lp_pam_password_change, & + FN_GLOBAL_BOOL(lp_unix_password_sync, &Globals.bUnixPasswdSync) + FN_GLOBAL_BOOL(lp_passwd_chat_debug, &Globals.bPasswdChatDebug) + FN_GLOBAL_INTEGER(lp_passwd_chat_timeout, &Globals.iPasswdChatTimeout) ++FN_GLOBAL_BOOL(lp_passwd_expand_gecos, &Globals.bPasswdExpandGecos) + FN_GLOBAL_BOOL(lp_nt_pipe_support, &Globals.bNTPipeSupport) + FN_GLOBAL_BOOL(lp_nt_status_support, &Globals.bNTStatusSupport) + FN_GLOBAL_BOOL(lp_stat_cache, &Globals.bStatCache) diff --git a/net/samba33/patches/patch-ar b/net/samba33/patches/patch-ar new file mode 100644 index 00000000000..0b06494946b --- /dev/null +++ b/net/samba33/patches/patch-ar @@ -0,0 +1,13 @@ +$NetBSD: patch-ar,v 1.1.1.1 2010/02/16 16:24:16 taca Exp $ + +--- script/installman.sh.orig 2010-01-14 10:12:10.000000000 +0000 ++++ script/installman.sh +@@ -33,7 +33,7 @@ for lang in $langs; do + langdir=$MANDIR/$lang + for d in $MANDIR $langdir $langdir/man1 $langdir/man5 $langdir/man7 $langdir/man8; do + if [ ! -d $d ]; then +- mkdir $d ++ mkdir -p $d + if [ ! -d $d ]; then + echo Failed to make directory $d, does $USER have privileges? + exit 1 diff --git a/net/samba33/patches/patch-as b/net/samba33/patches/patch-as new file mode 100644 index 00000000000..48c328aa65c --- /dev/null +++ b/net/samba33/patches/patch-as @@ -0,0 +1,13 @@ +$NetBSD: patch-as,v 1.1.1.1 2010/02/16 16:24:16 taca Exp $ + +--- script/installmodules.sh.orig 2010-01-14 10:12:10.000000000 +0000 ++++ script/installmodules.sh +@@ -11,7 +11,7 @@ shift + + for d in $prefix $LIBDIR; do + if [ ! -d $DESTDIR/$d ]; then +-mkdir $DESTDIR/$d ++mkdir -p $DESTDIR/$d + if [ ! -d $DESTDIR/$d ]; then + echo Failed to make directory $DESTDIR/$d + exit 1 diff --git a/net/samba33/patches/patch-at b/net/samba33/patches/patch-at new file mode 100644 index 00000000000..3daff5360bf --- /dev/null +++ b/net/samba33/patches/patch-at @@ -0,0 +1,13 @@ +$NetBSD: patch-at,v 1.1.1.1 2010/02/16 16:24:16 taca Exp $ + +--- script/installscripts.sh.orig 2010-01-14 10:12:10.000000000 +0000 ++++ script/installscripts.sh +@@ -12,7 +12,7 @@ echo Installing scripts in $BINDIR + + for d in $BINDIR; do + if [ ! -d $d ]; then +- mkdir $d ++ mkdir -p $d + if [ ! -d $d ]; then + echo Failed to make directory $d + echo Have you run installbin first? diff --git a/net/samba33/patches/patch-au b/net/samba33/patches/patch-au new file mode 100644 index 00000000000..ffe0cb210a3 --- /dev/null +++ b/net/samba33/patches/patch-au @@ -0,0 +1,13 @@ +$NetBSD: patch-au,v 1.1.1.1 2010/02/16 16:24:16 taca Exp $ + +--- script/installswat.sh.orig 2010-01-14 10:12:10.000000000 +0000 ++++ script/installswat.sh +@@ -140,7 +140,7 @@ if [ -d $SRCDIR../docs/htmldocs/ ]; then + + INSTALLDIR="$DESTDIR/$SWATDIR/help/`echo $dir | sed 's/htmldocs\///g'`" + if test ! -d "$INSTALLDIR" -a "$mode" = 'install'; then +- mkdir "$INSTALLDIR" ++ mkdir -p "$INSTALLDIR" + if test ! -d "$INSTALLDIR"; then + echo "Failed to make directory $INSTALLDIR, does $USER have privileges? " + exit 1 diff --git a/net/samba33/patches/patch-av b/net/samba33/patches/patch-av new file mode 100644 index 00000000000..ed7ad8b2f26 --- /dev/null +++ b/net/samba33/patches/patch-av @@ -0,0 +1,14 @@ +$NetBSD: patch-av,v 1.1.1.1 2010/02/16 16:24:16 taca Exp $ + +--- smbd/server.c.orig 2010-01-14 10:12:10.000000000 +0000 ++++ smbd/server.c +@@ -1350,6 +1350,9 @@ extern void build_options(bool screen); + if (!directory_exist(lp_lockdir(), NULL)) + mkdir(lp_lockdir(), 0755); + ++ if (!directory_exist(lp_statedir(), NULL)) ++ mkdir(lp_statedir(), 0755); ++ + if (is_daemon) + pidfile_create("smbd"); + diff --git a/net/samba33/patches/patch-aw b/net/samba33/patches/patch-aw new file mode 100644 index 00000000000..7af686d020b --- /dev/null +++ b/net/samba33/patches/patch-aw @@ -0,0 +1,17 @@ +$NetBSD: patch-aw,v 1.1.1.1 2010/02/16 16:24:16 taca Exp $ + +--- utils/testparm.c.orig 2010-01-14 10:12:10.000000000 +0000 ++++ utils/testparm.c +@@ -66,6 +66,12 @@ cannot be set in the smb.conf file. nmbd + ret = 1; + } + ++ if (!directory_exist(lp_statedir(), &st)) { ++ fprintf(stderr, "ERROR: state directory %s does not exist\n", ++ lp_statedir()); ++ ret = 1; ++ } ++ + if (!directory_exist(lp_piddir(), &st)) { + fprintf(stderr, "ERROR: pid directory %s does not exist\n", + lp_piddir()); diff --git a/net/samba33/patches/patch-ax b/net/samba33/patches/patch-ax new file mode 100644 index 00000000000..cf9204d3ca4 --- /dev/null +++ b/net/samba33/patches/patch-ax @@ -0,0 +1,53 @@ +$NetBSD: patch-ax,v 1.1.1.1 2010/02/16 16:24:16 taca Exp $ + +Fix for CVE-2009-3297. + +--- client/mount.cifs.c.orig 2010-01-14 10:12:10.000000000 +0000 ++++ client/mount.cifs.c +@@ -1044,6 +1044,35 @@ static void print_cifs_mount_version(voi + MOUNT_CIFS_VENDOR_SUFFIX); + } + ++/* ++ * This function borrowed from fuse-utils... ++ * ++ * glibc's addmntent (at least as of 2.10 or so) doesn't properly encode ++ * newlines embedded within the text fields. To make sure no one corrupts ++ * the mtab, fail the mount if there are embedded newlines. ++ */ ++static int check_newline(const char *progname, const char *name) ++{ ++ char *s; ++ for (s = "\n"; *s; s++) { ++ if (strchr(name, *s)) { ++ fprintf(stderr, "%s: illegal character 0x%02x in mount entry\n", ++ progname, *s); ++ return EX_USAGE; ++ } ++ } ++ return 0; ++} ++ ++static int check_mtab(const char *progname, const char *devname, ++ const char *dir) ++{ ++ if (check_newline(progname, devname) == -1 || ++ check_newline(progname, dir) == -1) ++ return EX_USAGE; ++ return 0; ++} ++ + int main(int argc, char ** argv) + { + int c; +@@ -1464,6 +1493,10 @@ mount_retry: + if (verboseflag) + fprintf(stderr, "\n"); + ++ rc = check_mtab(thisprogram, dev_name, mountpoint); ++ if (rc) ++ goto mount_exit; ++ + if (!fakemnt && mount(dev_name, mountpoint, "cifs", flags, options)) { + switch (errno) { + case ECONNREFUSED: |