diff options
| author | jlam <jlam> | 2004-01-11 02:26:30 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-01-11 02:26:30 +0000 |
| commit | 26b7288c46b834996ee7936ee93a6d5bc90c64f1 (patch) | |
| tree | 5ab4f601d568858d0210e45f72fb18565cb78dec /net/samba | |
| parent | 2775ab5e1e581854f9aa96de3c792b115531523f (diff) | |
| download | pkgsrc-26b7288c46b834996ee7936ee93a6d5bc90c64f1.tar.gz | |
Update net/samba to 3.0.1. Major changes from version 2.2.8anb6 include:
* Active Directory support. Samba is able to join a ADS realm as
a member server and authenticate using LDAP/Kerberos.
* Unicode support.
* New, more flexible authentication (passdb) system.
* A new "net" command that is similar to the "net" command in Windows.
* Samba now negotiates NT-style status32 codes on the wire, which
greatly improves error handling.
* Better Windows 2K/2K3/XP printing support.
* Loadable module support for passdb backends and character sets.
* More performant winbindd.
* Support for migrating from a Windows NT4 domain to a Samba domain
and maintaining user, group, and domain SIDs.
* Support for establishing trust relationships with Windows NT4 DCs.
* Initial support for a distributed Winbind architecture using an
LDAP directory for storing SID-to-uid/gid mappings.
* Major updates to the Samba documentation tree.
* Full support for client and server SMB signing to ensure
compatibility with default Windows 2K3 security settings.
* Improvement of ACL mapping features.
Diffstat (limited to 'net/samba')
28 files changed, 632 insertions, 942 deletions
diff --git a/net/samba/DESCR b/net/samba/DESCR index 2d8f2e0a13c..48deee91c78 100644 --- a/net/samba/DESCR +++ b/net/samba/DESCR @@ -1,13 +1,7 @@ -Samba is a suite of programs which work together to allow clients to -access to a server's filespace and printers via the SMB (Server -Message Block) protocol. - -In practice, this means that you can redirect disks and printers to -Unix disks and printers from Lan Manager clients, Windows for -Workgroups 3.11 clients, Windows NT clients, Linux clients and OS/2 -clients. There is also a generic Unix client program supplied as part -of the suite which allows Unix users to use an ftp-like interface to -access filespace and printers on any other SMB servers. This gives the -capability for these operating systems to behave much like a LAN -Server or Windows NT Server machine, only with added functionality and -flexibility designed to make life easier for administrators. +Samba is a suite of applications that speak the Server Message Block (SMB) +protocol. Samba allows a UNIX machine to perform client-server networking +for file and printer sharing with Microsoft Windows systems using their +native network protocol and to appear as another Windows system on the +network from the perspective of a Windows client. The Samba suite also +includes client tools that allow users to access folders and printers that +Windows systems and Samba servers offer on the network. diff --git a/net/samba/INSTALL b/net/samba/INSTALL deleted file mode 100644 index 17841c40c42..00000000000 --- a/net/samba/INSTALL +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# $NetBSD: INSTALL,v 1.4 2002/02/05 05:14:46 jlam Exp $ - -SAMBA_LOCKDIR="@SAMBA_LOCKDIR@" -SAMBA_PRIVATE="@SAMBA_PRIVATE@" - -case ${STAGE} in -POST-INSTALL) - # Check for files in old "lock" directory. - if [ -e /var/run/samba ] - then - ${CAT} << EOF -=========================================================================== - -The location of the Samba cache directory has moved to ${SAMBA_LOCKDIR}. -If you have any files under /var/run/samba, please move them into -${SAMBA_LOCKDIR} and restart the SMB and NMB servers. - -=========================================================================== -EOF - fi - ;; -esac diff --git a/net/samba/MESSAGE.smbpasswd b/net/samba/MESSAGE.smbpasswd deleted file mode 100644 index 9602e7bc7ff..00000000000 --- a/net/samba/MESSAGE.smbpasswd +++ /dev/null @@ -1,19 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE.smbpasswd,v 1.4 2003/09/12 06:04:14 jlam Exp $ - - *===* SECURITY NOTES *===* - -The users' encrypted passwords are stored in - - ${SAMBA_PRIVATE}/smbpasswd - -with owner ${ROOT_USER}, group ${ROOT_GROUP}, and file mode 0600. -These encrypted passwords are _PASSWORD_EQUIVALENT_ from the viewpoint of -the SMB protocol. Do _NOT_ weaken the permissions of this file unless -there is a very good reason. - -Please note that even if you pkg_delete ${PKGNAME}, the smbpasswd file -will remain on the system. If you don't intend to use this package -anymore, then it is _STRONGLY_ recommended that you remove the smbpasswd -file manually. -=========================================================================== diff --git a/net/samba/Makefile b/net/samba/Makefile index f74decc024f..a99d2031606 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,68 +1,104 @@ -# $NetBSD: Makefile,v 1.108 2004/01/11 00:33:03 jlam Exp $ - -.include "Makefile.common" -PKGREVISION= 6 - -MAINTAINER= kim@tac.nyc.ny.us +# $NetBSD: Makefile,v 1.109 2004/01/11 02:26:30 jlam Exp $ + +DISTNAME= samba-3.0.1 +WRKSRC= ${WRKDIR}/${DISTNAME}/source +CATEGORIES= net +MASTER_SITES= ftp://ftp.samba.org/pub/samba/ \ + ftp://ring.asahi-net.or.jp/pub/net/samba/ \ + ftp://samba.anu.edu.au/pub/samba/ \ + ftp://ftp.sunet.se/pub/unix/utilities/samba/ +COUNTRY_MIRRORS= au1 ca fi fr de it pl ru sg se us1 us6 +.for COUNTRY in ${COUNTRY_MIRRORS} +MASTER_SITES+= ftp://${COUNTRY}.samba.org/pub/samba/ +.endfor +EXTRACT_SUFX= .tar.bz2 + +MAINTAINER= jlam@NetBSD.org HOMEPAGE= http://www.samba.org/ -COMMENT= SMB/CIFS protocol server suite for UNIX +COMMENT= SMB/CIFS protocol server suite -USE_BUILDLINK3= yes -USE_PKGINSTALL= yes -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL +CONFLICTS+= winbind-[0-9]* -USE_GNU_READLINE= # uses rl_event_hook interface to GNU readline -CONFIGURE_ARGS+= --with-readline +PKG_INSTALLATION_TYPES= overwrite pkgviews -CONFIGURE_ARGS+= --with-ssl -CONFIGURE_ARGS+= --with-sslinc=${SSLBASE} -CFLAGS+= -I${SSLBASE}/include/openssl # ssl.h, err.h +USE_BUILDLINK3= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV+= PERL="${PERL5}" + +.include "../../mk/bsd.prefs.mk" + +PKG_SYSCONFSUBDIR?= samba +PKG_SYSCONFVAR= samba + +SAMBA_ETCDIR?= ${PKG_SYSCONFDIR} +SAMBA_LIBDIR?= ${PREFIX}/lib/samba +SAMBA_LOCKDIR?= ${SAMBA_VARDIR}/db/samba +SAMBA_LOGDIR?= ${SAMBA_VARDIR}/log +SAMBA_PIDDIR?= ${SAMBA_VARDIR}/run +SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private +SAMBA_VARDIR?= /var + +FILES_SUBST= SAMBA_ETCDIR=${SAMBA_ETCDIR} +FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR} +FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR} +FILES_SUBST+= SAMBA_PIDDIR=${SAMBA_PIDDIR} +FILES_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE} +FILES_SUBST+= SAMBA_VARDIR=${SAMBA_VARDIR} + +CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR} +CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR} +CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR} +CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR} +CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE} +CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR} +CONFIGURE_ARGS+= --libdir=${SAMBA_LIBDIR} + +CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/samba/swat +CONFIGURE_ARGS+= --with-libsmbclient +CONFIGURE_ARGS+= --with-winbind + +.include "../../converters/libiconv/buildlink3.mk" +CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv} + +BUILDLINK_USE_BUILTIN.readline= no +.include "../../devel/readline/buildlink3.mk" +CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} -REPLACE_PERL+= script/findsmb.in +.if defined(SAMBA_WITH_ADS) && !empty(SAMBA_WITH_ADS:M[yY][eE][sS]) +. include "../../mk/krb5.buildlink3.mk" +SAMBA_USE_LDAP= yes +CONFIGURE_ARGS+= --with-ads +CONFIGURE_ARGS+= --with-krb5=${KRB5BASE} +.else +CONFIGURE_ARGS+= --without-ads +CONFIGURE_ARGS+= --without-krb5 +.endif +BUILD_DEFS+= SAMBA_WITH_ADS -.if defined(USE_CUPS) && (${USE_CUPS} == "YES") -.include "../../print/cups/buildlink3.mk" -BUILD_DEFS+= USE_CUPS +.if defined(USE_CUPS) && !empty(USE_CUPS:M[yY][eE][sS]) +. include "../../print/cups/buildlink3.mk" CONFIGURE_ARGS+= --enable-cups .endif +BUILD_DEFS+= USE_CUPS .if defined(USE_PAM) -.include "../../security/PAM/buildlink3.mk" -BUILD_DEFS+= USE_PAM +. include "../../security/PAM/buildlink3.mk" CONFIGURE_ARGS+= --with-pam .endif +BUILD_DEFS+= USE_PAM -.if defined(SAMBA_USE_LDAP) && ${SAMBA_USE_LDAP} == "YES" -.include "../../databases/openldap/buildlink3.mk" -BUILD_DEFS+= SAMBA_USE_LDAP +.if defined(SAMBA_USE_LDAP) && !empty(SAMBA_USE_LDAP:M[yY][eE][sS]) +. include "../../databases/openldap/buildlink3.mk" +CONFIGURE_ARGS+= --with-ldap +. if defined(SAMBA_USE_LDAP_COMPAT) && \ + !empty(SAMBA_USE_LDAP_COMPAT:M[yY][eE][sS]) CONFIGURE_ARGS+= --with-ldapsam -PLIST_SUBST+= SAMBA_LDAP="" +. endif .else -PLIST_SUBST+= SAMBA_LDAP="@comment " -MESSAGE_SRC= ${.CURDIR}/MESSAGE.smbpasswd -SMBPASSWD_FILE= /dev/null ${SAMBA_PRIVATE}/smbpasswd \ - ${ROOT_USER} ${ROOT_GROUP} 0600 +CONFIGURE_ARGS+= --without-ldap .endif - -# Microsoft DFS support -CONFIGURE_ARGS+= --with-msdfs - -MESSAGE_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE} -MESSAGE_SUBST+= ROOT_GROUP=${ROOT_GROUP} -MESSAGE_SUBST+= ROOT_USER=${ROOT_USER} - -DOCDIR= ${PREFIX}/share/doc/${PKGBASE} -EXAMPLESDIR= ${PREFIX}/share/examples/${PKGBASE} - -CONF_FILES= ${EXAMPLESDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf -SUPPORT_FILES_PERMS= ${SMBPASSWD_FILE} -SUPPORT_FILES_PERMS+= ${EXAMPLESDIR}/adduser.sh ${SAMBA_ETCDIR}/adduser \ - ${ROOT_USER} ${ROOT_GROUP} 0555 -SUPPORT_FILES_PERMS+= ${EXAMPLESDIR}/deluser.sh ${SAMBA_ETCDIR}/deluser \ - ${ROOT_USER} ${ROOT_GROUP} 0555 -RCD_SCRIPTS= samba nmbd smbd -OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR} -OWN_DIRS_PERMS= ${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0500 +BUILD_DEFS+= SAMBA_USE_LDAP +BUILD_DEFS+= SAMBA_USE_LDAP_COMPAT .if !defined(MKTEMP) MKTEMP!= ${TYPE} mktemp 2>&1 | \ @@ -77,44 +113,37 @@ MAKEFLAGS+= PWD_MKDB="${PWD_MKDB}" FILES_SUBST+= MKTEMP=${MKTEMP:Q} FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q} -# Remove irrelevant files for this package. -post-extract: - ${FIND} ${WRKDIR}/${DISTNAME} -name ".cvsignore" -print | \ - ${XARGS} ${RM} -f - ${RM} -r ${WRKDIR}/${DISTNAME}/docs/textdocs/outdated - ${RM} -r ${WRKDIR}/${DISTNAME}/examples/VFS - ${RM} -r ${WRKDIR}/${DISTNAME}/examples/appliance - ${RM} -r ${WRKDIR}/${DISTNAME}/examples/autofs - ${RM} -r ${WRKDIR}/${DISTNAME}/examples/dce-dfs - ${RM} -r ${WRKDIR}/${DISTNAME}/examples/libsmbclient - ${RM} -r ${WRKDIR}/${DISTNAME}/examples/svr4-startup +DOCDIR= ${PREFIX}/share/doc/${PKGBASE} +EGDIR= ${PREFIX}/share/examples/${PKGBASE} + +USE_PKGINSTALL= yes +CONF_FILES= ${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf +SUPPORT_FILES_PERMS= ${EGDIR}/adduser.sh ${SAMBA_ETCDIR}/adduser \ + ${ROOT_USER} ${ROOT_GROUP} 0755 +SUPPORT_FILES_PERMS+= ${EGDIR}/deluser.sh ${SAMBA_ETCDIR}/deluser \ + ${ROOT_USER} ${ROOT_GROUP} 0755 +OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR} \ + ${SAMBA_VARDIR} ${SAMBA_LOGDIR} ${SAMBA_PIDDIR} +OWN_DIRS_PERMS= ${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0700 +RCD_SCRIPTS= samba nmbd smbd winbindd post-build: @${SED} ${FILES_SUBST_SED} ${FILESDIR}/adduser.sh > ${WRKDIR}/adduser.sh @${SED} ${FILES_SUBST_SED} ${FILESDIR}/deluser.sh > ${WRKDIR}/deluser.sh post-install: - # Install Samba documentation. ${INSTALL_DATA_DIR} ${DOCDIR} - cd ${WRKDIR}/${DISTNAME}/docs; \ - for file in announce textdocs/* Registry/*.reg; do \ - ${INSTALL_DATA} $$file ${DOCDIR}; \ + cd ${WRKSRC}/../docs/Registry; for file in *.reg; do \ + ${INSTALL_DATA} $$file ${DOCDIR}/$$file; \ done - - # Install Samba examples. - ${INSTALL_DATA_DIR} ${EXAMPLESDIR} - ${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh ${EXAMPLESDIR}/adduser.sh - ${INSTALL_SCRIPT} ${WRKDIR}/deluser.sh ${EXAMPLESDIR}/deluser.sh - ${CP} -R ${WRKDIR}/${DISTNAME}/examples/* ${EXAMPLESDIR} - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} - ${CHMOD} -R ugo-w ${EXAMPLESDIR} - - ${INSTALL_SCRIPT} ${WRKSRC}/script/convert_smbpasswd \ - ${EXAMPLESDIR}/misc - ${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh \ - ${PREFIX}/sbin/mksmbpasswd - -.include "../../devel/readline/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" + ${INSTALL_DATA_DIR} ${EGDIR} + ${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh ${EGDIR}/adduser.sh + ${INSTALL_SCRIPT} ${WRKDIR}/deluser.sh ${EGDIR}/deluser.sh + cd ${WRKSRC}/../examples; ${INSTALL_DATA} LDAP/samba.schema ${EGDIR} + cd ${WRKSRC}/../examples; ${INSTALL_DATA} smb.conf.default ${EGDIR} + cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mknissmbpasswd.sh ${EGDIR} + cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mknissmbpwdtbl.sh ${EGDIR} + cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mksmbpasswd.sh ${EGDIR} + cd ${WRKSRC}/script; ${INSTALL_SCRIPT} updatesmbpasswd.sh ${EGDIR} .include "../../mk/bsd.pkg.mk" diff --git a/net/samba/Makefile.common b/net/samba/Makefile.common deleted file mode 100644 index 16b0bbf7413..00000000000 --- a/net/samba/Makefile.common +++ /dev/null @@ -1,70 +0,0 @@ -# $NetBSD: Makefile.common,v 1.10 2003/09/16 09:28:20 jlam Exp $ -# -# NOTE: This file is included by: -# -# net/samba/Makefile -# security/pam-smbpass/Makefile -# security/winbind/Makefile - -DISTNAME= samba-${SAMBA_DIST_VERS} -SAMBA_DIST_VERS= 2.2.8a -WRKSRC?= ${WRKDIR}/${DISTNAME}/source -CATEGORIES?= net -MASTER_SITES= ftp://ftp.samba.org/pub/samba/ \ - ftp://ring.asahi-net.or.jp/pub/net/samba/ \ - ftp://samba.anu.edu.au/pub/samba/ \ - ftp://ftp.sunet.se/pub/unix/utilities/samba/ -COUNTRY_MIRRORS= au1 ca fi fr de it pl ru sg se us1 us6 -.for COUNTRY in ${COUNTRY_MIRRORS} -MASTER_SITES+= ftp://${COUNTRY}.samba.org/pub/samba/ -.endfor -EXTRACT_SUFX= .tar.bz2 - -DISTINFO_FILE?= ${.CURDIR}/../../net/samba/distinfo -PATCHDIR?= ${.CURDIR}/../../net/samba/patches - -GNU_CONFIGURE= # defined -USE_LIBTOOL= # defined -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig - -.include "../../mk/bsd.prefs.mk" - -PKG_SYSCONFSUBDIR?= samba -PKG_SYSCONFVAR= samba - -VARDIR?= /var -SAMBA_ETCDIR?= ${PKG_SYSCONFDIR} -SAMBA_DATADIR= ${PREFIX}/share -SAMBA_LOCKDIR?= ${VARDIR}/db/samba -SAMBA_LOGDIR?= ${VARDIR}/log -SAMBA_PIDDIR?= ${VARDIR}/run -SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private - -CONFIGURE_ARGS+= --localstatedir=${VARDIR} -CONFIGURE_ARGS+= --sbindir=${PREFIX}/sbin -CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR} -CONFIGURE_ARGS+= --with-codepagedir=${SAMBA_DATADIR}/samba/codepages -CONFIGURE_ARGS+= --with-datadir=${SAMBA_DATADIR} -CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR} -CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR} -CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR} -CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE} -CONFIGURE_ARGS+= --with-swatdir=${SAMBA_DATADIR}/samba/swat - -CONFIGURE_ARGS+= --without-readline -CONFIGURE_ARGS+= --without-ssl - -CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no - -CONFIGURE_ARGS+= --disable-cups -CONFIGURE_ARGS+= --without-pam -CONFIGURE_ARGS+= --without-winbind - -# The following are Linux-only options. -CONFIGURE_ARGS+= --without-smbwrapper -CONFIGURE_ARGS+= --without-smbmount - -FILES_SUBST= SAMBA_PRIVATE=${SAMBA_PRIVATE} -FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR} -FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR} -FILES_SUBST+= SAMBA_ETCDIR=${SAMBA_ETCDIR} diff --git a/net/samba/PLIST b/net/samba/PLIST index 84f4ace8b96..afc1c3a46ec 100644 --- a/net/samba/PLIST +++ b/net/samba/PLIST @@ -1,42 +1,78 @@ -@comment $NetBSD: PLIST,v 1.12 2003/09/14 22:25:25 jlam Exp $ +@comment $NetBSD: PLIST,v 1.13 2004/01/11 02:26:31 jlam Exp $ bin/findsmb -bin/make_printerdef -bin/make_smbcodepage -bin/make_unicodemap +bin/net bin/nmblookup -${SAMBA_LDAP}bin/pdbedit +bin/ntlm_auth +bin/pdbedit +bin/profiles bin/rpcclient bin/smbcacls bin/smbclient bin/smbcontrol +bin/smbcquotas bin/smbpasswd bin/smbspool bin/smbstatus bin/smbtar +bin/smbtree bin/tdbbackup +bin/tdbdump bin/testparm bin/testprns +bin/wbinfo etc/rc.d/nmbd etc/rc.d/samba etc/rc.d/smbd +etc/rc.d/winbindd +include/libsmbclient.h +lib/libsmbclient.a +lib/libsmbclient.so +lib/samba/charset/CP437.so +lib/samba/charset/CP850.so +lib/samba/de.msg +lib/samba/en.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/audit.so +lib/samba/vfs/cap.so +lib/samba/vfs/default_quota.so +lib/samba/vfs/extd_audit.so +lib/samba/vfs/fake_perms.so +lib/samba/vfs/netatalk.so +lib/samba/vfs/readonly.so +lib/samba/vfs/recycle.so +man/man1/editreg.1 man/man1/findsmb.1 -man/man1/make_smbcodepage.1 -man/man1/make_unicodemap.1 +man/man1/log2pcap.1 man/man1/nmblookup.1 +man/man1/ntlm_auth.1 +man/man1/profiles.1 man/man1/rpcclient.1 man/man1/smbcacls.1 man/man1/smbclient.1 man/man1/smbcontrol.1 +man/man1/smbcquotas.1 man/man1/smbsh.1 man/man1/smbstatus.1 man/man1/smbtar.1 +man/man1/smbtree.1 man/man1/testparm.1 man/man1/testprns.1 +man/man1/vfstest.1 man/man1/wbinfo.1 man/man5/lmhosts.5 man/man5/smb.conf.5 man/man5/smbpasswd.5 man/man7/samba.7 +man/man8/mount.cifs.8 +man/man8/net.8 man/man8/nmbd.8 man/man8/pdbedit.8 man/man8/smbd.8 @@ -46,201 +82,97 @@ man/man8/smbpasswd.8 man/man8/smbspool.8 man/man8/smbumount.8 man/man8/swat.8 +man/man8/tdbbackup.8 man/man8/winbindd.8 -sbin/mksmbpasswd sbin/nmbd sbin/smbd sbin/swat -share/doc/samba/Application_Serving.txt -share/doc/samba/BROWSING-Config.txt -share/doc/samba/BROWSING.txt -share/doc/samba/BUGS.txt -share/doc/samba/CUPS-PrintingInfo.txt -share/doc/samba/DHCP-Server-Configuration.txt -share/doc/samba/DIAGNOSIS.txt -share/doc/samba/DNIX.txt -share/doc/samba/Faxing.txt -share/doc/samba/GOTCHAS.txt -share/doc/samba/HINTS.txt -share/doc/samba/INSTALL.sambatar -share/doc/samba/Imprints.txt -share/doc/samba/Macintosh_Clients.txt +sbin/winbindd +share/doc/samba/FolderRedir.reg share/doc/samba/NT4-Locking.reg share/doc/samba/NT4_PlainPassword.reg -share/doc/samba/NetBIOS.txt -share/doc/samba/PROFILES.txt -share/doc/samba/Passwords.txt -share/doc/samba/Printing.txt -share/doc/samba/README.DCEDFS -share/doc/samba/README.NOW -share/doc/samba/README.jis -share/doc/samba/README.sambatar -share/doc/samba/Recent-FAQs.txt -share/doc/samba/RoutedNetworks.txt -share/doc/samba/SCO.txt -share/doc/samba/SMBTAR.notes -share/doc/samba/Samba-OpenSSL.txt -share/doc/samba/Speed.txt -share/doc/samba/Speed2.txt -share/doc/samba/Tracing.txt -share/doc/samba/UNIX-SMB.txt -share/doc/samba/UNIX_SECURITY.txt +share/doc/samba/Win-NT-2K-XP-DeleteRoamingProfile.reg share/doc/samba/Win2000_PlainPassword.reg -share/doc/samba/Win95.txt 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/WinNT.txt +share/doc/samba/WinXP_PlainPassword.reg share/doc/samba/WinXP_SignOrSeal.reg share/doc/samba/WindowsTerminalServer.reg -share/doc/samba/announce -share/doc/samba/cifsntdomain.txt -share/doc/samba/security_level.txt -share/examples/samba/LDAP/README -share/examples/samba/LDAP/export_smbpasswd.pl -share/examples/samba/LDAP/import_smbpasswd.pl -share/examples/samba/LDAP/ldapchpasswd -share/examples/samba/LDAP/ldapsync.pl -share/examples/samba/LDAP/samba-nds.schema -share/examples/samba/LDAP/samba-schema-netscapeds4.x -share/examples/samba/LDAP/samba-schema-netscapeds5.x -share/examples/samba/LDAP/samba-schema.IBMSecureWay -share/examples/samba/LDAP/samba.schema -share/examples/samba/LDAP/smbldap-tools/AUTHORS -share/examples/samba/LDAP/smbldap-tools/CONTRIBUTORS -share/examples/samba/LDAP/smbldap-tools/COPYING -share/examples/samba/LDAP/smbldap-tools/ChangeLog -share/examples/samba/LDAP/smbldap-tools/FILES -share/examples/samba/LDAP/smbldap-tools/INFRASTRUCTURE -share/examples/samba/LDAP/smbldap-tools/INSTALL -share/examples/samba/LDAP/smbldap-tools/Makefile -share/examples/samba/LDAP/smbldap-tools/NEWS -share/examples/samba/LDAP/smbldap-tools/README -share/examples/samba/LDAP/smbldap-tools/TODO -share/examples/samba/LDAP/smbldap-tools/cgi/README -share/examples/samba/LDAP/smbldap-tools/cgi/ldappass.cgi -share/examples/samba/LDAP/smbldap-tools/mkntpwd/Makefile -share/examples/samba/LDAP/smbldap-tools/mkntpwd/getopt.c -share/examples/samba/LDAP/smbldap-tools/mkntpwd/getopt.h -share/examples/samba/LDAP/smbldap-tools/mkntpwd/md4.c -share/examples/samba/LDAP/smbldap-tools/mkntpwd/mkntpwd.c -share/examples/samba/LDAP/smbldap-tools/mkntpwd/mkntpwd.h -share/examples/samba/LDAP/smbldap-tools/mkntpwd/smbdes.c -share/examples/samba/LDAP/smbldap-tools/smbldap-groupadd.pl -share/examples/samba/LDAP/smbldap-tools/smbldap-groupdel.pl -share/examples/samba/LDAP/smbldap-tools/smbldap-groupmod.pl -share/examples/samba/LDAP/smbldap-tools/smbldap-groupshow.pl -share/examples/samba/LDAP/smbldap-tools/smbldap-migrate-accounts.pl -share/examples/samba/LDAP/smbldap-tools/smbldap-migrate-groups.pl -share/examples/samba/LDAP/smbldap-tools/smbldap-passwd.pl -share/examples/samba/LDAP/smbldap-tools/smbldap-populate.pl -share/examples/samba/LDAP/smbldap-tools/smbldap-tools.spec -share/examples/samba/LDAP/smbldap-tools/smbldap-useradd.pl -share/examples/samba/LDAP/smbldap-tools/smbldap-userdel.pl -share/examples/samba/LDAP/smbldap-tools/smbldap-usermod.pl -share/examples/samba/LDAP/smbldap-tools/smbldap-usershow.pl -share/examples/samba/LDAP/smbldap-tools/smbldap_conf.pm -share/examples/samba/LDAP/smbldap-tools/smbldap_tools.pm -share/examples/samba/README share/examples/samba/adduser.sh share/examples/samba/deluser.sh -share/examples/samba/misc/convert_smbpasswd -share/examples/samba/misc/extra_smbstatus -share/examples/samba/misc/modify_samba_config.pl -share/examples/samba/misc/swat.pl -share/examples/samba/misc/wall.perl -share/examples/samba/printer-accounting/README -share/examples/samba/printer-accounting/acct-all -share/examples/samba/printer-accounting/acct-sum -share/examples/samba/printer-accounting/hp5-redir -share/examples/samba/printer-accounting/lp-acct -share/examples/samba/printer-accounting/printcap -share/examples/samba/printing/smbprint -share/examples/samba/printing/smbprint.newer -share/examples/samba/printing/smbprint.old -share/examples/samba/printing/smbprint.safer -share/examples/samba/printing/smbprint.sysv -share/examples/samba/simple/README -share/examples/samba/simple/smb.conf +share/examples/samba/mknissmbpasswd.sh +share/examples/samba/mknissmbpwdtbl.sh +share/examples/samba/mksmbpasswd.sh +share/examples/samba/samba.schema share/examples/samba/smb.conf.default -share/examples/samba/thoralf/smb.conf -share/examples/samba/tridge/README -share/examples/samba/tridge/smb.conf -share/examples/samba/tridge/smb.conf.WinNT -share/examples/samba/tridge/smb.conf.fjall -share/examples/samba/tridge/smb.conf.lapland -share/examples/samba/tridge/smb.conf.vittjokk -share/examples/samba/validchars/msdos70.out -share/examples/samba/validchars/nwdos70.out -share/examples/samba/validchars/readme -share/examples/samba/validchars/validchr.c -share/examples/samba/validchars/validchr.com -share/samba/codepages/codepage.1125 -share/samba/codepages/codepage.1251 -share/samba/codepages/codepage.437 -share/samba/codepages/codepage.737 -share/samba/codepages/codepage.775 -share/samba/codepages/codepage.850 -share/samba/codepages/codepage.852 -share/samba/codepages/codepage.857 -share/samba/codepages/codepage.861 -share/samba/codepages/codepage.866 -share/samba/codepages/codepage.932 -share/samba/codepages/codepage.936 -share/samba/codepages/codepage.949 -share/samba/codepages/codepage.950 -share/samba/codepages/unicode_map.1125 -share/samba/codepages/unicode_map.1251 -share/samba/codepages/unicode_map.437 -share/samba/codepages/unicode_map.737 -share/samba/codepages/unicode_map.775 -share/samba/codepages/unicode_map.850 -share/samba/codepages/unicode_map.852 -share/samba/codepages/unicode_map.857 -share/samba/codepages/unicode_map.861 -share/samba/codepages/unicode_map.866 -share/samba/codepages/unicode_map.932 -share/samba/codepages/unicode_map.936 -share/samba/codepages/unicode_map.949 -share/samba/codepages/unicode_map.950 -share/samba/codepages/unicode_map.ISO8859-1 -share/samba/codepages/unicode_map.ISO8859-13 -share/samba/codepages/unicode_map.ISO8859-15 -share/samba/codepages/unicode_map.ISO8859-2 -share/samba/codepages/unicode_map.ISO8859-5 -share/samba/codepages/unicode_map.ISO8859-7 -share/samba/codepages/unicode_map.ISO8859-9 -share/samba/codepages/unicode_map.KOI8-R -share/samba/codepages/unicode_map.KOI8-U -share/samba/swat/help/CVS-Access.html -share/samba/swat/help/DOMAIN_MEMBER.html -share/samba/swat/help/ENCRYPTION.html -share/samba/swat/help/Integrating-with-Windows.html -share/samba/swat/help/NT_Security.html -share/samba/swat/help/OS2-Client-HOWTO.html -share/samba/swat/help/PAM-Authentication-And-Samba.html -share/samba/swat/help/Samba-BDC-HOWTO.html +share/examples/samba/updatesmbpasswd.sh +share/samba/swat/help/AccessControls.html +share/samba/swat/help/AdvancedNetworkManagement.html +share/samba/swat/help/Appendixes.html +share/samba/swat/help/Backup.html +share/samba/swat/help/CUPS-printing.html +share/samba/swat/help/ClientConfig.html +share/samba/swat/help/DNSDHCP.html +share/samba/swat/help/FastStart.html +share/samba/swat/help/Further-Resources.html +share/samba/swat/help/InterdomainTrusts.html +share/samba/swat/help/IntroSMB.html +share/samba/swat/help/NT4Migration.html +share/samba/swat/help/NetworkBrowsing.html +share/samba/swat/help/Other-Clients.html +share/samba/swat/help/PolicyMgmt.html +share/samba/swat/help/Portability.html +share/samba/swat/help/ProfileMgmt.html +share/samba/swat/help/SWAT.html +share/samba/swat/help/Samba-Developers-Guide.html share/samba/swat/help/Samba-HOWTO-Collection.html -share/samba/swat/help/Samba-LDAP-HOWTO.html -share/samba/swat/help/Samba-PDC-HOWTO.html -share/samba/swat/help/UNIX_INSTALL.html -share/samba/swat/help/cups.html +share/samba/swat/help/SambaHA.html +share/samba/swat/help/ServerType.html +share/samba/swat/help/StandAloneServer.html +share/samba/swat/help/VFS.html +share/samba/swat/help/bugreport.html +share/samba/swat/help/compiling.html +share/samba/swat/help/diagnosis.html +share/samba/swat/help/domain-member.html +share/samba/swat/help/editreg.1.html share/samba/swat/help/findsmb.1.html +share/samba/swat/help/groupmapping.html +share/samba/swat/help/index.html +share/samba/swat/help/install.html +share/samba/swat/help/integrate-ms-networks.html +share/samba/swat/help/introduction.html +share/samba/swat/help/ix01.html share/samba/swat/help/lmhosts.5.html -share/samba/swat/help/make_smbcodepage.1.html -share/samba/swat/help/make_unicodemap.1.html -share/samba/swat/help/msdfs_setup.html +share/samba/swat/help/locking.html +share/samba/swat/help/log2pcap.1.html +share/samba/swat/help/migration.html +share/samba/swat/help/mount.cifs.8.html +share/samba/swat/help/msdfs.html +share/samba/swat/help/net.8.html share/samba/swat/help/nmbd.8.html share/samba/swat/help/nmblookup.1.html +share/samba/swat/help/ntlm_auth.1.html +share/samba/swat/help/optional.html +share/samba/swat/help/pam.html +share/samba/swat/help/passdb.html share/samba/swat/help/pdbedit.8.html -share/samba/swat/help/printer_driver2.html +share/samba/swat/help/pr01.html +share/samba/swat/help/pr02.html +share/samba/swat/help/printing.html +share/samba/swat/help/problems.html +share/samba/swat/help/profiles.1.html share/samba/swat/help/rpcclient.1.html +share/samba/swat/help/samba-bdc.html +share/samba/swat/help/samba-pdc.html share/samba/swat/help/samba.7.html +share/samba/swat/help/securing-samba.html share/samba/swat/help/smb.conf.5.html share/samba/swat/help/smbcacls.1.html share/samba/swat/help/smbclient.1.html share/samba/swat/help/smbcontrol.1.html +share/samba/swat/help/smbcquotas.1.html share/samba/swat/help/smbd.8.html share/samba/swat/help/smbmnt.8.html share/samba/swat/help/smbmount.8.html @@ -250,10 +182,18 @@ share/samba/swat/help/smbsh.1.html share/samba/swat/help/smbspool.8.html share/samba/swat/help/smbstatus.1.html share/samba/swat/help/smbtar.1.html +share/samba/swat/help/smbtree.1.html share/samba/swat/help/smbumount.8.html +share/samba/swat/help/speed.html share/samba/swat/help/swat.8.html +share/samba/swat/help/tdbbackup.8.html share/samba/swat/help/testparm.1.html share/samba/swat/help/testprns.1.html +share/samba/swat/help/troubleshooting.html +share/samba/swat/help/type.html +share/samba/swat/help/unicode.html +share/samba/swat/help/upgrading-to-3.0.html +share/samba/swat/help/vfstest.1.html share/samba/swat/help/wbinfo.1.html share/samba/swat/help/welcome.html share/samba/swat/help/winbind.html @@ -269,184 +209,206 @@ 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/using_samba/appa_01.html -share/samba/swat/using_samba/appa_02.html -share/samba/swat/using_samba/appa_03.html -share/samba/swat/using_samba/appa_04.html -share/samba/swat/using_samba/appa_05.html -share/samba/swat/using_samba/appb_01.html -share/samba/swat/using_samba/appb_02.html -share/samba/swat/using_samba/appb_03.html -share/samba/swat/using_samba/appc_01.html -share/samba/swat/using_samba/appd_01.html -share/samba/swat/using_samba/appe_01.html -share/samba/swat/using_samba/appf_01.html -share/samba/swat/using_samba/ch01_01.html -share/samba/swat/using_samba/ch01_02.html -share/samba/swat/using_samba/ch01_03.html -share/samba/swat/using_samba/ch01_04.html -share/samba/swat/using_samba/ch01_05.html -share/samba/swat/using_samba/ch01_06.html -share/samba/swat/using_samba/ch01_07.html -share/samba/swat/using_samba/ch01_08.html -share/samba/swat/using_samba/ch02_01.html -share/samba/swat/using_samba/ch02_02.html -share/samba/swat/using_samba/ch02_03.html -share/samba/swat/using_samba/ch02_04.html -share/samba/swat/using_samba/ch02_05.html -share/samba/swat/using_samba/ch02_06.html -share/samba/swat/using_samba/ch03_01.html -share/samba/swat/using_samba/ch03_02.html -share/samba/swat/using_samba/ch03_03.html -share/samba/swat/using_samba/ch04_01.html -share/samba/swat/using_samba/ch04_02.html -share/samba/swat/using_samba/ch04_03.html -share/samba/swat/using_samba/ch04_04.html -share/samba/swat/using_samba/ch04_05.html -share/samba/swat/using_samba/ch04_06.html -share/samba/swat/using_samba/ch04_07.html -share/samba/swat/using_samba/ch04_08.html -share/samba/swat/using_samba/ch05_01.html -share/samba/swat/using_samba/ch05_02.html -share/samba/swat/using_samba/ch05_03.html -share/samba/swat/using_samba/ch05_04.html -share/samba/swat/using_samba/ch05_05.html -share/samba/swat/using_samba/ch06_01.html -share/samba/swat/using_samba/ch06_02.html -share/samba/swat/using_samba/ch06_03.html -share/samba/swat/using_samba/ch06_04.html -share/samba/swat/using_samba/ch06_05.html -share/samba/swat/using_samba/ch06_06.html -share/samba/swat/using_samba/ch07_01.html -share/samba/swat/using_samba/ch07_02.html -share/samba/swat/using_samba/ch07_03.html -share/samba/swat/using_samba/ch08_01.html -share/samba/swat/using_samba/ch08_02.html -share/samba/swat/using_samba/ch08_03.html -share/samba/swat/using_samba/ch08_04.html -share/samba/swat/using_samba/ch08_05.html -share/samba/swat/using_samba/ch08_06.html -share/samba/swat/using_samba/ch08_07.html -share/samba/swat/using_samba/ch09_01.html -share/samba/swat/using_samba/ch09_02.html -share/samba/swat/using_samba/ch09_03.html -share/samba/swat/using_samba/figs/sam.0101.gif -share/samba/swat/using_samba/figs/sam.0102.gif -share/samba/swat/using_samba/figs/sam.0103.gif -share/samba/swat/using_samba/figs/sam.0104.gif -share/samba/swat/using_samba/figs/sam.0105.gif -share/samba/swat/using_samba/figs/sam.0106.gif -share/samba/swat/using_samba/figs/sam.0107.gif -share/samba/swat/using_samba/figs/sam.0108.gif -share/samba/swat/using_samba/figs/sam.0109.gif -share/samba/swat/using_samba/figs/sam.0110.gif -share/samba/swat/using_samba/figs/sam.0111.gif -share/samba/swat/using_samba/figs/sam.0112.gif -share/samba/swat/using_samba/figs/sam.0113.gif -share/samba/swat/using_samba/figs/sam.0114.gif -share/samba/swat/using_samba/figs/sam.0201.gif -share/samba/swat/using_samba/figs/sam.0202.gif -share/samba/swat/using_samba/figs/sam.0203.gif -share/samba/swat/using_samba/figs/sam.0204.gif -share/samba/swat/using_samba/figs/sam.0301.gif -share/samba/swat/using_samba/figs/sam.0302.gif -share/samba/swat/using_samba/figs/sam.0303.gif -share/samba/swat/using_samba/figs/sam.0304.gif -share/samba/swat/using_samba/figs/sam.0305.gif -share/samba/swat/using_samba/figs/sam.0306.gif -share/samba/swat/using_samba/figs/sam.0307.gif -share/samba/swat/using_samba/figs/sam.0308.gif -share/samba/swat/using_samba/figs/sam.0309.gif -share/samba/swat/using_samba/figs/sam.0310.gif -share/samba/swat/using_samba/figs/sam.0311.gif -share/samba/swat/using_samba/figs/sam.0312.gif -share/samba/swat/using_samba/figs/sam.0313.gif -share/samba/swat/using_samba/figs/sam.0314.gif -share/samba/swat/using_samba/figs/sam.0315.gif -share/samba/swat/using_samba/figs/sam.0316.gif -share/samba/swat/using_samba/figs/sam.0317.gif -share/samba/swat/using_samba/figs/sam.0318.gif -share/samba/swat/using_samba/figs/sam.0319.gif -share/samba/swat/using_samba/figs/sam.0320.gif -share/samba/swat/using_samba/figs/sam.0321.gif -share/samba/swat/using_samba/figs/sam.0322.gif -share/samba/swat/using_samba/figs/sam.0323.gif -share/samba/swat/using_samba/figs/sam.0324.gif -share/samba/swat/using_samba/figs/sam.0325.gif -share/samba/swat/using_samba/figs/sam.0326.gif -share/samba/swat/using_samba/figs/sam.0327.gif -share/samba/swat/using_samba/figs/sam.0328.gif -share/samba/swat/using_samba/figs/sam.0401.gif -share/samba/swat/using_samba/figs/sam.0402.gif -share/samba/swat/using_samba/figs/sam.0403.gif -share/samba/swat/using_samba/figs/sam.0404.gif -share/samba/swat/using_samba/figs/sam.0405.gif -share/samba/swat/using_samba/figs/sam.0406.gif -share/samba/swat/using_samba/figs/sam.0407.gif -share/samba/swat/using_samba/figs/sam.0501.gif -share/samba/swat/using_samba/figs/sam.0502.gif -share/samba/swat/using_samba/figs/sam.0503.gif -share/samba/swat/using_samba/figs/sam.0504.gif -share/samba/swat/using_samba/figs/sam.0505.gif -share/samba/swat/using_samba/figs/sam.0506.gif -share/samba/swat/using_samba/figs/sam.0507.gif -share/samba/swat/using_samba/figs/sam.0508.gif -share/samba/swat/using_samba/figs/sam.0601.gif -share/samba/swat/using_samba/figs/sam.0602.gif -share/samba/swat/using_samba/figs/sam.0603.gif -share/samba/swat/using_samba/figs/sam.0604.gif -share/samba/swat/using_samba/figs/sam.0605.gif -share/samba/swat/using_samba/figs/sam.0606.gif -share/samba/swat/using_samba/figs/sam.0701.gif -share/samba/swat/using_samba/figs/sam.0702.gif -share/samba/swat/using_samba/figs/sam.0703.gif -share/samba/swat/using_samba/figs/sam.0704.gif -share/samba/swat/using_samba/figs/sam.0705.gif -share/samba/swat/using_samba/figs/sam.0706.gif -share/samba/swat/using_samba/figs/sam.0707.gif -share/samba/swat/using_samba/figs/sam.0708.gif -share/samba/swat/using_samba/figs/sam.0709.gif -share/samba/swat/using_samba/figs/sam.0801.gif -share/samba/swat/using_samba/figs/sam.0802.gif -share/samba/swat/using_samba/figs/sam.0803.gif -share/samba/swat/using_samba/figs/sam.0804.gif -share/samba/swat/using_samba/figs/sam.0805.gif -share/samba/swat/using_samba/figs/sam.0901.gif -share/samba/swat/using_samba/figs/sam.0902.gif -share/samba/swat/using_samba/figs/sam.0903.gif -share/samba/swat/using_samba/figs/sam.0904.gif -share/samba/swat/using_samba/figs/sam.0905.gif -share/samba/swat/using_samba/figs/sam.aa01.gif -share/samba/swat/using_samba/figs/sam.ab01.gif -share/samba/swat/using_samba/figs/sam.ab02.gif -share/samba/swat/using_samba/gifs/index.gif -share/samba/swat/using_samba/gifs/samba.s.gif -share/samba/swat/using_samba/gifs/txthome.gif -share/samba/swat/using_samba/gifs/txtnexta.gif -share/samba/swat/using_samba/gifs/txtpreva.gif -share/samba/swat/using_samba/index.html +share/samba/swat/lang/ja/help/welcome.html +share/samba/swat/lang/ja/include/footer.html +share/samba/swat/lang/ja/include/header.html +share/samba/swat/lang/ja/include/header.nocss.html +share/samba/swat/lang/ja/include/header_css.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/lang/tr/include/header.html +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/licenseinfo.html -share/samba/swat/using_samba/this_edition.html -@dirrm share/doc/samba -@dirrm share/examples/samba/LDAP/smbldap-tools/mkntpwd -@dirrm share/examples/samba/LDAP/smbldap-tools/cgi -@dirrm share/examples/samba/LDAP/smbldap-tools -@dirrm share/examples/samba/LDAP -@dirrm share/examples/samba/misc -@dirrm share/examples/samba/printer-accounting -@dirrm share/examples/samba/printing -@dirrm share/examples/samba/simple -@dirrm share/examples/samba/thoralf -@dirrm share/examples/samba/tridge -@dirrm share/examples/samba/validchars -@dirrm share/examples/samba -@dirrm share/samba/codepages -@dirrm share/samba/swat/help -@dirrm share/samba/swat/images -@dirrm share/samba/swat/include +share/samba/swat/using_samba/samba2_s.gif +share/samba/swat/using_samba/samba2_xs.gif +share/samba/swat/using_samba/toc.html @dirrm share/samba/swat/using_samba/figs -@dirrm share/samba/swat/using_samba/gifs @dirrm share/samba/swat/using_samba +@dirrm share/samba/swat/lang/tr/include +@dirrm share/samba/swat/lang/tr/images +@dirrm share/samba/swat/lang/tr/help +@dirrm share/samba/swat/lang/tr +@dirrm share/samba/swat/lang/ja/include +@dirrm share/samba/swat/lang/ja/images +@dirrm share/samba/swat/lang/ja/help +@dirrm share/samba/swat/lang/ja +@dirrm share/samba/swat/lang +@dirrm share/samba/swat/include +@dirrm share/samba/swat/images +@dirrm share/samba/swat/help @dirrm share/samba/swat @dirrm share/samba +@dirrm share/examples/samba +@dirrm share/doc/samba +@dirrm lib/samba/vfs +@dirrm lib/samba/rpc +@dirrm lib/samba/pdb +@dirrm lib/samba/idmap +@dirrm lib/samba/charset +@dirrm lib/samba/auth +@dirrm lib/samba diff --git a/net/samba/buildlink2.mk b/net/samba/buildlink2.mk deleted file mode 100644 index ade427b3829..00000000000 --- a/net/samba/buildlink2.mk +++ /dev/null @@ -1,28 +0,0 @@ -# $NetBSD: buildlink2.mk,v 1.2 2004/01/03 18:49:51 reed Exp $ -# -# This Makefile fragment is included by packages that use samba. -# -# This file was created automatically using createbuildlink 2.6. -# - -.if !defined(SAMBA_BUILDLINK2_MK) -SAMBA_BUILDLINK2_MK= # defined - -BUILDLINK_PACKAGES+= samba -BUILDLINK_DEPENDS.samba?= samba>=2.2.8anb6 -BUILDLINK_PKGSRCDIR.samba?= ../../net/samba - -EVAL_PREFIX+= BUILDLINK_PREFIX.samba=samba -BUILDLINK_PREFIX.samba_DEFAULT= ${LOCALBASE} - -.include "../../print/cups/buildlink2.mk" -.include "../../security/PAM/buildlink2.mk" -.include "../../databases/openldap/buildlink2.mk" -.include "../../devel/readline/buildlink2.mk" -.include "../../security/openssl/buildlink2.mk" - -BUILDLINK_TARGETS+= samba-buildlink - -samba-buildlink: _BUILDLINK_USE - -.endif # SAMBA_BUILDLINK2_MK diff --git a/net/samba/distinfo b/net/samba/distinfo index 371c6ed622a..6a8179757a1 100644 --- a/net/samba/distinfo +++ b/net/samba/distinfo @@ -1,16 +1,10 @@ -$NetBSD: distinfo,v 1.30 2003/09/05 19:13:41 kim Exp $ +$NetBSD: distinfo,v 1.31 2004/01/11 02:26:31 jlam Exp $ -SHA1 (samba-2.2.8a.tar.bz2) = f25ff456bf7ac58d32eb0209c15ce0b2fa6d7450 -Size (samba-2.2.8a.tar.bz2) = 4505672 bytes -SHA1 (patch-aa) = 7f85ab121ffbcb67eb1f1c59f49245dda2eff44d -SHA1 (patch-ab) = 8be47e3f277f191aff18f77d8ed5ef4d8903ec5f -SHA1 (patch-ac) = cfde267ffe57046de18691f612e73ecdd1158d86 -SHA1 (patch-ad) = 4b475533e36668e55b5c57a53133f216f9e72ea3 -SHA1 (patch-ag) = e296e076c6bfe20b839f6f6be83873d7cfcc9d89 -SHA1 (patch-ah) = e87f2e393db68acc7028fe20d4772455379ad7aa -SHA1 (patch-aj) = e2c5f7580a8c701b6bf35d0d3004f714f2c810cb -SHA1 (patch-al) = 9507677d964044416802e91597c29310c61c9622 -SHA1 (patch-ap) = cc0b3d73d0c7de4cd46e66b0d66b2c3bbaddeb41 -SHA1 (patch-aq) = ea9cd9097cf91dd2b9f1acd9e6ff6f9445505774 -SHA1 (patch-ar) = e5b442fb7eb837bb2771ac71c73e6f95ae6fdfc2 -SHA1 (patch-as) = 019cd56e1a0f3c4517e1701e09d0a7cbd741df93 +SHA1 (samba-3.0.1.tar.bz2) = e390d24beb6c4e30f75995cf3dc75d374f5586d2 +Size (samba-3.0.1.tar.bz2) = 8303432 bytes +SHA1 (patch-aa) = f38d7cb0a1f33b4e71e5d1fb4aecdbfdb92a8459 +SHA1 (patch-ab) = 8e9a78fe84f0b07571f72715a4d9a639fd9801a8 +SHA1 (patch-ac) = fc0d15f371a9c3544499f6a6cd830b52b34ff644 +SHA1 (patch-ad) = 435996c8409b68f34fa731132413ed5e7421921e +SHA1 (patch-ae) = cf3a040f04142df534abe54b66156a48697b665d +SHA1 (patch-af) = dce26803c2a9c04d714c0929ae2efeaa1487aeda diff --git a/net/samba/files/adduser.sh b/net/samba/files/adduser.sh index b67d8b25d00..5120eb83c12 100644 --- a/net/samba/files/adduser.sh +++ b/net/samba/files/adduser.sh @@ -1,9 +1,10 @@ #!/bin/sh # -# $NetBSD: adduser.sh,v 1.1 2003/09/14 22:25:26 jlam Exp $ +# $NetBSD: adduser.sh,v 1.2 2004/01/11 02:26:31 jlam Exp $ # # This is an adduser script for NetBSD systems whose useradd(8) doesn't -# accept "$" in the username. +# accept "$" in the username. This script may be used for the +# "add machine script" in smb.conf. awkprog="@AWK@" catprog="@CAT@" diff --git a/net/samba/files/deluser.sh b/net/samba/files/deluser.sh index ba535c5d534..8bf3f613fa1 100644 --- a/net/samba/files/deluser.sh +++ b/net/samba/files/deluser.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: deluser.sh,v 1.1 2003/09/14 22:25:26 jlam Exp $ +# $NetBSD: deluser.sh,v 1.2 2004/01/11 02:26:31 jlam Exp $ # # This is a deluser script for NetBSD systems whose userdel(8) doesn't # accept "$" in the username. diff --git a/net/samba/files/nmbd.sh b/net/samba/files/nmbd.sh index f595fa36457..d44a3049f78 100755 --- a/net/samba/files/nmbd.sh +++ b/net/samba/files/nmbd.sh @@ -1,12 +1,11 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: nmbd.sh,v 1.8 2002/09/20 02:01:58 grant Exp $ +# $NetBSD: nmbd.sh,v 1.9 2004/01/11 02:26:31 jlam Exp $ # # PROVIDE: nmbd # REQUIRE: DAEMON -if [ -f /etc/rc.subr ] -then +if [ -f /etc/rc.subr ]; then . /etc/rc.subr fi @@ -20,11 +19,10 @@ command_args="-D" # _must_ start as daemon from rc.d; reload_cmd=":" # avoid dumping debug output on SIGHUP -if [ -f /etc/rc.subr ] -then +if [ -f /etc/rc.subr ]; then load_rc_config $name run_rc_command "$1" else - @ECHO@ -n ' ${name}' + @ECHO@ -n " ${name}" ${command} ${nmbd_flags} ${command_args} fi diff --git a/net/samba/files/samba.sh b/net/samba/files/samba.sh index 51d4a1a855e..000ffd60bd6 100644 --- a/net/samba/files/samba.sh +++ b/net/samba/files/samba.sh @@ -1,11 +1,10 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: samba.sh,v 1.13 2002/09/20 02:01:58 grant Exp $ +# $NetBSD: samba.sh,v 1.14 2004/01/11 02:26:31 jlam Exp $ # # KEYWORD: nostart -if [ -f /etc/rc.subr ] -then +if [ -f /etc/rc.subr ]; then . /etc/rc.subr fi @@ -46,11 +45,10 @@ reload_cmd="forward_commands" status_cmd="forward_commands" extra_commands="reload status" -if [ -f /etc/rc.subr ] -then +if [ -f /etc/rc.subr ]; then run_rc_command "$1" else - @ECHO@ -n ' ${name}' + @ECHO@ -n " ${name}" _arg="$1" ${start_cmd} fi diff --git a/net/samba/files/smbd.sh b/net/samba/files/smbd.sh index aaf45474ea4..36a9f83e8df 100755 --- a/net/samba/files/smbd.sh +++ b/net/samba/files/smbd.sh @@ -1,12 +1,11 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: smbd.sh,v 1.9 2002/09/20 02:01:58 grant Exp $ +# $NetBSD: smbd.sh,v 1.10 2004/01/11 02:26:31 jlam Exp $ # # PROVIDE: smbd # REQUIRE: DAEMON -if [ -f /etc/rc.subr ] -then +if [ -f /etc/rc.subr ]; then . /etc/rc.subr fi @@ -18,11 +17,10 @@ extra_commands="reload" command_args="-D" # _must_ start as daemon from rc.d; # add more flags through ${${name}_flags} -if [ -f /etc/rc.subr ] -then +if [ -f /etc/rc.subr ]; then load_rc_config $name run_rc_command "$1" else - @ECHO@ -n ' ${name}' + @ECHO@ -n " ${name}" ${command} ${smbd_flags} ${command_args} fi diff --git a/net/samba/files/winbindd.sh b/net/samba/files/winbindd.sh new file mode 100644 index 00000000000..a5462332d66 --- /dev/null +++ b/net/samba/files/winbindd.sh @@ -0,0 +1,25 @@ +#!@RCD_SCRIPTS_SHELL@ +# +# $NetBSD: winbindd.sh,v 1.1 2004/01/11 02:26:31 jlam Exp $ +# +# PROVIDE: winbindd +# REQUIRE: nmbd + +if [ -f /etc/rc.subr ]; then + . /etc/rc.subr +fi + +name="winbindd" +rcvar=$name +command="@PREFIX@/sbin/${name}" +required_vars="nmbd" +required_files="@SAMBA_ETCDIR@/smb.conf" +extra_commands="reload" + +if [ -f /etc/rc.subr ]; then + load_rc_config $name + run_rc_command "$1" +else + @ECHO@ -n " ${name}" + ${command} ${winbindd_flags} +fi diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa index d65c004c320..c21b9aaed4c 100644 --- a/net/samba/patches/patch-aa +++ b/net/samba/patches/patch-aa @@ -1,15 +1,13 @@ -$NetBSD: patch-aa,v 1.24 2003/03/16 07:57:45 martti Exp $ +$NetBSD: patch-aa,v 1.25 2004/01/11 02:26:31 jlam Exp $ ---- configure.in.orig Fri Feb 28 15:56:18 2003 -+++ configure.in Sun Mar 16 09:01:24 2003 -@@ -2033,6 +2033,10 @@ - # we can't build a pam module if we don't have pam. - AC_CHECK_LIB(pam, pam_get_data, [AC_DEFINE(HAVE_LIBPAM)]) +--- configure.in.orig Sun Dec 14 22:36:25 2003 ++++ configure.in +@@ -1642,7 +1642,7 @@ dnl Try to find iconv(3) + jm_ICONV($i) -+dnl Checks for libraries. -+AC_CHECK_LIB(c, __libc_sched_setscheduler, PAM_NEEDS_LIBC=, PAM_NEEDS_LIBC=-lc) -+AC_SUBST(PAM_NEEDS_LIBC) -+ - ################################################# - # check for pam_smbpass support - AC_MSG_CHECKING(whether to use pam_smbpass) + if test "$ICONV_FOUND" = yes; then +- LDFLAGS=$save_LDFLAG ++ LDFLAGS=$save_LDFLAGS + LIB_ADD_DIR(LDFLAGS, "$i/lib") + CFLAGS_ADD_DIR(CPPFLAGS, "$i/include") + LIBS="$save_LIBS" diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab index f24ca257cd7..f42836282d1 100644 --- a/net/samba/patches/patch-ab +++ b/net/samba/patches/patch-ab @@ -1,62 +1,13 @@ -$NetBSD: patch-ab,v 1.20 2003/03/16 07:57:46 martti Exp $ +$NetBSD: patch-ab,v 1.21 2004/01/11 02:26:31 jlam Exp $ ---- configure.orig Fri Feb 28 15:56:18 2003 -+++ configure Sun Mar 16 09:01:58 2003 -@@ -12074,6 +12074,49 @@ - fi +--- configure.orig Mon Dec 15 09:55:22 2003 ++++ configure +@@ -20216,7 +20216,7 @@ echo "${ECHO_T}no" >&6 -+echo $ac_n "checking for __libc_sched_setscheduler in -lc""... $ac_c" 1>&6 -+echo "configure:11950: checking for __libc_sched_setscheduler in -lc" >&5 -+ac_lib_var=`echo c'_'__libc_sched_setscheduler | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lc $LIBS" -+cat > conftest.$ac_ext <<EOF -+#line 11958 "configure" -+#include "confdefs.h" -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char __libc_sched_setscheduler(); -+ -+int main() { -+__libc_sched_setscheduler() -+; return 0; } -+EOF -+if { (eval echo configure:11969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ PAM_NEEDS_LIBC= -+else -+ echo "$ac_t""no" 1>&6 -+PAM_NEEDS_LIBC=-lc -+fi -+ -+ -+ - ################################################# - # check for pam_smbpass support - echo $ac_n "checking whether to use pam_smbpass""... $ac_c" 1>&6 -@@ -14491,6 +14534,7 @@ - s%@TERMLDFLAGS@%$TERMLDFLAGS%g - s%@ROFF@%$ROFF%g - s%@DYNEXP@%$DYNEXP%g -+s%@PAM_NEEDS_LIBC@%$PAM_NEEDS_LIBC%g - s%@LDAPLIBS@%$LDAPLIBS%g - s%@QUOTAOBJS@%$QUOTAOBJS%g - s%@WINBIND_TARGETS@%$WINBIND_TARGETS%g + if test "$ICONV_FOUND" = yes; then +- LDFLAGS=$save_LDFLAG ++ LDFLAGS=$save_LDFLAGS + + if test ""$i/lib"" != "/usr/lib" ; then + LDFLAGS="$LDFLAGS -L"$i/lib"" diff --git a/net/samba/patches/patch-ac b/net/samba/patches/patch-ac index 2b2cecd146a..8cefa5799dd 100644 --- a/net/samba/patches/patch-ac +++ b/net/samba/patches/patch-ac @@ -1,13 +1,17 @@ -$NetBSD: patch-ac,v 1.11 2002/10/18 11:50:28 martti Exp $ +$NetBSD: patch-ac,v 1.12 2004/01/11 02:26:31 jlam Exp $ ---- profile/profile.c.orig Wed Oct 9 22:27:22 2002 -+++ profile/profile.c Fri Oct 18 13:02:32 2002 -@@ -23,7 +23,7 @@ - #include "includes.h" +--- include/local.h.orig Fri Nov 7 12:37:33 2003 ++++ include/local.h +@@ -170,10 +170,10 @@ + * Default passwd chat script. + */ - #ifdef WITH_PROFILE --#define IPC_PERMS ((SHM_R | SHM_W) | (SHM_R>>3) | (SHM_R>>6)) -+#define IPC_PERMS ((S_IRUSR | S_IWUSR) | S_IRGRP | S_IROTH) - static int shm_id; - static BOOL read_only; +-#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/samba/patches/patch-ad b/net/samba/patches/patch-ad index 265bd446e49..2b23b392cff 100644 --- a/net/samba/patches/patch-ad +++ b/net/samba/patches/patch-ad @@ -1,31 +1,55 @@ -$NetBSD: patch-ad,v 1.12 2003/03/16 07:57:46 martti Exp $ +$NetBSD: patch-ad,v 1.13 2004/01/11 02:26:31 jlam Exp $ ---- Makefile.in.orig Fri Feb 28 15:56:06 2003 -+++ Makefile.in Sun Mar 16 09:02:19 2003 -@@ -91,6 +91,8 @@ - FLAGS = $(ISA) $(FLAGS5) $(PASSWD_FLAGS) - FLAGS32 = $(ISA32) $(FLAGS5) $(PASSWD_FLAGS) - -+PAM_NEEDS_LIBC = @PAM_NEEDS_LIBC@ +--- lib/util_getent.c.orig Sat Jun 7 13:57:33 2003 ++++ lib/util_getent.c +@@ -133,6 +133,11 @@ struct sys_pwent * getpwent_list(void) + struct sys_pwent *plist; + struct sys_pwent *pent; + struct passwd *pwd; ++#ifdef BSD ++# define BUFLEN 1024 ++ char *bp, *gecos, *p, buf[BUFLEN]; ++ int buflen; ++#endif + + pent = (struct sys_pwent *) malloc(sizeof(struct sys_pwent)); + if (pent == NULL) { +@@ -156,9 +161,38 @@ struct sys_pwent * getpwent_list(void) + pent->pw_uid = pwd->pw_uid; + pent->pw_gid = pwd->pw_gid; + if (pwd->pw_gecos) { ++#ifdef BSD ++ gecos = pwd->pw_gecos; ++ if (*gecos == '*') ++ gecos++; ++ bp = buf; + - WINBIND_PROGS = @WINBIND_TARGETS@ - WINBIND_SPROGS = @WINBIND_STARGETS@ - WINBIND_PAM_PROGS = @WINBIND_PAM_TARGETS@ -@@ -658,7 +660,7 @@ - - bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_OBJ) bin/.dummy - @echo Linking shared library $@ -- $(SHLD) @LDSHFLAGS@ -o $@ $(PAM_SMBPASS_OBJ) $(LDFLAGS) -lpam $(DYNEXP) $(LIBS) $(LDAPLIBS) -lc \ -+ $(SHLD) @LDSHFLAGS@ -o $@ $(PAM_SMBPASS_OBJ) $(LDFLAGS) -lpam $(DYNEXP) $(LIBS) $(LDAPLIBS) $(PAM_NEEDS_LIBC) \ - @SONAMEFLAG@`basename $@` - - nsswitch/libnss_wins.so: $(NSS_OBJ) -@@ -682,7 +684,7 @@ - - nsswitch/pam_winbind.so: $(PAM_WINBIND_OBJ) - @echo Linking $@ -- @$(SHLD) @LDSHFLAGS@ -o $@ $(PAM_WINBIND_OBJ) \ -+ @$(SHLD) @LDSHFLAGS@ -o $@ $(PAM_WINBIND_OBJ) $(LDFLAGS) $(DYNEXP) $(PAM_NEEDS_LIBC) \ - @SONAMEFLAG@`basename $@` - - bin/wbinfo: $(WBINFO_OBJ) $(PARAM_OBJ) $(LIB_OBJ) $(NOPROTO_OBJ) \ ++ /* copy gecos, interpolating & to be full name */ ++ for (p = gecos; *p != '\0'; p++) { ++ if (bp >= &buf[BUFLEN - 1]) ++ /* buffer overflow */ ++ goto gecos_done; ++ if (*p == '&') { ++ /* interpolate full name */ ++ snprintf(bp, BUFLEN - (bp - buf), ++ "%s", pwd->pw_name); ++ *bp = toupper(*bp); ++ bp += strlen(bp); ++ } ++ else ++ *bp++ = *p; ++ } ++ *bp = '\0'; ++ if ((pent->pw_name = strdup(buf)) == NULL) ++ goto err; ++#else + if ((pent->pw_name = strdup(pwd->pw_gecos)) == NULL) + goto err; ++#endif + } ++#ifdef BSD ++ gecos_done: ++#endif + if (pwd->pw_dir) { + if ((pent->pw_name = strdup(pwd->pw_dir)) == NULL) + goto err; diff --git a/net/samba/patches/patch-ae b/net/samba/patches/patch-ae new file mode 100644 index 00000000000..b69f89737f2 --- /dev/null +++ b/net/samba/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.6 2004/01/11 02:26:31 jlam Exp $ + +--- profile/profile.c.orig Sat Jun 7 13:57:36 2003 ++++ profile/profile.c +@@ -22,7 +22,7 @@ + #include "includes.h" + + #ifdef WITH_PROFILE +-#define IPC_PERMS ((SHM_R | SHM_W) | (SHM_R>>3) | (SHM_R>>6)) ++#define IPC_PERMS ((S_IRUSR | S_IWUSR) | S_IRGRP | S_IROTH) + #endif /* WITH_PROFILE */ + + #ifdef WITH_PROFILE diff --git a/net/samba/patches/patch-af b/net/samba/patches/patch-af new file mode 100644 index 00000000000..a9bc6b32d9a --- /dev/null +++ b/net/samba/patches/patch-af @@ -0,0 +1,53 @@ +$NetBSD: patch-af,v 1.5 2004/01/11 02:26:31 jlam Exp $ + +--- ../examples/smb.conf.default.orig Fri Aug 15 16:39:44 2003 ++++ ../examples/smb.conf.default +@@ -21,7 +21,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 +@@ -58,10 +58,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 = /usr/local/samba/var/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: +@@ -91,7 +91,7 @@ + # and the manual pages for details. + # You may want to add the following on a Linux system: + # SO_RCVBUF=8192 SO_SNDBUF=8192 +- socket options = TCP_NODELAY ++; socket options = TCP_NODELAY + + # Configure Samba to use multiple interfaces + # If you have multiple network interfaces then you must list them +@@ -147,7 +147,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 +@@ -186,7 +186,7 @@ + # specifically define each individual printer + [printers] + comment = All Printers +- path = /usr/spool/samba ++ path = /var/tmp + browseable = no + # Set public = yes to allow user 'guest account' to print + guest ok = no diff --git a/net/samba/patches/patch-ag b/net/samba/patches/patch-ag deleted file mode 100644 index 694decd58dc..00000000000 --- a/net/samba/patches/patch-ag +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2003/06/04 06:12:22 jlam Exp $ - ---- script/installbin.sh.orig Fri Jan 12 11:28:02 2001 -+++ script/installbin.sh -@@ -11,7 +11,7 @@ - shift - shift - --for d in $BASEDIR $BINDIR $LIBDIR $VARDIR $BASEDIR/private; do -+for d in $BASEDIR $BINDIR $LIBDIR $VARDIR; do - if [ ! -d $d ]; then - mkdir $d - if [ ! -d $d ]; then -@@ -30,7 +30,9 @@ - mv $BINDIR/$p2 $BINDIR/$p2.old - fi - cp $p $BINDIR/ -+ strip $BINDIR/$p2 - chmod $INSTALLPERMS $BINDIR/$p2 -+ rm -f $BINDIR/$p2.old - - # this is a special case, mount needs this in a specific location - if [ $p2 = smbmount ]; then diff --git a/net/samba/patches/patch-ah b/net/samba/patches/patch-ah deleted file mode 100644 index f7b4095c879..00000000000 --- a/net/samba/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2001/07/13 16:08:41 taca Exp $ - ---- script/installcp.sh.orig Mon Dec 13 22:27:43 1999 -+++ script/installcp.sh -@@ -12,7 +12,7 @@ - echo Installing codepage files in $CODEPAGEDIR - for d in $LIBDIR $CODEPAGEDIR; do - if [ ! -d $d ]; then --mkdir $d -+mkdir -p $d - if [ ! -d $d ]; then - echo Failed to make directory $d - exit 1 diff --git a/net/samba/patches/patch-aj b/net/samba/patches/patch-aj deleted file mode 100644 index e7c42c1d9a7..00000000000 --- a/net/samba/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2001/07/13 16:08:41 taca Exp $ - ---- script/installswat.sh.orig Mon Apr 16 10:34:11 2001 -+++ script/installswat.sh -@@ -10,7 +10,7 @@ - - for d in $SWATDIR $SWATDIR/help $SWATDIR/images $SWATDIR/include; 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/samba/patches/patch-al b/net/samba/patches/patch-al deleted file mode 100644 index b6d2e52f77e..00000000000 --- a/net/samba/patches/patch-al +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-al,v 1.2 2002/10/18 11:50:28 martti Exp $ - ---- include/local.h.orig Wed Oct 9 22:27:21 2002 -+++ include/local.h Fri Oct 18 13:04:36 2002 -@@ -169,10 +169,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/samba/patches/patch-ap b/net/samba/patches/patch-ap deleted file mode 100644 index 071d0eb731c..00000000000 --- a/net/samba/patches/patch-ap +++ /dev/null @@ -1,57 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2002/10/14 01:51:27 kim Exp $ - -Expand & in the gecos field to a capitalized login name. - ---- lib/util_getent.c.orig Sat Feb 2 19:46:42 2002 -+++ lib/util_getent.c Sun Oct 13 21:37:56 2002 -@@ -155,6 +155,11 @@ - struct sys_pwent *plist; - struct sys_pwent *pent; - struct passwd *pwd; -+#ifdef BSD -+# define BUFLEN 1024 -+ char *bp, *gecos, *p, buf[BUFLEN]; -+ int buflen; -+#endif - - pent = (struct sys_pwent *) malloc(sizeof(struct sys_pwent)); - if (pent == NULL) { -@@ -178,9 +183,38 @@ - pent->pw_uid = pwd->pw_uid; - pent->pw_gid = pwd->pw_gid; - if (pwd->pw_gecos) { -+#ifdef BSD -+ gecos = pwd->pw_gecos; -+ if (*gecos == '*') -+ gecos++; -+ bp = buf; -+ -+ /* copy gecos, interpolating & to be full name */ -+ for (p = gecos; *p != '\0'; p++) { -+ if (bp >= &buf[BUFLEN - 1]) -+ /* buffer overflow */ -+ goto gecos_done; -+ if (*p == '&') { -+ /* interpolate full name */ -+ snprintf(bp, BUFLEN - (bp - buf), -+ "%s", pwd->pw_name); -+ *bp = toupper(*bp); -+ bp += strlen(bp); -+ } -+ else -+ *bp++ = *p; -+ } -+ *bp = '\0'; -+ if ((pent->pw_name = strdup(buf)) == NULL) -+ goto err; -+#else - if ((pent->pw_name = strdup(pwd->pw_gecos)) == NULL) - goto err; -+#endif - } -+#ifdef BSD -+ gecos_done: -+#endif - if (pwd->pw_dir) { - if ((pent->pw_name = strdup(pwd->pw_dir)) == NULL) - goto err; diff --git a/net/samba/patches/patch-aq b/net/samba/patches/patch-aq deleted file mode 100644 index 2ad37976946..00000000000 --- a/net/samba/patches/patch-aq +++ /dev/null @@ -1,56 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2002/10/14 01:51:27 kim Exp $ - -Expand & in the gecos field to a capitalized login name. - ---- lib/system.c.orig Thu May 2 21:03:10 2002 -+++ lib/system.c Sun Oct 13 21:36:59 2002 -@@ -773,6 +773,12 @@ - - static void copy_pwent(struct saved_pw *dst, struct passwd *pass) - { -+#ifdef BSD -+# define BUFLEN 1024 -+ char *bp, *gecos, *p, buf[BUFLEN]; -+ int buflen; -+#endif -+ - memcpy((char *)&dst->pass, pass, sizeof(struct passwd)); - - fstrcpy(dst->pw_name, pass->pw_name); -@@ -781,7 +787,36 @@ - fstrcpy(dst->pw_passwd, pass->pw_passwd); - dst->pass.pw_passwd = dst->pw_passwd; - -+#ifdef BSD -+ gecos = pass->pw_gecos; -+ if (*gecos == '*') -+ gecos++; -+ bp = buf; -+ -+ /* copy gecos, interpolating & to be full name */ -+ for (p = gecos; *p != '\0'; p++) { -+ if (bp >= &buf[BUFLEN - 1]) { -+ /* buffer overflow */ -+ gecos = pass->pw_name; -+ goto gecos_done; -+ } -+ if (*p == '&') { -+ /* interpolate full name */ -+ snprintf(bp, BUFLEN - (bp - buf), "%s", pass->pw_name); -+ *bp = toupper(*bp); -+ bp += strlen(bp); -+ } -+ else -+ *bp++ = *p; -+ } -+ *bp = '\0'; -+ gecos = buf; -+ -+ gecos_done: -+ fstrcpy(dst->pw_gecos, gecos); -+#else - fstrcpy(dst->pw_gecos, pass->pw_gecos); -+#endif - dst->pass.pw_gecos = dst->pw_gecos; - - pstrcpy(dst->pw_dir, pass->pw_dir); diff --git a/net/samba/patches/patch-ar b/net/samba/patches/patch-ar deleted file mode 100644 index 00c7b27f47f..00000000000 --- a/net/samba/patches/patch-ar +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ar,v 1.2 2003/03/16 07:57:47 martti Exp $ - ---- smbd/open.c.orig Fri Feb 28 15:56:20 2003 -+++ smbd/open.c Sun Mar 16 09:03:17 2003 -@@ -979,8 +979,11 @@ - fsp_open = open_file(fsp,conn,fname,psbuf,flags|flags2,mode,desired_access); - - if (!fsp_open && (flags == O_RDWR) && (errno != ENOENT) && fcbopen) { -+ int saved_errno = errno; - if((fsp_open = open_file(fsp,conn,fname,psbuf,O_RDONLY,mode,desired_access)) == True) - flags = O_RDONLY; -+ else -+ errno = saved_errno; - } - - if (!fsp_open) { diff --git a/net/samba/patches/patch-as b/net/samba/patches/patch-as deleted file mode 100644 index 2bc372e1d8a..00000000000 --- a/net/samba/patches/patch-as +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-as,v 1.1 2003/09/05 19:13:42 kim Exp $ - -Fix DFS referrals for Windows XP and 2003 clients. -http://lists.xsec.it/pipermail/samba-it/2003-April/000321.html - ---- smbd/trans2.c.orig Sun Apr 6 21:54:00 2003 -+++ smbd/trans2.c Fri Sep 5 14:47:28 2003 -@@ -3041,7 +3041,7 @@ - { - char *params = *pparams; - enum remote_arch_types ra_type = get_remote_arch(); -- BOOL NT_arch = ((ra_type == RA_WINNT) || (ra_type == RA_WIN2K)); -+ BOOL NT_arch = ((ra_type == RA_WINNT) || (ra_type == RA_WIN2K) || (ra_type == RA_WINXP) || (ra_type == RA_WIN2K3)); - pstring pathname; - int reply_size = 0; - int max_referral_level; |