diff options
| author | jlam <jlam@pkgsrc.org> | 2005-11-14 08:05:27 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-11-14 08:05:27 +0000 |
| commit | 589e9035301f9dd8b1c2cab08e2027ba9f173c7f (patch) | |
| tree | 7d2d1a417bb746f51ac31a3c7a5bbbf037ac2bbc /net/samba | |
| parent | e59e5b7dcc4fa93f570cbd046a33002790e68c2d (diff) | |
| download | pkgsrc-589e9035301f9dd8b1c2cab08e2027ba9f173c7f.tar.gz | |
Update net/samba to 3.0.20.2 from samba-3.0.20b. Recommended patches
for samba-3.0.20b that are applied as part of this update include:
http://www.samba.org/samba/patches/print_lprm.patch
http://www.samba.org/samba/patches/quota.patch
http://www.samba.org/samba/patches/bug3201_wbinfo.patch
This fixes PRs pkg/31352 and pkg/31991. Important changes that were
made as part of porting this Samba release to pkgsrc include the
following:
* The new release model for Samba includes distributing patches for
urgent bug fixes that will be included in the next release of Samba,
and are available at http://www.samba.org/samba/patches/. Since
these patches are rather generically named, we download all DISTFILES
and PATCHFILES for Samba into a ${DISTNAME}-specific directory.
* The default configuration for the samba package no longer builds the
"winbind" portions of samba, which are really only useful when
attempting to unify logons between Unix and Microsoft Windows. When
the "winbind" option is specified, we also build the RID and AD idmap
backends, which allow sharing UIDs/GIDs across Unix machines.
* New package options have been added to the build: "mysql", "pgsql",
and "xml" allow adding optional support for experimental passdb
storage backends, and "winbind" allows for optionally building the
winbindd daemon and associated plugins.
* Two new smb.conf options were added -- "passwd expand gecos" and
"state directory". The first describes whether "&" in the GECOS
field of a passwd db entry is expanded to the login name. The
second describes the location where the persistent-state database
files are stored.
* Luke Mewburn contributed code to allow nss_winbind.so to work properly
on supported NetBSD systems. The FreeBSD NSS winbind code should
probably be replaced with a suitably tweaked version of the NetBSD
code since the latter is much more complete in the functions that are
provided, but I'll leave that to freebsd-pkg-people.
* Samba dumps all of its files into "lock directory", but some of them
need to persist across reboots. We make a distinction between these
files and the temporary files that are re-created by the Samba
daemons when they are restarted -- the former are now stored in a
"state directory" and the latter are stored in the "lock directory".
This is modeled after the Debian patch to Samba located in:
packaging/Debian/debian-unstable/patches/fhs.patch
The "lock directory" default has been moved to ${VARBASE}/run/samba
to emphasize the temporary status of the files stored in that
directory.
* Samba persists in using PAM_AUTHTOK_RECOVER_ERR, when there is almost
universal agreement that PAM_AUTHTOK_RECOVERY_ERR is the right
constant to use. Even the Linux-PAM distribution ensures that
PAM_AUTHTOK_RECOVERY_ERR is correctly defined. To work around this,
we define PAM_AUTHTOK_RECOVER_ERR appropriately in all the places
where it is used.
* The configure script checks for OpenSSL's libcrypto.so by looking
for the symbol "des_set_key". However, libcrypto.so might not
contain that symbol because the DES functions might come from a
separate library, e.g. libdes.so. In this case, the configure script
will think that libcrypto.so is not available, when it actually may
be. Instead, look for EVP_des_cbc, which is always provided by
libcrypto.so.
* Add some missing $(PASSDB_LIBS) references to the Makefile to fix
compilation problems if the experimental passdb backends are statically
compiled into the Samba suite programs.
* Fix compilation problems in sam/idmap_rid.c and sam/idmap_ad.c if the
"rid" and "ad" idmap backends are statically compiled into winbindd.
Changes between version 3.0.14a and 3.0.20b include:
o Reporting files as read-only instead of returning the correct error
code of "access denied"
o File system quota support defects
o Crash bugs caused by incompatibilities on 64-bit systems.
o User Manager interoperability problems.
o Support for several new Win32 rpc pipes.
o New 'net rpc service' tool for managing Win32 services.
o Capability to set the owner on new files and directory based on the
parent's ownership.
o Experimental, asynchronous IO file serving support.
o Support for Microsoft Print Migrator.
o New Winbind IDmap plugin (ad) for retrieving uid and gid from AD
servers which maintain the SFU user and group attributes.
o Rewritten support for POSIX pathnames when utilizing the Linux CIFS
fs client.
o New asynchronous winbindd.
o New Windows NT registry file I/O library.
o New user right (SeTakeOwnershipPrivilege) added.
o New "net share migrate" options.
Diffstat (limited to 'net/samba')
60 files changed, 2499 insertions, 770 deletions
diff --git a/net/samba/DESCR b/net/samba/DESCR index 48deee91c78..27a52bca020 100644 --- a/net/samba/DESCR +++ b/net/samba/DESCR @@ -1,7 +1,7 @@ -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. +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/MESSAGE b/net/samba/MESSAGE new file mode 100644 index 00000000000..6d65c4fff17 --- /dev/null +++ b/net/samba/MESSAGE @@ -0,0 +1,10 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.4 2005/11/14 08:05:27 jlam Exp $ + +When upgrading a Samba installation and "lock directory" has been set +to a non-default value in the configuration files, then "state directory" +needs to be set appropriately and/or the files located in the lock +directory should be moved to the state directory. Please read the +documentation on "state directory" in the smb.conf(5) manual page for +more information. +=========================================================================== diff --git a/net/samba/Makefile b/net/samba/Makefile index b7087196eb6..989f14e6842 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,22 +1,21 @@ -# $NetBSD: Makefile,v 1.146 2005/08/19 18:12:38 jlam Exp $ +# $NetBSD: Makefile,v 1.147 2005/11/14 08:05:27 jlam Exp $ -DISTNAME= samba-3.0.14a -PKGREVISION= 1 +.include "Makefile.mirrors" + +DISTNAME= samba-3.0.20b +PKGNAME= samba-3.0.20.2 CATEGORIES= net -MASTER_SITES= ftp://ftp.samba.org/pub/samba/old-versions/ \ - ftp://ring.asahi-net.or.jp/pub/net/samba/old-versions/ \ - ftp://samba.anu.edu.au/pub/samba/old-versions/ \ - ftp://ftp.sunet.se/pub/unix/utilities/samba/old-versions/ -COUNTRY_MIRRORS= au1 ca fi fr it pl ru sg se us1 us6 -.for COUNTRY in ${COUNTRY_MIRRORS} -MASTER_SITES+= ftp://${COUNTRY}.samba.org/pub/samba/old-versions/ -.endfor +MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/} +DIST_SUBDIR= ${DISTNAME} + +.include "Makefile.patches" MAINTAINER= jlam@NetBSD.org HOMEPAGE= http://www.samba.org/ COMMENT= SMB/CIFS protocol server suite -CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]* +CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* \ + winbind-[0-9]* PKG_INSTALLATION_TYPES= overwrite pkgviews @@ -30,10 +29,11 @@ PKG_SYSCONFVAR= samba SAMBA_ETCDIR?= ${PKG_SYSCONFDIR} SAMBA_LIBDIR?= ${PREFIX}/lib/samba -SAMBA_LOCKDIR?= ${SAMBA_VARDIR}/db/samba +SAMBA_LOCKDIR?= ${SAMBA_VARDIR}/run/samba SAMBA_LOGDIR?= ${SAMBA_VARDIR}/log SAMBA_PIDDIR?= ${SAMBA_VARDIR}/run SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private +SAMBA_STATEDIR?= ${SAMBA_VARDIR}/db/samba SAMBA_VARDIR?= ${VARBASE} FILES_SUBST= SAMBA_ETCDIR=${SAMBA_ETCDIR} @@ -41,6 +41,7 @@ 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_STATEDIR=${SAMBA_STATEDIR} FILES_SUBST+= SAMBA_VARDIR=${SAMBA_VARDIR} CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR} @@ -49,11 +50,11 @@ 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-statedir=${SAMBA_STATEDIR} CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR} 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} @@ -64,6 +65,16 @@ CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} .include "options.mk" +# Only Linux supports smbmount for mounting a Samba share into the +# filesystem. +# +.if ${OPSYS} == "Linux" +CONFIGURE_ARGS+= --with-smbmount +PLIST_SUBST+= SMBMOUNT= +.else +PLIST_SUBST+= SMBMOUNT="@comment " +.endif + # mktemp is useful for the replacement adduser script, but don't require # a full dependency since it's not actually needed by samba. # @@ -77,49 +88,28 @@ MAKEFLAGS+= PWD_MKDB=${PWD_MKDB:Q} FILES_SUBST+= MKTEMP=${MKTEMP:Q} FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q} -.if !empty(NSS_WINBIND) -PLIST_SUBST+= NSS_WINBIND=lib/${NSS_WINBIND} -.else -PLIST_SUBST+= NSS_WINBIND="@comment no NSS winbind module" -.endif -.if !empty(NSS_WINS) -PLIST_SUBST+= NSS_WINS=lib/${NSS_WINS} -.else -PLIST_SUBST+= NSS_WINS="@comment no NSS WINS module" -.endif - DOCDIR= ${PREFIX}/share/doc/${PKGBASE} EGDIR= ${PREFIX}/share/examples/${PKGBASE} USE_PKGINSTALL= yes CONF_FILES= ${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf -CONF_FILES_PERMS= ${EGDIR}/adduser.sh ${SAMBA_ETCDIR}/adduser \ - ${ROOT_USER} ${ROOT_GROUP} 0755 -CONF_FILES_PERMS+= ${EGDIR}/deluser.sh ${SAMBA_ETCDIR}/deluser \ - ${ROOT_USER} ${ROOT_GROUP} 0755 MAKE_DIRS= ${SAMBA_VARDIR} ${SAMBA_LOGDIR} ${SAMBA_PIDDIR} -OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR} +OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR} ${SAMBA_STATEDIR} OWN_DIRS_PERMS= ${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0700 -RCD_SCRIPTS= samba nmbd smbd winbindd - -INSTALL_LIBRARY= \ - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} +RCD_SCRIPTS+= samba nmbd smbd ${WINBINDD_RCD_SCRIPT} post-build: @${SED} ${FILES_SUBST_SED} ${FILESDIR}/adduser.sh > ${WRKDIR}/adduser.sh @${SED} ${FILES_SUBST_SED} ${FILESDIR}/deluser.sh > ${WRKDIR}/deluser.sh post-install: - -cd ${SAMBA_LIBDIR} && ${LN} -s libsmbclient.so libsmbclient.so.0 + ${RMDIR} ${PREFIX}/share/samba/swat/lang/ja/include + ${RMDIR} ${PREFIX}/share/samba/swat/lang/ja/images + ${RMDIR} ${PREFIX}/share/samba/swat/lang/tr/include for d in auth idmap pdb rpc; do \ ${RMDIR} ${SAMBA_LIBDIR}/$$d; \ done -.if !empty(NSS_WINBIND) - ${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/${NSS_WINBIND} ${PREFIX}/lib -.endif -.if !empty(NSS_WINS) - ${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/${NSS_WINS} ${PREFIX}/lib -.endif + -cd ${SAMBA_LIBDIR} && ${LN} -s libsmbclient.so libsmbclient.so.0 ${INSTALL_DATA_DIR} ${DOCDIR} cd ${WRKSRC}/../docs/registry; for f in *.reg; do \ ${INSTALL_DATA} $${f} ${DOCDIR}/$${f}; \ @@ -133,19 +123,5 @@ post-install: cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mknissmbpwdtbl.sh ${EGDIR} cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mksmbpasswd.sh ${EGDIR} cd ${WRKSRC}/script; ${INSTALL_SCRIPT} updatesmbpasswd.sh ${EGDIR} -.if !empty(PKG_OPTIONS:Mpam) - ${INSTALL_DATA_DIR} ${PAM_INSTMODULEDIR} - ${INSTALL_LIBRARY} ${WRKSRC}/bin/pam_smbpass.so ${PAM_INSTMODULEDIR} - ${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/pam_winbind.so ${PAM_INSTMODULEDIR} - ${INSTALL_DATA} ${WRKSRC}/pam_smbpass/README \ - ${DOCDIR}/README.pam_smbpass - ${INSTALL_DATA_DIR} ${EGDIR}/pam_smbpass - cd ${WRKSRC}/pam_smbpass/samples; for f in [a-z]*; do \ - ${INSTALL_DATA} $${f} ${EGDIR}/pam_smbpass/$${f}; \ - done -.endif -.if !empty(PKG_OPTIONS:Mcups) - cd ${PREFIX}/libexec/cups/backend && ${LN} -s ../../../bin/smbspool smb -.endif .include "../../mk/bsd.pkg.mk" diff --git a/net/samba/Makefile.mirrors b/net/samba/Makefile.mirrors new file mode 100644 index 00000000000..b22f4adca23 --- /dev/null +++ b/net/samba/Makefile.mirrors @@ -0,0 +1,39 @@ +# $NetBSD: Makefile.mirrors,v 1.1 2005/11/14 08:05:27 jlam Exp $ +# +# This Makefile fragment contains the mirror sites for fetching Samba. + +### +### This list was last updated on 20051024 from: +### http://www.samba.org/samba/download/ftp_mirrors.html +### +SAMBA_MIRRORS= \ + ftp://ftp.samba.org/pub/samba/ \ + ftp://gd.tuwien.ac.at/infosys/servers/samba/ \ + ftp://ftp.easynet.be/samba/ \ + ftp://ftp.pucpr.br/samba/ \ + ftp://ca.samba.org/ \ + ftp://mirror.kn.vutbr.cz/pub/MIRRORS/samba/ \ + ftp://mirrors.dotsrc.org/samba/ \ + ftp://fi.samba.org/pub/samba/ \ + ftp://de.samba.org/samba.org/ \ + ftp://ftp.ntua.gr/pub/net/samba/ \ + ftp://ie.samba.org/mirrors/ftp.samba.org/pub/samba/ \ + ftp://ftp.heanet.ie/pub/samba/ \ + ftp://ftp.ring.gr.jp/pub/net/samba/ \ + ftp://ftp.bit.nl/mirror/samba/ \ + ftp://www.bibsyst.no/pub/samba/ \ + ftp://giswitch.sggw.waw.pl/pub/unix/samba/ \ + ftp://pl.samba.org/pub/unix/net/samba/ \ + ftp://ftp.citkit.ru/pub/samba/ \ + ftp://ru.samba.org/pub/samba/ \ + ftp://ru2.samba.org// \ + ftp://ftp.chg.ru/packages/samba/ \ + ftp://cs.samba.org/pub/samba/ \ + ftp://ftp.oss.eznetsols.org/samba/ \ + ftp://ftp.k2.net/mirrors/samba/ \ + ftp://se.samba.org/pub/samba/ \ + ftp://us1.samba.org/pub/samba/ \ + ftp://us5.samba.org/pub/samba-ftp/ \ + ftp://us2.samba.org/pub/samba/ \ + ftp://us4.samba.org/pub/samba/ \ + ftp://sunsite.org.uk/package/samba/ diff --git a/net/samba/Makefile.patches b/net/samba/Makefile.patches new file mode 100644 index 00000000000..165f2c522af --- /dev/null +++ b/net/samba/Makefile.patches @@ -0,0 +1,23 @@ +# $NetBSD: Makefile.patches,v 1.1 2005/11/14 08:05:27 jlam Exp $ +# +# This Makefile fragment describes the recommended patches for the +# currently packaged version of Samba. All recommended patches for +# particular release of Samba are also integrated into the next release +# of Samba, so upon updating to the latest release of Samba, the +# PATCHFILES variable should be empty. +# + +# The PATCHFILES are listed in chronological order according to the time +# they are added to ${PATCH_SITES}. +# +PATCH_SITES= http://www.samba.org/samba/patches/ +PATCHFILES= # empty + +PATCHFILES+= print_lprm.patch +PATCH_DIST_STRIP.print_lprm.patch= -p2 + +PATCHFILES+= quota.patch +PATCH_DIST_STRIP.quota.patch= -p2 + +PATCHFILES+= bug3201_wbinfo.patch +PATCH_DIST_STRIP.bug3201_wbinfo.patch= -p0 diff --git a/net/samba/PLIST b/net/samba/PLIST index 240ea171f91..482cce655c7 100644 --- a/net/samba/PLIST +++ b/net/samba/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.31 2005/06/05 13:13:05 taca Exp $ +@comment $NetBSD: PLIST,v 1.32 2005/11/14 08:05:27 jlam Exp $ bin/findsmb bin/net bin/nmblookup @@ -22,8 +22,7 @@ bin/tdbbackup bin/tdbdump bin/tdbtool bin/testparm -bin/testprns -bin/wbinfo +${WINBIND}bin/wbinfo include/libsmbclient.h ${NSS_WINBIND} ${NSS_WINS} @@ -34,7 +33,6 @@ lib/samba/en.msg lib/samba/fr.msg lib/samba/it.msg lib/samba/ja.msg -lib/samba/libsmbclient.a lib/samba/libsmbclient.so lib/samba/libsmbclient.so.0 lib/samba/lowcase.dat @@ -54,8 +52,8 @@ lib/samba/vfs/netatalk.so lib/samba/vfs/readonly.so lib/samba/vfs/recycle.so lib/samba/vfs/shadow_copy.so -${PAM}lib/security/pam_smbpass.so -${PAM}lib/security/pam_winbind.so +${PAM_SMBPASS} +${PAM_WINBIND} ${CUPS}libexec/cups/backend/smb man/man1/editreg.1 man/man1/findsmb.1 @@ -82,6 +80,7 @@ man/man5/smb.conf.5 man/man5/smbgetrc.5 man/man5/smbpasswd.5 man/man7/samba.7 +man/man8/libsmbclient.8 man/man8/mount.cifs.8 man/man8/net.8 man/man8/nmbd.8 @@ -96,11 +95,12 @@ man/man8/smbumount.8 man/man8/swat.8 man/man8/tdbbackup.8 man/man8/tdbdump.8 +man/man8/umount.cifs.8 man/man8/winbindd.8 sbin/nmbd sbin/smbd sbin/swat -sbin/winbindd +${WINBIND}sbin/winbindd share/doc/samba/NT4-Locking.reg share/doc/samba/NT4_PlainPassword.reg ${PAM}share/doc/samba/README.pam_smbpass @@ -118,7 +118,7 @@ share/doc/samba/WindowsTerminalServer.reg share/examples/rc.d/nmbd share/examples/rc.d/samba share/examples/rc.d/smbd -share/examples/rc.d/winbindd +${WINBIND}share/examples/rc.d/winbindd share/examples/samba/adduser.sh share/examples/samba/deluser.sh share/examples/samba/mknissmbpasswd.sh @@ -131,245 +131,416 @@ ${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/samba/swat/help/Samba-Developers-Guide/CodingSuggestions.html -share/samba/swat/help/Samba-Developers-Guide/Packaging.html -share/samba/swat/help/Samba-Developers-Guide/architecture.html -share/samba/swat/help/Samba-Developers-Guide/contributing.html -share/samba/swat/help/Samba-Developers-Guide/debug.html -share/samba/swat/help/Samba-Developers-Guide/index.html -share/samba/swat/help/Samba-Developers-Guide/internals.html -share/samba/swat/help/Samba-Developers-Guide/modules.html -share/samba/swat/help/Samba-Developers-Guide/netbios.html -share/samba/swat/help/Samba-Developers-Guide/ntdomain.html -share/samba/swat/help/Samba-Developers-Guide/parsing.html -share/samba/swat/help/Samba-Developers-Guide/pr01.html -share/samba/swat/help/Samba-Developers-Guide/printing.html -share/samba/swat/help/Samba-Developers-Guide/pt01.html -share/samba/swat/help/Samba-Developers-Guide/pt02.html -share/samba/swat/help/Samba-Developers-Guide/pt03.html -share/samba/swat/help/Samba-Developers-Guide/pt04.html -share/samba/swat/help/Samba-Developers-Guide/pt05.html -share/samba/swat/help/Samba-Developers-Guide/pwencrypt.html -share/samba/swat/help/Samba-Developers-Guide/registry.html -share/samba/swat/help/Samba-Developers-Guide/rpc-plugin.html -share/samba/swat/help/Samba-Developers-Guide/tracing.html -share/samba/swat/help/Samba-Developers-Guide/unix-smb.html -share/samba/swat/help/Samba-Developers-Guide/vfs.html -share/samba/swat/help/Samba-Developers-Guide/windows-debug.html -share/samba/swat/help/Samba-Developers-Guide/wins.html -share/samba/swat/help/Samba-Guide/2000users.html -share/samba/swat/help/Samba-Guide/Big500users.html -share/samba/swat/help/Samba-Guide/DomApps.html -share/samba/swat/help/Samba-Guide/HA.html -share/samba/swat/help/Samba-Guide/appendix.html -share/samba/swat/help/Samba-Guide/go01.html -share/samba/swat/help/Samba-Guide/gpl.html -share/samba/swat/help/Samba-Guide/happy.html -share/samba/swat/help/Samba-Guide/images/AccountingNetwork.png -share/samba/swat/help/Samba-Guide/images/Charity-Network.png -share/samba/swat/help/Samba-Guide/images/HostAnnouncment.png -share/samba/swat/help/Samba-Guide/images/NullConnect.png -share/samba/swat/help/Samba-Guide/images/UNIX-Samba-and-LDAP.png -share/samba/swat/help/Samba-Guide/images/UserConnect.png -share/samba/swat/help/Samba-Guide/images/UserMgrNT4.png -share/samba/swat/help/Samba-Guide/images/WINREPRESSME-Capture.png -share/samba/swat/help/Samba-Guide/images/WINREPRESSME-Capture2.png -share/samba/swat/help/Samba-Guide/images/WindowsXP-NullConnection.png -share/samba/swat/help/Samba-Guide/images/WindowsXP-UserConnection.png -share/samba/swat/help/Samba-Guide/images/XP-screen001.png -share/samba/swat/help/Samba-Guide/images/acct2net.png -share/samba/swat/help/Samba-Guide/images/ch7-dual-additive-LDAP-Ok.png -share/samba/swat/help/Samba-Guide/images/ch7-dual-additive-LDAP.png -share/samba/swat/help/Samba-Guide/images/ch7-fail-overLDAP.png -share/samba/swat/help/Samba-Guide/images/ch7-singleLDAP.png -share/samba/swat/help/Samba-Guide/images/ch8-migration.png -share/samba/swat/help/Samba-Guide/images/chap4-net.png -share/samba/swat/help/Samba-Guide/images/chap5-net.png -share/samba/swat/help/Samba-Guide/images/chap6-net.png -share/samba/swat/help/Samba-Guide/images/chap7-idresol.png -share/samba/swat/help/Samba-Guide/images/chap7-net-Ar.png -share/samba/swat/help/Samba-Guide/images/chap7-net2-Br.png -share/samba/swat/help/Samba-Guide/images/chap9-ADSDC.png -share/samba/swat/help/Samba-Guide/images/chap9-SambaDC.png -share/samba/swat/help/Samba-Guide/images/lam-config.png -share/samba/swat/help/Samba-Guide/images/lam-group-members.png -share/samba/swat/help/Samba-Guide/images/lam-groups.png -share/samba/swat/help/Samba-Guide/images/lam-hosts.png -share/samba/swat/help/Samba-Guide/images/lam-login.png -share/samba/swat/help/Samba-Guide/images/lam-users.png -share/samba/swat/help/Samba-Guide/images/openmag.png -share/samba/swat/help/Samba-Guide/images/wxpp001.png -share/samba/swat/help/Samba-Guide/images/wxpp004.png -share/samba/swat/help/Samba-Guide/images/wxpp006.png -share/samba/swat/help/Samba-Guide/images/wxpp007.png -share/samba/swat/help/Samba-Guide/images/wxpp008.png -share/samba/swat/help/Samba-Guide/index.html -share/samba/swat/help/Samba-Guide/ix01.html -share/samba/swat/help/Samba-Guide/kerberos.html -share/samba/swat/help/Samba-Guide/migration.html -share/samba/swat/help/Samba-Guide/nw4migration.html -share/samba/swat/help/Samba-Guide/pr01.html -share/samba/swat/help/Samba-Guide/pr02.html -share/samba/swat/help/Samba-Guide/pr03.html -share/samba/swat/help/Samba-Guide/preface.html -share/samba/swat/help/Samba-Guide/primer.html -share/samba/swat/help/Samba-Guide/secure.html -share/samba/swat/help/Samba-Guide/simple.html -share/samba/swat/help/Samba-Guide/small.html -share/samba/swat/help/Samba-Guide/unixclients.html -share/samba/swat/help/Samba-HOWTO-Collection/AccessControls.html -share/samba/swat/help/Samba-HOWTO-Collection/AdvancedNetworkManagement.html -share/samba/swat/help/Samba-HOWTO-Collection/Appendix.html -share/samba/swat/help/Samba-HOWTO-Collection/Backup.html -share/samba/swat/help/Samba-HOWTO-Collection/CUPS-printing.html -share/samba/swat/help/Samba-HOWTO-Collection/ClientConfig.html -share/samba/swat/help/Samba-HOWTO-Collection/DNSDHCP.html -share/samba/swat/help/Samba-HOWTO-Collection/FastStart.html -share/samba/swat/help/Samba-HOWTO-Collection/InterdomainTrusts.html -share/samba/swat/help/Samba-HOWTO-Collection/IntroSMB.html -share/samba/swat/help/Samba-HOWTO-Collection/NT4Migration.html -share/samba/swat/help/Samba-HOWTO-Collection/NetworkBrowsing.html -share/samba/swat/help/Samba-HOWTO-Collection/Other-Clients.html -share/samba/swat/help/Samba-HOWTO-Collection/PolicyMgmt.html -share/samba/swat/help/Samba-HOWTO-Collection/Portability.html -share/samba/swat/help/Samba-HOWTO-Collection/ProfileMgmt.html -share/samba/swat/help/Samba-HOWTO-Collection/SWAT.html -share/samba/swat/help/Samba-HOWTO-Collection/SambaHA.html -share/samba/swat/help/Samba-HOWTO-Collection/ServerType.html -share/samba/swat/help/Samba-HOWTO-Collection/StandAloneServer.html -share/samba/swat/help/Samba-HOWTO-Collection/VFS.html -share/samba/swat/help/Samba-HOWTO-Collection/bugreport.html -share/samba/swat/help/Samba-HOWTO-Collection/compiling.html -share/samba/swat/help/Samba-HOWTO-Collection/diagnosis.html -share/samba/swat/help/Samba-HOWTO-Collection/domain-member.html -share/samba/swat/help/Samba-HOWTO-Collection/go01.html -share/samba/swat/help/Samba-HOWTO-Collection/gpl.html -share/samba/swat/help/Samba-HOWTO-Collection/groupmapping.html -share/samba/swat/help/Samba-HOWTO-Collection/idmapper.html -share/samba/swat/help/Samba-HOWTO-Collection/images/10small.png -share/samba/swat/help/Samba-HOWTO-Collection/images/11small.png -share/samba/swat/help/Samba-HOWTO-Collection/images/12small.png -share/samba/swat/help/Samba-HOWTO-Collection/images/13small.png -share/samba/swat/help/Samba-HOWTO-Collection/images/14small.png -share/samba/swat/help/Samba-HOWTO-Collection/images/1small.png -share/samba/swat/help/Samba-HOWTO-Collection/images/2small.png -share/samba/swat/help/Samba-HOWTO-Collection/images/3small.png -share/samba/swat/help/Samba-HOWTO-Collection/images/4small.png -share/samba/swat/help/Samba-HOWTO-Collection/images/5small.png -share/samba/swat/help/Samba-HOWTO-Collection/images/6small.png -share/samba/swat/help/Samba-HOWTO-Collection/images/7small.png -share/samba/swat/help/Samba-HOWTO-Collection/images/8small.png -share/samba/swat/help/Samba-HOWTO-Collection/images/9small.png -share/samba/swat/help/Samba-HOWTO-Collection/images/WME001.png -share/samba/swat/help/Samba-HOWTO-Collection/images/WME002.png -share/samba/swat/help/Samba-HOWTO-Collection/images/WME003.png -share/samba/swat/help/Samba-HOWTO-Collection/images/WME005.png -share/samba/swat/help/Samba-HOWTO-Collection/images/WME009.png -share/samba/swat/help/Samba-HOWTO-Collection/images/WME010.png -share/samba/swat/help/Samba-HOWTO-Collection/images/WME013.png -share/samba/swat/help/Samba-HOWTO-Collection/images/WME014.png -share/samba/swat/help/Samba-HOWTO-Collection/images/WXPP002.png -share/samba/swat/help/Samba-HOWTO-Collection/images/WXPP003.png -share/samba/swat/help/Samba-HOWTO-Collection/images/WXPP005.png -share/samba/swat/help/Samba-HOWTO-Collection/images/WXPP009.png -share/samba/swat/help/Samba-HOWTO-Collection/images/WXPP014.png -share/samba/swat/help/Samba-HOWTO-Collection/images/a_small.png -share/samba/swat/help/Samba-HOWTO-Collection/images/access1.png -share/samba/swat/help/Samba-HOWTO-Collection/images/browsing1.png -share/samba/swat/help/Samba-HOWTO-Collection/images/cups1.png -share/samba/swat/help/Samba-HOWTO-Collection/images/cups2.png -share/samba/swat/help/Samba-HOWTO-Collection/images/domain.png -share/samba/swat/help/Samba-HOWTO-Collection/images/ethereal1.png -share/samba/swat/help/Samba-HOWTO-Collection/images/ethereal2.png -share/samba/swat/help/Samba-HOWTO-Collection/images/idmap-gid2sid.png -share/samba/swat/help/Samba-HOWTO-Collection/images/idmap-sid2gid.png -share/samba/swat/help/Samba-HOWTO-Collection/images/idmap-sid2uid.png -share/samba/swat/help/Samba-HOWTO-Collection/images/idmap-store-gid2sid.png -share/samba/swat/help/Samba-HOWTO-Collection/images/idmap-uid2sid.png -share/samba/swat/help/Samba-HOWTO-Collection/images/idmap_winbind_no_loop.png -share/samba/swat/help/Samba-HOWTO-Collection/images/pdftoepsonusb.png -share/samba/swat/help/Samba-HOWTO-Collection/images/pdftosocket.png -share/samba/swat/help/Samba-HOWTO-Collection/images/trusts1.png -share/samba/swat/help/Samba-HOWTO-Collection/images/w2kp001.png -share/samba/swat/help/Samba-HOWTO-Collection/images/w2kp002.png -share/samba/swat/help/Samba-HOWTO-Collection/images/w2kp003.png -share/samba/swat/help/Samba-HOWTO-Collection/images/w2kp004.png -share/samba/swat/help/Samba-HOWTO-Collection/images/w2kp005.png -share/samba/swat/help/Samba-HOWTO-Collection/images/wxpp001.png -share/samba/swat/help/Samba-HOWTO-Collection/images/wxpp004.png -share/samba/swat/help/Samba-HOWTO-Collection/images/wxpp006.png -share/samba/swat/help/Samba-HOWTO-Collection/images/wxpp007.png -share/samba/swat/help/Samba-HOWTO-Collection/images/wxpp008.png -share/samba/swat/help/Samba-HOWTO-Collection/index.html -share/samba/swat/help/Samba-HOWTO-Collection/install.html -share/samba/swat/help/Samba-HOWTO-Collection/integrate-ms-networks.html -share/samba/swat/help/Samba-HOWTO-Collection/introduction.html -share/samba/swat/help/Samba-HOWTO-Collection/ix01.html -share/samba/swat/help/Samba-HOWTO-Collection/largefile.html -share/samba/swat/help/Samba-HOWTO-Collection/locking.html -share/samba/swat/help/Samba-HOWTO-Collection/migration.html -share/samba/swat/help/Samba-HOWTO-Collection/msdfs.html -share/samba/swat/help/Samba-HOWTO-Collection/optional.html -share/samba/swat/help/Samba-HOWTO-Collection/pam.html -share/samba/swat/help/Samba-HOWTO-Collection/passdb.html -share/samba/swat/help/Samba-HOWTO-Collection/pr01.html -share/samba/swat/help/Samba-HOWTO-Collection/pr02.html -share/samba/swat/help/Samba-HOWTO-Collection/pr03.html -share/samba/swat/help/Samba-HOWTO-Collection/printing.html -share/samba/swat/help/Samba-HOWTO-Collection/problems.html -share/samba/swat/help/Samba-HOWTO-Collection/rights.html -share/samba/swat/help/Samba-HOWTO-Collection/samba-bdc.html -share/samba/swat/help/Samba-HOWTO-Collection/samba-pdc.html -share/samba/swat/help/Samba-HOWTO-Collection/securing-samba.html -share/samba/swat/help/Samba-HOWTO-Collection/speed.html -share/samba/swat/help/Samba-HOWTO-Collection/troubleshooting.html -share/samba/swat/help/Samba-HOWTO-Collection/type.html -share/samba/swat/help/Samba-HOWTO-Collection/unicode.html -share/samba/swat/help/Samba-HOWTO-Collection/upgrading-to-3.0.html -share/samba/swat/help/Samba-HOWTO-Collection/winbind.html -share/samba/swat/help/editreg.1.html -share/samba/swat/help/findsmb.1.html -share/samba/swat/help/index.html -share/samba/swat/help/lmhosts.5.html -share/samba/swat/help/log2pcap.1.html -share/samba/swat/help/manpages.html -share/samba/swat/help/mount.cifs.8.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/pam_winbind.8.html -share/samba/swat/help/pdbedit.8.html -share/samba/swat/help/profiles.1.html -share/samba/swat/help/rpcclient.1.html -share/samba/swat/help/samba.7.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/smbget.1.html -share/samba/swat/help/smbgetrc.5.html -share/samba/swat/help/smbmnt.8.html -share/samba/swat/help/smbmount.8.html -share/samba/swat/help/smbpasswd.5.html -share/samba/swat/help/smbpasswd.8.html -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/swat.8.html -share/samba/swat/help/tdbbackup.8.html -share/samba/swat/help/tdbdump.8.html -share/samba/swat/help/testparm.1.html -share/samba/swat/help/testprns.1.html -share/samba/swat/help/vfstest.1.html -share/samba/swat/help/wbinfo.1.html +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/appendix.html +share/samba/swat/help/Samba3-ByExample/ch14.html +share/samba/swat/help/Samba3-ByExample/go01.html +share/samba/swat/help/Samba3-ByExample/gpl.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/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/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/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/ch45.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/gpl.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/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/editreg.1.html +share/samba/swat/help/manpages/findsmb.1.html +share/samba/swat/help/manpages/index.html +share/samba/swat/help/manpages/libsmbclient.8.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/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/smbmnt.8.html +share/samba/swat/help/manpages/smbmount.8.html +share/samba/swat/help/manpages/smbpasswd.5.html +share/samba/swat/help/manpages/smbpasswd.8.html +share/samba/swat/help/manpages/smbsh.1.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/smbumount.8.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/testparm.1.html +share/samba/swat/help/manpages/testprns.1.html +share/samba/swat/help/manpages/umount.cifs.8.html +share/samba/swat/help/manpages/vfstest.1.html +share/samba/swat/help/manpages/wbinfo.1.html +share/samba/swat/help/manpages/winbindd.8.html +share/samba/swat/help/using_samba/appa.html +share/samba/swat/help/using_samba/appb.html +share/samba/swat/help/using_samba/appc.html +share/samba/swat/help/using_samba/appd.html +share/samba/swat/help/using_samba/appe.html +share/samba/swat/help/using_samba/appf.html +share/samba/swat/help/using_samba/appg.html +share/samba/swat/help/using_samba/ch00.html +share/samba/swat/help/using_samba/ch01.html +share/samba/swat/help/using_samba/ch02.html +share/samba/swat/help/using_samba/ch03.html +share/samba/swat/help/using_samba/ch04.html +share/samba/swat/help/using_samba/ch05.html +share/samba/swat/help/using_samba/ch06.html +share/samba/swat/help/using_samba/ch07.html +share/samba/swat/help/using_samba/ch08.html +share/samba/swat/help/using_samba/ch09.html +share/samba/swat/help/using_samba/ch10.html +share/samba/swat/help/using_samba/ch11.html +share/samba/swat/help/using_samba/ch12.html +share/samba/swat/help/using_samba/figs/sam2_0101.gif +share/samba/swat/help/using_samba/figs/sam2_0102.gif +share/samba/swat/help/using_samba/figs/sam2_0103.gif +share/samba/swat/help/using_samba/figs/sam2_0104.gif +share/samba/swat/help/using_samba/figs/sam2_0105.gif +share/samba/swat/help/using_samba/figs/sam2_0106.gif +share/samba/swat/help/using_samba/figs/sam2_0107.gif +share/samba/swat/help/using_samba/figs/sam2_0108.gif +share/samba/swat/help/using_samba/figs/sam2_0109.gif +share/samba/swat/help/using_samba/figs/sam2_0110.gif +share/samba/swat/help/using_samba/figs/sam2_0111.gif +share/samba/swat/help/using_samba/figs/sam2_0112.gif +share/samba/swat/help/using_samba/figs/sam2_0113.gif +share/samba/swat/help/using_samba/figs/sam2_0114.gif +share/samba/swat/help/using_samba/figs/sam2_0201.gif +share/samba/swat/help/using_samba/figs/sam2_0202.gif +share/samba/swat/help/using_samba/figs/sam2_0203.gif +share/samba/swat/help/using_samba/figs/sam2_0204.gif +share/samba/swat/help/using_samba/figs/sam2_0301.gif +share/samba/swat/help/using_samba/figs/sam2_0302.gif +share/samba/swat/help/using_samba/figs/sam2_0303.gif +share/samba/swat/help/using_samba/figs/sam2_0304.gif +share/samba/swat/help/using_samba/figs/sam2_0305.gif +share/samba/swat/help/using_samba/figs/sam2_0306.gif +share/samba/swat/help/using_samba/figs/sam2_0307.gif +share/samba/swat/help/using_samba/figs/sam2_0308.gif +share/samba/swat/help/using_samba/figs/sam2_0309.gif +share/samba/swat/help/using_samba/figs/sam2_0310.gif +share/samba/swat/help/using_samba/figs/sam2_0311.gif +share/samba/swat/help/using_samba/figs/sam2_0312.gif +share/samba/swat/help/using_samba/figs/sam2_0313.gif +share/samba/swat/help/using_samba/figs/sam2_0314.gif +share/samba/swat/help/using_samba/figs/sam2_0315.gif +share/samba/swat/help/using_samba/figs/sam2_0316.gif +share/samba/swat/help/using_samba/figs/sam2_0317.gif +share/samba/swat/help/using_samba/figs/sam2_0318.gif +share/samba/swat/help/using_samba/figs/sam2_0319.gif +share/samba/swat/help/using_samba/figs/sam2_0320.gif +share/samba/swat/help/using_samba/figs/sam2_0321.gif +share/samba/swat/help/using_samba/figs/sam2_0322.gif +share/samba/swat/help/using_samba/figs/sam2_0323.gif +share/samba/swat/help/using_samba/figs/sam2_0324.gif +share/samba/swat/help/using_samba/figs/sam2_0325.gif +share/samba/swat/help/using_samba/figs/sam2_0326.gif +share/samba/swat/help/using_samba/figs/sam2_0327.gif +share/samba/swat/help/using_samba/figs/sam2_0328.gif +share/samba/swat/help/using_samba/figs/sam2_0329.gif +share/samba/swat/help/using_samba/figs/sam2_0330.gif +share/samba/swat/help/using_samba/figs/sam2_0331.gif +share/samba/swat/help/using_samba/figs/sam2_0332.gif +share/samba/swat/help/using_samba/figs/sam2_0333.gif +share/samba/swat/help/using_samba/figs/sam2_0334.gif +share/samba/swat/help/using_samba/figs/sam2_0335.gif +share/samba/swat/help/using_samba/figs/sam2_0336.gif +share/samba/swat/help/using_samba/figs/sam2_0337.gif +share/samba/swat/help/using_samba/figs/sam2_0338.gif +share/samba/swat/help/using_samba/figs/sam2_0339.gif +share/samba/swat/help/using_samba/figs/sam2_0340.gif +share/samba/swat/help/using_samba/figs/sam2_0341.gif +share/samba/swat/help/using_samba/figs/sam2_0342.gif +share/samba/swat/help/using_samba/figs/sam2_0343.gif +share/samba/swat/help/using_samba/figs/sam2_0344.gif +share/samba/swat/help/using_samba/figs/sam2_0345.gif +share/samba/swat/help/using_samba/figs/sam2_0346.gif +share/samba/swat/help/using_samba/figs/sam2_0347.gif +share/samba/swat/help/using_samba/figs/sam2_0348.gif +share/samba/swat/help/using_samba/figs/sam2_0349.gif +share/samba/swat/help/using_samba/figs/sam2_0350.gif +share/samba/swat/help/using_samba/figs/sam2_0351.gif +share/samba/swat/help/using_samba/figs/sam2_0352.gif +share/samba/swat/help/using_samba/figs/sam2_0353.gif +share/samba/swat/help/using_samba/figs/sam2_0354.gif +share/samba/swat/help/using_samba/figs/sam2_0355.gif +share/samba/swat/help/using_samba/figs/sam2_0356.gif +share/samba/swat/help/using_samba/figs/sam2_0357.gif +share/samba/swat/help/using_samba/figs/sam2_0358.gif +share/samba/swat/help/using_samba/figs/sam2_0359.gif +share/samba/swat/help/using_samba/figs/sam2_0360.gif +share/samba/swat/help/using_samba/figs/sam2_0361.gif +share/samba/swat/help/using_samba/figs/sam2_0401.gif +share/samba/swat/help/using_samba/figs/sam2_0402.gif +share/samba/swat/help/using_samba/figs/sam2_0403.gif +share/samba/swat/help/using_samba/figs/sam2_0404.gif +share/samba/swat/help/using_samba/figs/sam2_0405.gif +share/samba/swat/help/using_samba/figs/sam2_0406.gif +share/samba/swat/help/using_samba/figs/sam2_0407.gif +share/samba/swat/help/using_samba/figs/sam2_0408.gif +share/samba/swat/help/using_samba/figs/sam2_0409.gif +share/samba/swat/help/using_samba/figs/sam2_0410.gif +share/samba/swat/help/using_samba/figs/sam2_0411.gif +share/samba/swat/help/using_samba/figs/sam2_0412.gif +share/samba/swat/help/using_samba/figs/sam2_0413.gif +share/samba/swat/help/using_samba/figs/sam2_0414.gif +share/samba/swat/help/using_samba/figs/sam2_0415.gif +share/samba/swat/help/using_samba/figs/sam2_0416.gif +share/samba/swat/help/using_samba/figs/sam2_0417.gif +share/samba/swat/help/using_samba/figs/sam2_0501.gif +share/samba/swat/help/using_samba/figs/sam2_0502.gif +share/samba/swat/help/using_samba/figs/sam2_0503.gif +share/samba/swat/help/using_samba/figs/sam2_0504.gif +share/samba/swat/help/using_samba/figs/sam2_0505.gif +share/samba/swat/help/using_samba/figs/sam2_0506.gif +share/samba/swat/help/using_samba/figs/sam2_0507.gif +share/samba/swat/help/using_samba/figs/sam2_0508.gif +share/samba/swat/help/using_samba/figs/sam2_0601.gif +share/samba/swat/help/using_samba/figs/sam2_0602.gif +share/samba/swat/help/using_samba/figs/sam2_0603.gif +share/samba/swat/help/using_samba/figs/sam2_0604.gif +share/samba/swat/help/using_samba/figs/sam2_0605.gif +share/samba/swat/help/using_samba/figs/sam2_0701.gif +share/samba/swat/help/using_samba/figs/sam2_0801.gif +share/samba/swat/help/using_samba/figs/sam2_0802.gif +share/samba/swat/help/using_samba/figs/sam2_0803.gif +share/samba/swat/help/using_samba/figs/sam2_0804.gif +share/samba/swat/help/using_samba/figs/sam2_0805.gif +share/samba/swat/help/using_samba/figs/sam2_0806.gif +share/samba/swat/help/using_samba/figs/sam2_0807.gif +share/samba/swat/help/using_samba/figs/sam2_0808.gif +share/samba/swat/help/using_samba/figs/sam2_0809.gif +share/samba/swat/help/using_samba/figs/sam2_0810.gif +share/samba/swat/help/using_samba/figs/sam2_0811.gif +share/samba/swat/help/using_samba/figs/sam2_0901.gif +share/samba/swat/help/using_samba/figs/sam2_0902.gif +share/samba/swat/help/using_samba/figs/sam2_0903.gif +share/samba/swat/help/using_samba/figs/sam2_1001.gif +share/samba/swat/help/using_samba/figs/sam2_1002.gif +share/samba/swat/help/using_samba/figs/sam2_1003.gif +share/samba/swat/help/using_samba/figs/sam2_1004.gif +share/samba/swat/help/using_samba/figs/sam2_1005.gif +share/samba/swat/help/using_samba/figs/sam2_1006.gif +share/samba/swat/help/using_samba/figs/sam2_1101.gif +share/samba/swat/help/using_samba/figs/sam2_1102.gif +share/samba/swat/help/using_samba/figs/sam2_af01.gif +share/samba/swat/help/using_samba/figs/sam2_af02.gif +share/samba/swat/help/using_samba/figs/sam2_af03.gif +share/samba/swat/help/using_samba/figs/sam2_af04.gif +share/samba/swat/help/using_samba/figs/sam2_af05.gif +share/samba/swat/help/using_samba/figs/sam2_af06.gif +share/samba/swat/help/using_samba/figs/sam2_af07.gif +share/samba/swat/help/using_samba/inx.html +share/samba/swat/help/using_samba/samba2_s.gif +share/samba/swat/help/using_samba/samba2_xs.gif +share/samba/swat/help/using_samba/toc.html share/samba/swat/help/welcome.html -share/samba/swat/help/winbindd.8.html share/samba/swat/images/globals.gif share/samba/swat/images/home.gif share/samba/swat/images/passwd.gif @@ -391,188 +562,22 @@ 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 -@dirrm share/samba/swat/using_samba/figs -@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 -@exec ${MKDIR} %D/share/samba/swat/lang/ja/images -@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/Samba-HOWTO-Collection/images -@dirrm share/samba/swat/help/Samba-HOWTO-Collection -@dirrm share/samba/swat/help/Samba-Guide/images -@dirrm share/samba/swat/help/Samba-Guide -@dirrm share/samba/swat/help/Samba-Developers-Guide +@dirrm share/samba/swat/help/using_samba/figs +@dirrm share/samba/swat/help/using_samba +@dirrm share/samba/swat/help/manpages +@dirrm share/samba/swat/help/Samba3-HOWTO/images +@dirrm share/samba/swat/help/Samba3-HOWTO +@dirrm share/samba/swat/help/Samba3-Developers-Guide +@dirrm share/samba/swat/help/Samba3-ByExample/images +@dirrm share/samba/swat/help/Samba3-ByExample @dirrm share/samba/swat/help @dirrm share/samba/swat @dirrm share/samba diff --git a/net/samba/distinfo b/net/samba/distinfo index 51ebac8f642..08b755bd39d 100644 --- a/net/samba/distinfo +++ b/net/samba/distinfo @@ -1,13 +1,61 @@ -$NetBSD: distinfo,v 1.45 2005/06/08 20:15:20 jlam Exp $ +$NetBSD: distinfo,v 1.46 2005/11/14 08:05:27 jlam Exp $ -SHA1 (samba-3.0.14a.tar.gz) = 978ff392d575c717069c66e918f6bbbf815b84b1 -RMD160 (samba-3.0.14a.tar.gz) = 69993b25fc5d4d172fc70e26b9e5e4b5b9ab0c0f -Size (samba-3.0.14a.tar.gz) = 15605851 bytes -SHA1 (patch-aa) = 20af8aaf492ee550254a007a05cdec20eb699c27 -SHA1 (patch-ab) = c5f352a07774b8e2873c2ac3b3de3ba4cb12bf5e -SHA1 (patch-ac) = fc0d15f371a9c3544499f6a6cd830b52b34ff644 -SHA1 (patch-ad) = 8a99e5f898eb3c466b07b5bbb9f0c7e28e385ea0 -SHA1 (patch-af) = bc0cead8f8350001e5291443821e875bab540fc3 -SHA1 (patch-ag) = cce908577cf4007bb00b15f6dd7eee7d549ac5b0 -SHA1 (patch-at) = faeb2c7d26bb6d7b17b13253bb567e33df90a74b -SHA1 (patch-au) = 1ed1be0ea34d28eb7387316ca4dd1eb7a18c7012 +SHA1 (samba-3.0.20b/samba-3.0.20b.tar.gz) = e46fa8465dd70c670d84d697e408e70cbc18bb56 +RMD160 (samba-3.0.20b/samba-3.0.20b.tar.gz) = c7fe6cf7e3cae6835efd631f9c7d8b97c8253370 +Size (samba-3.0.20b/samba-3.0.20b.tar.gz) = 17165513 bytes +SHA1 (samba-3.0.20b/print_lprm.patch) = 9610e7cc3ba475f7963a010a965e62299b37561f +RMD160 (samba-3.0.20b/print_lprm.patch) = 8bfaad7118e58ceeb7a691279b3642ea870c3568 +Size (samba-3.0.20b/print_lprm.patch) = 12526 bytes +SHA1 (samba-3.0.20b/quota.patch) = a6fbe1de5133f5292d29121e1d450347db26612a +RMD160 (samba-3.0.20b/quota.patch) = d9c3616a9d552e5d5d84f61d05451d945cc20a3f +Size (samba-3.0.20b/quota.patch) = 491 bytes +SHA1 (samba-3.0.20b/bug3201_wbinfo.patch) = 0fa3d3547d35a725cc2483a3c8ab64dab0b9b8c5 +RMD160 (samba-3.0.20b/bug3201_wbinfo.patch) = 2253d4ebfc7c162e0cf4b991c854c999b7b99316 +Size (samba-3.0.20b/bug3201_wbinfo.patch) = 566 bytes +SHA1 (patch-ab) = 43e97366a460b0aa19667719f7235c9eb2a58022 +SHA1 (patch-ac) = 47529dfe904768e6a3076131978c89fe2d1e3619 +SHA1 (patch-ad) = dd1f36ce1ccabaf3b4efb1d61a8af1f4d3d1857a +SHA1 (patch-ae) = a220568afcb6ae97e1000296795f852f8e92f624 +SHA1 (patch-af) = d97e67c8abaa0e69cea13d683e9dbb88fc6654ea +SHA1 (patch-ag) = 81e38ca474220246a1d4621fdaf7a0773c1549ee +SHA1 (patch-ah) = 5bd17d69b96439797339deb07ffff59d74ac403e +SHA1 (patch-ai) = 6e4500634cf3023d1ff22e4df3352d619f93aabc +SHA1 (patch-aj) = c9e406113cdfc21c06483796a7008eb98a7d49fe +SHA1 (patch-ak) = 0c69720954282022c7982d36eaee94a03db7b689 +SHA1 (patch-al) = 9962f9ad7a495f4be4bcf1ec9e42ca51a2c417b8 +SHA1 (patch-am) = 4abd7c8e7b5601b78094d5a302962ea54ef9d0ad +SHA1 (patch-at) = e741a3a2f7802c2ca9228822085ff8a92b4d61f1 +SHA1 (patch-au) = 7e9c9e4490b4d242800d1e6485b4284466c5499d +SHA1 (patch-av) = 041e59feb5398e5bbeba3fe1a0190cb7340f60bc +SHA1 (patch-aw) = 374b1660d31ed54b85e68b49e25d80c2c54961be +SHA1 (patch-ax) = 778ff50316524d06d0c609b0aa8c6dfb48914a8e +SHA1 (patch-ay) = 054ba0c228a546af7f020a79b707e5fff0b21ff7 +SHA1 (patch-ba) = 05c6d1a0d209a6a22d7a5b310048ac45134cd2a7 +SHA1 (patch-bb) = 7a51028a9b5d81e4491b09b62851378e16425a99 +SHA1 (patch-bc) = a2c94726ca3eb7be9468becdc0c8ac69fc47fae6 +SHA1 (patch-bd) = e12fb3072f62838df15686e13229c13b2869828b +SHA1 (patch-be) = abd72608a8f62ef1caa276b0f016f68458bb7078 +SHA1 (patch-bf) = 9c393853521ae46bd0e1ebb0924c5433c56b7e61 +SHA1 (patch-bg) = c247e4d269d71f992f061a6fbc56b22579d08a09 +SHA1 (patch-bh) = 6453d565d75d5cb1836d5a7341107674c05ba19a +SHA1 (patch-bi) = cc3cce1ca2fe1c311c6d55332a7cdb41a938cf2e +SHA1 (patch-bj) = 0dd428bc8301762d32661861c83f7067bde39ae1 +SHA1 (patch-bk) = fb2a36279eaece513481fe55007721150789fd9f +SHA1 (patch-bl) = 5f29a953dd9cadea8a27526778cc2257ccf3fd7c +SHA1 (patch-bm) = dba69070a9201f77b95f254ee4d9a0e8557894db +SHA1 (patch-bn) = c3a10f18dbcaa71775e7c290d0ac7d98288ba2f0 +SHA1 (patch-bo) = d0dcfa6effcfb0c8470d5bc2f50343d588e8c79f +SHA1 (patch-bp) = a4568f166e3578293cb46ae298046d716b5398d0 +SHA1 (patch-bq) = dc25eb43336d4ad7ecef1b4ea8c5dcd72cc91a7b +SHA1 (patch-br) = 109b2933b949c88985f42ec0eb5f4bf01824a780 +SHA1 (patch-bs) = eacec406b285ab3d669ac2666f2cca5d96798991 +SHA1 (patch-bt) = 814b299cf9abc9ec7e3b86f48f42e0a2e2154e1b +SHA1 (patch-bu) = b3e2a2c02cf31419e3ece37aecd0eb566e809419 +SHA1 (patch-bv) = 2e594d4ed4a98105b1a1311042f14e5f960aa067 +SHA1 (patch-bw) = c10fb9e9dfb8cf048238261675ef2c74b4ca01c6 +SHA1 (patch-bx) = b46172b1e7e4937039b894eff7caf6dff5cbba62 +SHA1 (patch-by) = adc269c07d06108fe77afbb65d5eb309fc4d6d67 +SHA1 (patch-bz) = 143ff731caced00aa6ba589a1d83581a7449b853 +SHA1 (patch-ca) = 3d752643803ed14f01d4d45ed8fc434979db44b6 +SHA1 (patch-cb) = 42797dd1d7fc7ff34811b71e98f99c4f1b08eaa8 +SHA1 (patch-cc) = bb5f1a5da681e947b218eeff928d939e1219ddb2 diff --git a/net/samba/files/nmbd.sh b/net/samba/files/nmbd.sh index d44a3049f78..d267f0d9f9a 100755 --- a/net/samba/files/nmbd.sh +++ b/net/samba/files/nmbd.sh @@ -1,13 +1,11 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: nmbd.sh,v 1.9 2004/01/11 02:26:31 jlam Exp $ +# $NetBSD: nmbd.sh,v 1.10 2005/11/14 08:05:27 jlam Exp $ # # PROVIDE: nmbd # REQUIRE: DAEMON -if [ -f /etc/rc.subr ]; then - . /etc/rc.subr -fi +. /etc/rc.subr name="nmbd" rcvar=$name @@ -19,10 +17,5 @@ command_args="-D" # _must_ start as daemon from rc.d; reload_cmd=":" # avoid dumping debug output on SIGHUP -if [ -f /etc/rc.subr ]; then - load_rc_config $name - run_rc_command "$1" -else - @ECHO@ -n " ${name}" - ${command} ${nmbd_flags} ${command_args} -fi +load_rc_config $name +run_rc_command "$1" diff --git a/net/samba/files/samba.sh b/net/samba/files/samba.sh index 87a47e20bb8..635970d20ca 100644 --- a/net/samba/files/samba.sh +++ b/net/samba/files/samba.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: samba.sh,v 1.16 2005/03/08 01:36:16 lukem Exp $ +# $NetBSD: samba.sh,v 1.17 2005/11/14 08:05:27 jlam Exp $ # # KEYWORD: nostart # @@ -10,9 +10,7 @@ # which are controlled via their appropriate rc.conf(5) settings. # -if [ -f /etc/rc.subr ]; then - . /etc/rc.subr -fi +. /etc/rc.subr rcd_dir=`@DIRNAME@ $0` @@ -42,7 +40,7 @@ reverse_commands() done } -COMMAND_LIST="nmbd smbd winbindd" +COMMAND_LIST="nmbd winbindd smbd" name="samba" start_cmd="forward_commands" @@ -51,10 +49,4 @@ reload_cmd="forward_commands" status_cmd="forward_commands" extra_commands="reload status" -if [ -f /etc/rc.subr ]; then - run_rc_command "$1" -else - @ECHO@ -n " ${name}" - _arg="$1" - ${start_cmd} -fi +run_rc_command "$1" diff --git a/net/samba/files/smbd.sh b/net/samba/files/smbd.sh index 36a9f83e8df..a253a8292a3 100755 --- a/net/samba/files/smbd.sh +++ b/net/samba/files/smbd.sh @@ -1,26 +1,21 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: smbd.sh,v 1.10 2004/01/11 02:26:31 jlam Exp $ +# $NetBSD: smbd.sh,v 1.11 2005/11/14 08:05:27 jlam Exp $ # # PROVIDE: smbd -# REQUIRE: DAEMON +# REQUIRE: nmbd -if [ -f /etc/rc.subr ]; then - . /etc/rc.subr -fi +. /etc/rc.subr name="smbd" rcvar=$name command="@PREFIX@/sbin/${name}" +required_vars="nmbd" required_files="@SAMBA_ETCDIR@/smb.conf" 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 - load_rc_config $name - run_rc_command "$1" -else - @ECHO@ -n " ${name}" - ${command} ${smbd_flags} ${command_args} -fi +load_rc_config $name +load_rc_config_var nmbd nmbd +run_rc_command "$1" diff --git a/net/samba/files/winbindd.sh b/net/samba/files/winbindd.sh index a5462332d66..91b3f9c649f 100644 --- a/net/samba/files/winbindd.sh +++ b/net/samba/files/winbindd.sh @@ -1,13 +1,11 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: winbindd.sh,v 1.1 2004/01/11 02:26:31 jlam Exp $ +# $NetBSD: winbindd.sh,v 1.2 2005/11/14 08:05:27 jlam Exp $ # # PROVIDE: winbindd # REQUIRE: nmbd -if [ -f /etc/rc.subr ]; then - . /etc/rc.subr -fi +. /etc/rc.subr name="winbindd" rcvar=$name @@ -15,11 +13,8 @@ command="@PREFIX@/sbin/${name}" required_vars="nmbd" required_files="@SAMBA_ETCDIR@/smb.conf" extra_commands="reload" +command_args="-B" -if [ -f /etc/rc.subr ]; then - load_rc_config $name - run_rc_command "$1" -else - @ECHO@ -n " ${name}" - ${command} ${winbindd_flags} -fi +load_rc_config $name +load_rc_config_var nmbd nmbd +run_rc_command "$1" diff --git a/net/samba/options.mk b/net/samba/options.mk index f55b4afdc48..3ffff4d6bcd 100644 --- a/net/samba/options.mk +++ b/net/samba/options.mk @@ -1,29 +1,29 @@ -# $NetBSD: options.mk,v 1.8 2005/06/05 14:17:53 taca Exp $ - -# Global and legacy options +# $NetBSD: options.mk,v 1.9 2005/11/14 08:05:27 jlam Exp $ +# Recommended package options for various setups: +# +# Standalone Samba server cups +# Domain Member server cups ldap winbind +# Active Directory Member server ads cups winbind +# Domain Controller ldap winbind +# PKG_OPTIONS_VAR= PKG_OPTIONS.samba -PKG_SUPPORTED_OPTIONS= pam ads cups ldap ldap-compat +PKG_SUPPORTED_OPTIONS= ads cups ldap ldap-compat mysql pam pgsql \ + winbind xml + .include "../../mk/bsd.options.mk" -### -### Support PAM authentication and build smbpass and winbind PAM modules. -### -.if !empty(PKG_OPTIONS:Mpam) -. include "../../security/PAM/module.mk" -CONFIGURE_ARGS+= --with-pam -CONFIGURE_ARGS+= --with-pam_smbpass -PLIST_SUBST+= PAM= -.else -PLIST_SUBST+= PAM="@comment " -.endif +SAMBA_PASSDB_BACKENDS:= # empty +SAMBA_STATIC_MODULES:= # empty ### ### Allow Samba to join as a member server of an Active Directory domain. ### .if !empty(PKG_OPTIONS:Mads) . include "../../mk/krb5.buildlink3.mk" +. if empty(PKG_OPTIONS:Mldap) PKG_OPTIONS+= ldap +. endif CONFIGURE_ARGS+= --with-ads CONFIGURE_ARGS+= --with-krb5=${KRB5BASE} .else @@ -32,12 +32,17 @@ CONFIGURE_ARGS+= --without-krb5 .endif ### -### Native CUPS support for printing +### Native CUPS support for providing printing services. ### .if !empty(PKG_OPTIONS:Mcups) . include "../../print/cups/buildlink3.mk" CONFIGURE_ARGS+= --enable-cups PLIST_SUBST+= CUPS= + +post-install: samba-cups-install +samba-cups-install: + ${INSTALL_DATA_DIR} ${PREFIX}/libexec/cups/backend + cd ${PREFIX}/libexec/cups/backend && ${LN} -fs ../../../bin/smbspool smb .else CONFIGURE_ARGS+= --disable-cups PLIST_SUBST+= CUPS="@comment " @@ -47,7 +52,9 @@ PLIST_SUBST+= CUPS="@comment " ### Support Samba-2.x LDAP password and account databases. ### .if !empty(PKG_OPTIONS:Mldap-compat) +. if empty(PKG_OPTIONS:Mldap) PKG_OPTIONS+= ldap +. endif CONFIGURE_ARGS+= --with-ldapsam .endif @@ -62,35 +69,152 @@ CONFIGURE_ARGS+= --without-ldap .endif ### -### Only Linux supports smbmount for mounting a Samba share into the -### filesystem. +### Support using a MySQL database as a "passdb backend" for password +### and account information storage. +### +.if !empty(PKG_OPTIONS:Mmysql) +. include "../../mk/mysql.buildlink3.mk" +SAMBA_PASSDB_BACKENDS:= ${SAMBA_PASSDB_BACKENDS},mysql +SAMBA_STATIC_MODULES:= ${SAMBA_STATIC_MODULES},pdb_mysql +.endif + +### +### Support PAM authentication and build smbpass and winbind PAM modules. ### -.if ${OPSYS} == "Linux" -CONFIGURE_ARGS+= --with-smbmount -PLIST_SUBST+= SMBMOUNT= +.if !empty(PKG_OPTIONS:Mpam) +. include "../../security/PAM/module.mk" +CONFIGURE_ARGS+= --with-pam +CONFIGURE_ARGS+= --with-pam_smbpass +PLIST_SUBST+= PAM_SMBPASS=lib/security/pam_smbpass.so +PLIST_SUBST+= PAM= + +post-install: samba-pam-smbpass-install +samba-pam-smbpass-install: + ${INSTALL_LIB_DIR} ${PAM_INSTMODULEDIR} + ${INSTALL_LIB} ${WRKSRC}/bin/pam_smbpass.so ${PAM_INSTMODULEDIR} + ${INSTALL_DATA_DIR} ${DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/pam_smbpass/README \ + ${DOCDIR}/README.pam_smbpass + ${INSTALL_DATA_DIR} ${EGDIR}/pam_smbpass + cd ${WRKSRC}/pam_smbpass/samples; for f in [a-z]*; do \ + ${INSTALL_DATA} $${f} ${EGDIR}/pam_smbpass/$${f}; \ + done .else -PLIST_SUBST+= SMBMOUNT="@comment " +PLIST_SUBST+= PAM_SMBPASS="@comment no PAM smbpass module" +PLIST_SUBST+= PAM="@comment " +.endif + +### +### Support using a PostgreSQL database as a "passdb backend" for password +### and account information storage. +### +.if !empty(PKG_OPTIONS:Mpgsql) +. include "../../mk/pgsql.buildlink3.mk" +SAMBA_PASSDB_BACKENDS:= ${SAMBA_PASSDB_BACKENDS},pgsql +SAMBA_STATIC_MODULES:= ${SAMBA_STATIC_MODULES},pdb_pgsql .endif ### -### Determine the proper name for the winbind and WINS NSS modules. +### Support querying a PDC for domain user and group information, e.g., +### through NSS or PAM. ### -NSS_WINBIND.${OPSYS}?= libnss_winbind.so -NSS_WINS.${OPSYS}?= libnss_wins.so +.if !empty(PKG_OPTIONS:Mwinbind) +CONFIGURE_ARGS+= --with-winbind + +SAMBA_STATIC_MODULES:= ${SAMBA_STATIC_MODULES},idmap_rid +. if !empty(PKG_OPTIONS:Mads) +SAMBA_STATIC_MODULES:= ${SAMBA_STATIC_MODULES},idmap_ad +. endif + +WINBINDD_RCD_SCRIPT= winbindd +FILES_SUBST+= WINBINDD_RCD_SCRIPT=${WINBINDD_RCD_SCRIPT} +PLIST_SUBST+= WINBIND= + +# Determine the proper name for the winbind and WINS NSS modules. +# +# XXX We should really be trawling the generated Makefiles or config.* +# XXX files to find this out dynamically. +# +NSS_WINBIND.${OPSYS}?= # empty +NSS_WINBIND.AIX= WINBIND +NSS_WINBIND.IRIX= libns_winbind.so +NSS_WINBIND.Linux= libnss_winbind.so +NSS_WINBIND.SunOS= libnss_winbind.so +. if !empty(MACHINE_PLATFORM:MFreeBSD-[5-9].*) +NSS_WINBIND.FreeBSD= nss_winbind.so +. endif +. if !empty(MACHINE_PLATFORM:MNetBSD-[3-9].*) +NSS_WINBIND.NetBSD= nss_winbind.so +. endif +NSS_WINBIND= ${NSS_WINBIND.${OPSYS}} + +NSS_WINS.${OPSYS}?= # empty +NSS_WINS.IRIX= libns_wins.so +NSS_WINS.Linux= libnss_wins.so +NSS_WINS.SunOS= libnss_wins.so +NSS_WINS= ${NSS_WINS.${OPSYS}} + +# Install the PAM winbind module if we're also building with PAM support. +. if empty(PKG_OPTIONS:Mpam) +PLIST_SUBST+= PAM_WINBIND="@comment no PAM winbind module" +. else +PLIST_SUBST+= PAM_WINBIND=lib/security/pam_winbind.so + +post-install: samba-pam-winbind-install +samba-pam-winbind-install: + ${INSTALL_LIB_DIR} ${PAM_INSTMODULEDIR} + ${INSTALL_LIB} ${WRKSRC}/nsswitch/pam_winbind.so ${PAM_INSTMODULEDIR} +. endif -NSS_WINBIND.AIX= WINBIND -NSS_WINS.AIX= # empty +# Install the NSS winbind module if it exists. +. if empty(NSS_WINBIND) +PLIST_SUBST+= NSS_WINBIND="@comment no NSS winbind module" +. else +PLIST_SUBST+= NSS_WINBIND=lib/${NSS_WINBIND} -NSS_WINBIND.DragonFly= # empty -NSS_WINS.DragonFly= # empty +post-install: samba-nss-winbind-install +samba-nss-winbind-install: + ${INSTALL_LIB} ${WRKSRC}/nsswitch/${NSS_WINBIND} ${PREFIX}/lib +. endif -NSS_WINBIND.IRIX= libns_winbind.so -NSS_WINS.IRIX= libns_wins.so +# Install the NSS WINS module if it exists. +. if empty(NSS_WINS) +PLIST_SUBST+= NSS_WINS="@comment no NSS WINS module" +. else +PLIST_SUBST+= NSS_WINS=lib/${NSS_WINS} -.if !empty(MACHINE_PLATFORM:MFreeBSD-5.*) -NSS_WINBIND.FreeBSD= nss_winbind.so -NSS_WINS.FreeBSD= nss_wins.so +post-install: samba-nss-wins-install +samba-nss-wins-install: + ${INSTALL_LIB} ${WRKSRC}/nsswitch/${NSS_WINS} ${PREFIX}/lib +. endif +.else +CONFIGURE_ARGS+= --without-winbind +PLIST_SUBST+= WINBIND="@comment " +PLIST_SUBST+= PAM_WINBIND="@comment no PAM winbind module" +PLIST_SUBST+= NSS_WINBIND="@comment no NSS winbind module" +PLIST_SUBST+= NSS_WINS="@comment no NSS WINS module" +.endif + +### +### Support using an XML file as a "passdb backend" for password and +### account information storage. +### +.if !empty(PKG_OPTIONS:Mxml) +. include "../../textproc/libxml2/buildlink3.mk" +SAMBA_PASSDB_BACKENDS:= ${SAMBA_PASSDB_BACKENDS},xml +SAMBA_STATIC_MODULES:= ${SAMBA_STATIC_MODULES},pdb_xml +.endif + +### +### Add the optional passdb backends to the configuration. +### +.if !empty(SAMBA_PASSDB_BACKENDS) +CONFIGURE_ARGS+= --with-expsam=${SAMBA_PASSDB_BACKENDS:S/^,//} .endif -NSS_WINBIND= ${NSS_WINBIND.${OPSYS}} -NSS_WINS= ${NSS_WINS.${OPSYS}} +### +### Add the optional static modules to the configuration. +### +.if !empty(SAMBA_STATIC_MODULES) +CONFIGURE_ARGS+= --with-static-modules=${SAMBA_STATIC_MODULES:S/^,//} +.endif diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa deleted file mode 100644 index 97931c49159..00000000000 --- a/net/samba/patches/patch-aa +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-aa,v 1.29 2005/01/09 06:33:28 christos Exp $ - ---- nsswitch/pam_winbind.c.orig 2004-10-25 17:04:57.000000000 -0400 -+++ nsswitch/pam_winbind.c 2005-01-09 01:17:21.000000000 -0500 -@@ -338,10 +338,10 @@ - item = NULL; - return PAM_SUCCESS; - } else if (on(WINBIND_USE_FIRST_PASS_ARG, ctrl)) { -- return PAM_AUTHTOK_RECOVER_ERR; /* didn't work */ -+ return PAM_AUTHTOK_RECOVERY_ERR; /* didn't work */ - } else if (on(WINBIND_USE_AUTHTOK_ARG, ctrl) - && off(WINBIND__OLD_PASSWORD, ctrl)) { -- return PAM_AUTHTOK_RECOVER_ERR; -+ return PAM_AUTHTOK_RECOVERY_ERR; - } - } - /* -@@ -394,7 +394,7 @@ - if (!resp[i - 1].resp - || strcmp(token, resp[i - 1].resp)) { - _pam_delete(token); /* mistyped */ -- retval = PAM_AUTHTOK_RECOVER_ERR; -+ retval = PAM_AUTHTOK_RECOVERY_ERR; - _make_remark(pamh ,PAM_ERROR_MSG, MISTYPED_PASS); - } - } -@@ -413,7 +413,7 @@ - - } else { - retval = (retval == PAM_SUCCESS) -- ? PAM_AUTHTOK_RECOVER_ERR : retval; -+ ? PAM_AUTHTOK_RECOVERY_ERR : retval; - } - } - diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab index 6d73dad87b8..c7551e3dc02 100644 --- a/net/samba/patches/patch-ab +++ b/net/samba/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.23 2004/09/15 08:51:44 adam Exp $ +$NetBSD: patch-ab,v 1.24 2005/11/14 08:05:27 jlam Exp $ ---- script/installbin.sh.orig 2004-09-15 10:28:42.000000000 +0000 +--- script/installbin.sh.orig 2005-10-12 13:03:44.000000000 -0400 +++ script/installbin.sh -@@ -22,6 +22,7 @@ for p in $*; do +@@ -22,11 +22,12 @@ for p in $*; do fi cp $p $BINDIR/ chmod $INSTALLPERMS $BINDIR/$p2 @@ -10,3 +10,9 @@ $NetBSD: patch-ab,v 1.23 2004/09/15 08:51:44 adam Exp $ # this is a special case, mount needs this in a specific location if [ $p2 = smbmount ]; then + if [ ! -d $DESTDIR/sbin ]; then +- mkdir $DESTDIR/sbin ++ mkdir -p $DESTDIR/sbin + fi + ln -sf $BINDIR/$p2 $DESTDIR/sbin/mount.smbfs + fi diff --git a/net/samba/patches/patch-ac b/net/samba/patches/patch-ac index 8cefa5799dd..7c76474752a 100644 --- a/net/samba/patches/patch-ac +++ b/net/samba/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.12 2004/01/11 02:26:31 jlam Exp $ +$NetBSD: patch-ac,v 1.13 2005/11/14 08:05:27 jlam Exp $ ---- include/local.h.orig Fri Nov 7 12:37:33 2003 +--- include/local.h.orig 2005-10-12 13:03:38.000000000 -0400 +++ include/local.h @@ -170,10 +170,10 @@ * Default passwd chat script. diff --git a/net/samba/patches/patch-ad b/net/samba/patches/patch-ad index afe6f795ad1..fa4c81223bd 100644 --- a/net/samba/patches/patch-ad +++ b/net/samba/patches/patch-ad @@ -1,55 +1,13 @@ -$NetBSD: patch-ad,v 1.15 2004/12/17 18:55:47 tron Exp $ +$NetBSD: patch-ad,v 1.16 2005/11/14 08:05:27 jlam Exp $ ---- lib/util_getent.c.orig Fri Feb 13 11:02:10 2004 +--- lib/util_getent.c.orig 2005-10-12 13:03:30.000000000 -0400 +++ 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 GECOS_BUFLEN 1024 -+ char *bp, *gecos, *p, buf[GECOS_BUFLEN]; -+ int buflen; -+#endif - - pent = SMB_MALLOC_P(struct sys_pwent); - if (pent == NULL) { -@@ -156,9 +161,38 @@ struct sys_pwent * getpwent_list(void) +@@ -156,7 +156,7 @@ 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; -+ -+ /* copy gecos, interpolating & to be full name */ -+ for (p = gecos; *p != '\0'; p++) { -+ if (bp >= &buf[GECOS_BUFLEN - 1]) -+ /* buffer overflow */ -+ goto gecos_done; -+ if (*p == '&') { -+ /* interpolate full name */ -+ snprintf(bp, GECOS_BUFLEN - (bp - buf), -+ "%s", pwd->pw_name); -+ *bp = toupper(*bp); -+ bp += strlen(bp); -+ } else { -+ *bp++ = *p; -+ } -+ } -+ *bp = '\0'; -+ if ((pent->pw_gecos = SMB_STRDUP(buf)) == NULL) -+ goto err; -+#else - if ((pent->pw_gecos = SMB_STRDUP(pwd->pw_gecos)) == NULL) +- if ((pent->pw_gecos = SMB_STRDUP(pwd->pw_gecos)) == NULL) ++ if ((pent->pw_gecos = passwd_expand_gecos(pwd)) == NULL) goto err; -+#endif } -+#ifdef BSD -+ gecos_done: -+#endif if (pwd->pw_dir) { - if ((pent->pw_dir = SMB_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..3e648262f79 --- /dev/null +++ b/net/samba/patches/patch-ae @@ -0,0 +1,15 @@ +$NetBSD: patch-ae,v 1.8 2005/11/14 08:05:27 jlam Exp $ + +--- auth/pampass.c.orig 2005-10-12 13:03:28.000000000 -0400 ++++ auth/pampass.c +@@ -43,6 +43,10 @@ + + #include <security/pam_appl.h> + ++#ifndef 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/samba/patches/patch-af b/net/samba/patches/patch-af index f383a9cebaa..5b84820afb5 100644 --- a/net/samba/patches/patch-af +++ b/net/samba/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.6 2004/09/14 17:18:06 jlam Exp $ +$NetBSD: patch-af,v 1.7 2005/11/14 08:05:27 jlam Exp $ ---- ../examples/smb.conf.default.orig Thu Jul 8 13:06:16 2004 +--- ../examples/smb.conf.default.orig 2005-10-12 13:03:50.000000000 -0400 +++ ../examples/smb.conf.default @@ -26,7 +26,7 @@ workgroup = MYGROUP @@ -42,12 +42,25 @@ $NetBSD: patch-af,v 1.6 2004/09/14 17:18:06 jlam Exp $ # These scripts are used on a domain controller or stand-alone # machine to add or delete corresponding unix accounts -@@ -191,7 +191,7 @@ +@@ -189,14 +189,14 @@ + + # NOTE: If you have a BSD-style print system there is no need to # specifically define each individual printer - [printers] - comment = All Printers +-[printers] +- comment = All Printers - path = /usr/spool/samba -+ path = /var/tmp - browseable = no +- browseable = no ++;[printers] ++; comment = All Printers ++; path = /var/tmp ++; browseable = no # Set public = yes to allow user 'guest account' to print - guest ok = no +- 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/samba/patches/patch-ag b/net/samba/patches/patch-ag index 87f45a5961b..ccf5d3d57d7 100644 --- a/net/samba/patches/patch-ag +++ b/net/samba/patches/patch-ag @@ -1,54 +1,23 @@ -$NetBSD: patch-ag,v 1.4 2004/11/13 21:48:11 kim Exp $ +$NetBSD: patch-ag,v 1.5 2005/11/14 08:05:27 jlam Exp $ ---- passdb/passdb.c.orig 2004-08-19 09:39:13.000000000 -0400 -+++ passdb/passdb.c 2004-10-28 00:22:15.000000000 -0400 -@@ -246,6 +246,11 @@ +--- passdb/passdb.c.orig 2005-10-12 13:03:35.000000000 -0400 ++++ passdb/passdb.c +@@ -246,6 +246,7 @@ static NTSTATUS pdb_set_sam_sids(SAM_ACC NTSTATUS pdb_fill_sam_pw(SAM_ACCOUNT *sam_account, const struct passwd *pwd) { NTSTATUS ret; -+#ifdef BSD -+# define BUFLEN 1024 -+ char *bp, *gecos, *p, buf[BUFLEN]; -+ int buflen; -+#endif ++ char *gecos; if (!pwd) { return NT_STATUS_UNSUCCESSFUL; -@@ -254,7 +259,37 @@ +@@ -254,7 +255,9 @@ NTSTATUS pdb_fill_sam_pw(SAM_ACCOUNT *sa pdb_fill_default_sam(sam_account); pdb_set_username(sam_account, pwd->pw_name, PDB_SET); -+ -+#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 */ -+ gecos = pwd->pw_name; -+ 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'; -+ gecos = buf; -+ -+ gecos_done: +- pdb_set_fullname(sam_account, pwd->pw_gecos, PDB_SET); ++ gecos = passwd_expand_gecos(pwd); + pdb_set_fullname(sam_account, gecos, PDB_SET); -+#else - pdb_set_fullname(sam_account, pwd->pw_gecos, PDB_SET); -+#endif ++ SAFE_FREE(gecos); pdb_set_unix_homedir(sam_account, pwd->pw_dir, PDB_SET); diff --git a/net/samba/patches/patch-ah b/net/samba/patches/patch-ah new file mode 100644 index 00000000000..6698a580c61 --- /dev/null +++ b/net/samba/patches/patch-ah @@ -0,0 +1,16 @@ +$NetBSD: patch-ah,v 1.3 2005/11/14 08:05:27 jlam Exp $ + +--- lib/pam_errors.c.orig 2005-10-12 13:03:29.000000000 -0400 ++++ lib/pam_errors.c +@@ -23,9 +23,9 @@ + #ifdef WITH_PAM + #include <security/pam_appl.h> + +-#if defined(PAM_AUTHTOK_RECOVERY_ERR) && !defined(PAM_AUTHTOK_RECOVER_ERR) ++#ifndef PAM_AUTHTOK_RECOVER_ERR + #define PAM_AUTHTOK_RECOVER_ERR PAM_AUTHTOK_RECOVERY_ERR +-#endif ++#endif + + /* PAM -> NT_STATUS map */ + static const struct { diff --git a/net/samba/patches/patch-ai b/net/samba/patches/patch-ai new file mode 100644 index 00000000000..f258af2c40d --- /dev/null +++ b/net/samba/patches/patch-ai @@ -0,0 +1,23 @@ +$NetBSD: patch-ai,v 1.3 2005/11/14 08:05:27 jlam Exp $ + +--- nsswitch/pam_winbind.h.orig 2005-10-12 13:03:29.000000000 -0400 ++++ nsswitch/pam_winbind.h +@@ -25,18 +25,12 @@ + #define PAM_SM_ACCOUNT + #define PAM_SM_PASSWORD + +-#if defined(SUNOS5) || defined(SUNOS4) || defined(HPUX) || defined(FREEBSD) +- +-/* Solaris always uses dynamic pam modules */ +-#define PAM_EXTERN extern + #include <security/pam_appl.h> + + #ifndef PAM_AUTHTOK_RECOVER_ERR + #define PAM_AUTHTOK_RECOVER_ERR PAM_AUTHTOK_RECOVERY_ERR + #endif + +-#endif +- + #ifdef HAVE_SECURITY_PAM_MODULES_H + #include <security/pam_modules.h> + #endif diff --git a/net/samba/patches/patch-aj b/net/samba/patches/patch-aj new file mode 100644 index 00000000000..a3c6a22dfc6 --- /dev/null +++ b/net/samba/patches/patch-aj @@ -0,0 +1,16 @@ +$NetBSD: patch-aj,v 1.3 2005/11/14 08:05:27 jlam Exp $ + +--- nsswitch/pam_winbind.c.orig 2005-10-12 13:03:29.000000000 -0400 ++++ nsswitch/pam_winbind.c +@@ -11,6 +11,11 @@ + + #include "pam_winbind.h" + ++/* Solaris PAM doens't define PAM_EXTERN. */ ++#ifndef PAM_EXTERN ++#define PAM_EXTERN extern ++#endif ++ + /* data tokens */ + + #define MAX_PASSWD_TRIES 3 diff --git a/net/samba/patches/patch-ak b/net/samba/patches/patch-ak new file mode 100644 index 00000000000..314f6e31937 --- /dev/null +++ b/net/samba/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.4 2005/11/14 08:05:27 jlam Exp $ + +--- pam_smbpass/general.h.orig 2005-10-12 13:03:29.000000000 -0400 ++++ pam_smbpass/general.h +@@ -1,8 +1,4 @@ +-#ifndef LINUX +-/* This is only needed by modules in the Sun implementation. */ + #include <security/pam_appl.h> +-#endif /* LINUX */ +- + #include <security/pam_modules.h> + + #ifndef PAM_AUTHTOK_RECOVER_ERR diff --git a/net/samba/patches/patch-al b/net/samba/patches/patch-al new file mode 100644 index 00000000000..288aac8f306 --- /dev/null +++ b/net/samba/patches/patch-al @@ -0,0 +1,22 @@ +$NetBSD: patch-al,v 1.4 2005/11/14 08:05:27 jlam Exp $ + +--- sam/idmap_ad.c.orig 2005-10-12 13:03:37.000000000 -0400 ++++ sam/idmap_ad.c +@@ -40,8 +40,6 @@ + + #define WINBIND_CCACHE_NAME "MEMORY:winbind_ccache" + +-NTSTATUS init_module(void); +- + static ADS_STRUCT *ad_idmap_ads = NULL; + static char *ad_idmap_uri = NULL; + +@@ -400,7 +398,7 @@ static struct idmap_methods ad_methods = + + + /* support for new authentication subsystem */ +-NTSTATUS init_module(void) ++NTSTATUS idmap_ad_init(void) + { + return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "ad", &ad_methods); + } diff --git a/net/samba/patches/patch-am b/net/samba/patches/patch-am new file mode 100644 index 00000000000..0fbe01fcf9c --- /dev/null +++ b/net/samba/patches/patch-am @@ -0,0 +1,22 @@ +$NetBSD: patch-am,v 1.5 2005/11/14 08:05:27 jlam Exp $ + +--- sam/idmap_rid.c.orig 2005-10-12 13:03:38.000000000 -0400 ++++ sam/idmap_rid.c +@@ -24,8 +24,6 @@ + #undef DBGC_CLASS + #define DBGC_CLASS DBGC_IDMAP + +-NTSTATUS init_module(void); +- + struct dom_entry { + fstring name; + fstring sid; +@@ -548,7 +546,7 @@ static struct idmap_methods rid_methods + rid_idmap_status + }; + +-NTSTATUS init_module(void) ++NTSTATUS idmap_rid_init(void) + { + return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "idmap_rid", &rid_methods); + return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "rid", &rid_methods); diff --git a/net/samba/patches/patch-at b/net/samba/patches/patch-at index 10f66df6c50..33ed6cc7c49 100644 --- a/net/samba/patches/patch-at +++ b/net/samba/patches/patch-at @@ -1,26 +1,178 @@ -$NetBSD: patch-at,v 1.2 2005/06/08 20:15:20 jlam Exp $ +$NetBSD: patch-at,v 1.3 2005/11/14 08:05:27 jlam Exp $ ---- configure.orig 2005-04-14 02:23:50.000000000 -0400 +--- configure.orig 2005-10-12 22:20:04.000000000 -0400 +++ configure -@@ -4794,7 +4794,7 @@ cat >>confdefs.h <<\_ACEOF - _ACEOF +@@ -310,7 +310,7 @@ ac_includes_default="\ + # include <unistd.h> + #endif" - ;; -- *freebsd*|*DragonFly*) -+ *freebsd*|*dragonfly*) +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configdir lockdir piddir logfilebase privatedir swatdir LDSHFLAGS SONAMEFLAG SHLD HOST_OS PICFLAGS PICSUFFIX libc_cv_fpie PIE_CFLAGS PIE_LDFLAGS SHLIBEXT INSTALLCLIENT INSTALLCLIENTCMD_SH INSTALLCLIENTCMD_A LIBSMBCLIENT_SHARED LIBSMBCLIENT LIBSMBSHAREMODES_SHARED LIBSMBSHAREMODES PRINT_LIBS AUTH_LIBS ACL_LIBS PASSDB_LIBS IDMAP_LIBS KRB5_LIBS LDAP_LIBS SHLIB_PROGS SMBWRAPPER SMBWRAP_OBJS SMBWRAP_INC EXTRA_BIN_PROGS EXTRA_SBIN_PROGS EXTRA_ALL_TARGETS SOCKWRAP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK PERL AR ac_ct_AR BROKEN_CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os EGREP CUPS_CONFIG LIBOBJS TERMLIBS TERMLDFLAGS ROFF DYNEXP SMBLDAP SMBLDAPUTIL KRB5CONFIG XML2_CONFIG XML_CFLAGS XML_LIBS MYSQL_CONFIG MYSQL_CFLAGS MYSQL_LIBS PGSQL_CONFIG PGSQL_CFLAGS PGSQL_LIBS WINBIND_NSS WINBIND_WINS_NSS WINBIND_NSS_LDSHFLAGS WINBIND_NSS_EXTRA_OBJS WINBIND_NSS_EXTRA_LIBS BUILD_POPT POPTLIBS FLAGS1 PYTHON PDB_STATIC PDB_MODULES RPC_STATIC RPC_MODULES IDMAP_STATIC IDMAP_MODULES CHARSET_STATIC CHARSET_MODULES AUTH_STATIC AUTH_MODULES VFS_STATIC VFS_MODULES builddir LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configdir lockdir statedir piddir logfilebase privatedir swatdir LDSHFLAGS SONAMEFLAG SHLD HOST_OS PICFLAGS PICSUFFIX libc_cv_fpie PIE_CFLAGS PIE_LDFLAGS SHLIBEXT INSTALLCLIENT INSTALLCLIENTCMD_SH INSTALLCLIENTCMD_A LIBSMBCLIENT_SHARED LIBSMBCLIENT LIBSMBSHAREMODES_SHARED LIBSMBSHAREMODES PRINT_LIBS AUTH_LIBS ACL_LIBS PASSDB_LIBS IDMAP_LIBS KRB5_LIBS LDAP_LIBS SHLIB_PROGS SMBWRAPPER SMBWRAP_OBJS SMBWRAP_INC EXTRA_BIN_PROGS EXTRA_SBIN_PROGS EXTRA_ALL_TARGETS SOCKWRAP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK PERL AR ac_ct_AR BROKEN_CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os EGREP CUPS_CONFIG LIBOBJS TERMLIBS TERMLDFLAGS ROFF DYNEXP SMBLDAP SMBLDAPUTIL KRB5CONFIG XML2_CONFIG XML_CFLAGS XML_LIBS MYSQL_CONFIG MYSQL_CFLAGS MYSQL_LIBS PGSQL_CONFIG PGSQL_CFLAGS PGSQL_LIBS WINBIND_NSS WINBIND_WINS_NSS WINBIND_NSS_LDSHFLAGS WINBIND_NSS_EXTRA_OBJS WINBIND_NSS_EXTRA_LIBS BUILD_POPT POPTLIBS FLAGS1 PYTHON PDB_STATIC PDB_MODULES RPC_STATIC RPC_MODULES IDMAP_STATIC IDMAP_MODULES CHARSET_STATIC CHARSET_MODULES AUTH_STATIC AUTH_MODULES VFS_STATIC VFS_MODULES builddir LTLIBOBJS' + ac_subst_files='' - cat >>confdefs.h <<\_ACEOF - #define FREEBSD 1 -@@ -22517,7 +22517,7 @@ cat >>confdefs.h <<\_ACEOF - _ACEOF + # Initialize some variables set by options. +@@ -863,6 +863,7 @@ Optional Packages: + --with-fhs Use FHS-compliant paths (default=no) + --with-privatedir=DIR Where to put smbpasswd ($ac_default_prefix/private) + --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) + --with-configdir=DIR Where to put configuration files ($libdir) +@@ -1424,6 +1425,7 @@ fi + + + lockdir="\${VARDIR}/locks" ++statedir="\${VARDIR}/locks" + piddir="\${VARDIR}/locks" + mandir="\${prefix}/man" + logfilebase="\${VARDIR}" +@@ -1438,7 +1440,8 @@ if test "${with_fhs+set}" = set; then + withval="$with_fhs" + case "$withval" in + yes) +- lockdir="\${VARDIR}/lib/samba" ++ lockdir="\${VARDIR}/run/samba" ++ statedir="\${VARDIR}/lib/samba" + piddir="\${VARDIR}/run" + mandir="\${prefix}/share/man" + logfilebase="\${VARDIR}/log/samba" +@@ -1491,6 +1494,26 @@ echo "$as_me: WARNING: --with-lockdir ca + fi; + + ################################################# ++# set state directory location ++ ++# Check whether --with-statedir or --without-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 ++ # ++ { echo "$as_me:$LINENO: WARNING: --with-statedir called without argument - will use default" >&5 ++echo "$as_me: WARNING: --with-statedir called without argument - will use default" >&2;} ++ ;; ++ * ) ++ statedir="$withval" ++ ;; ++ esac ++fi; ++ ++################################################# + # set pid directory location - ;; -- *netbsd* | *freebsd* | *DragonFly* ) -+ *netbsd* | *freebsd* | *dragonfly* ) - BLDSHARED="true" - LDSHFLAGS="-shared" - DYNEXP="-Wl,--export-dynamic" -@@ -29701,9 +29701,9 @@ LIBS="-lcrypto $KRB5_LIBS $LIBS" + # Check whether --with-piddir or --without-piddir was given. +@@ -16912,6 +16935,107 @@ done + + + ++for ac_func in getpwent_r ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_var+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. ++ For example, HP-UX 11i <limits.h> declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ ++#undef $ac_func ++ ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++{ ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++choke me ++#else ++char (*f) () = $ac_func; ++#endif ++#ifdef __cplusplus ++} ++#endif ++ ++int ++main () ++{ ++return f != $ac_func; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++eval "$as_ac_var=no" ++fi ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++done ++ + for ac_func in syslog vsyslog timegm + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +@@ -31314,9 +31438,9 @@ LIBS="-lcrypto $KRB5_LIBS $LIBS" @@ -33,7 +185,7 @@ $NetBSD: patch-at,v 1.2 2005/06/08 20:15:20 jlam Exp $ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -@@ -29719,11 +29719,11 @@ extern "C" +@@ -31332,11 +31456,11 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ @@ -47,7 +199,7 @@ $NetBSD: patch-at,v 1.2 2005/06/08 20:15:20 jlam Exp $ ; return 0; } -@@ -29750,22 +29750,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -31363,22 +31487,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -75,12 +227,56 @@ $NetBSD: patch-at,v 1.2 2005/06/08 20:15:20 jlam Exp $ cat >>confdefs.h <<_ACEOF #define HAVE_DES_SET_KEY 1 _ACEOF -@@ -38099,7 +38099,7 @@ echo "${ECHO_T}no" >&6; - fi - - ;; -- *freebsd* | *DragonFly* ) -+ *freebsd* | *dragonfly* ) - echo "$as_me:$LINENO: checking for freebsd sendfile support" >&5 - echo $ECHO_N "checking for freebsd sendfile support... $ECHO_C" >&6 - if test "${samba_cv_HAVE_SENDFILE+set}" = set; then +@@ -41304,13 +41428,37 @@ case "$host_os" in + *linux*) + WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o" + ;; +- *freebsd[5-9]*) +- # FreeBSD winbind client is implemented as a wrapper around +- # the Linux version. +- 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" ++ *freebsd*) ++ case "$UNAME_R" in ++ [5-9]*) ++ # FreeBSD winbind client is implemented as a wrapper ++ # around the Linux version. ++ 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" ++ ;; ++ 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 +@@ -44539,6 +44687,7 @@ s,@ECHO_T@,$ECHO_T,;t t + s,@LIBS@,$LIBS,;t t + s,@configdir@,$configdir,;t t + s,@lockdir@,$lockdir,;t t ++s,@statedir@,$statedir,;t t + s,@piddir@,$piddir,;t t + s,@logfilebase@,$logfilebase,;t t + s,@privatedir@,$privatedir,;t t diff --git a/net/samba/patches/patch-au b/net/samba/patches/patch-au index 5a1ec470288..b1aac7769dc 100644 --- a/net/samba/patches/patch-au +++ b/net/samba/patches/patch-au @@ -1,26 +1,65 @@ -$NetBSD: patch-au,v 1.2 2005/06/08 20:15:20 jlam Exp $ +$NetBSD: patch-au,v 1.3 2005/11/14 08:05:27 jlam Exp $ ---- configure.in.orig 2005-04-14 02:14:26.000000000 -0400 +--- configure.in.orig 2005-10-12 13:03:39.000000000 -0400 +++ configure.in -@@ -533,7 +533,7 @@ case "$host_os" in - *irix*) - AC_DEFINE(SYSV, 1, [Whether to enable System V compatibility]) - ;; -- *freebsd*|*DragonFly*) -+ *freebsd*|*dragonfly*) - AC_DEFINE(FREEBSD, 1, [Whether the host os is FreeBSD]) - ;; - # -@@ -1223,7 +1223,7 @@ if test "$enable_shared" = "yes"; then - AC_DEFINE(STAT_ST_BLOCKSIZE,512) - AC_DEFINE(BROKEN_GETGRNAM,1,[Does getgrnam work correctly]) - ;; -- *netbsd* | *freebsd* | *DragonFly* ) -+ *netbsd* | *freebsd* | *dragonfly* ) - BLDSHARED="true" - LDSHFLAGS="-shared" - DYNEXP="-Wl,--export-dynamic" -@@ -2788,7 +2788,7 @@ if test x"$with_ads_support" != x"no"; t +@@ -23,6 +23,7 @@ fi + AC_PREFIX_DEFAULT(/usr/local/samba) + + lockdir="\${VARDIR}/locks" ++statedir="\${VARDIR}/locks" + piddir="\${VARDIR}/locks" + mandir="\${prefix}/man" + logfilebase="\${VARDIR}" +@@ -35,7 +36,8 @@ AC_ARG_WITH(fhs, + [ --with-fhs Use FHS-compliant paths (default=no)], + [ case "$withval" in + yes) +- lockdir="\${VARDIR}/lib/samba" ++ lockdir="\${VARDIR}/run/samba" ++ statedir="\${VARDIR}/lib/samba" + piddir="\${VARDIR}/run" + mandir="\${prefix}/share/man" + logfilebase="\${VARDIR}/log/samba" +@@ -79,6 +81,22 @@ AC_ARG_WITH(lockdir, + esac]) + + ################################################# ++# set state directory location ++AC_ARG_WITH(statedir, ++[ --with-statedir=DIR Where to put state files ($ac_default_prefix/var/locks)], ++[ case "$withval" in ++ yes|no) ++ # ++ # Just in case anybody calls it without argument ++ # ++ AC_MSG_WARN([--with-statedir called without argument - will use default]) ++ ;; ++ * ) ++ statedir="$withval" ++ ;; ++ esac]) ++ ++################################################# + # set pid directory location + AC_ARG_WITH(piddir, + [ --with-piddir=DIR Where to put pid files ($ac_default_prefix/var/locks)], +@@ -195,6 +213,7 @@ done + + AC_SUBST(configdir) + AC_SUBST(lockdir) ++AC_SUBST(statedir) + AC_SUBST(piddir) + AC_SUBST(logfilebase) + AC_SUBST(privatedir) +@@ -1134,6 +1153,7 @@ AC_CHECK_FUNCS(setpriv setgidx setuidx s + AC_CHECK_FUNCS(lstat64 fopen64 atexit grantpt dup2 lseek64 ftruncate64) + AC_CHECK_FUNCS(fseek64 fseeko64 ftell64 ftello64 setluid getpwanam setlinebuf) + AC_CHECK_FUNCS(opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64) ++AC_CHECK_FUNCS(getpwent_r) + AC_CHECK_FUNCS(srandom random srand rand setenv usleep strcasecmp fcvt fcvtl symlink readlink) + AC_CHECK_FUNCS(syslog vsyslog timegm) + AC_CHECK_FUNCS(setlocale nl_langinfo) +@@ -2996,7 +3016,7 @@ if test x"$with_ads_support" != x"no"; t AC_CHECK_LIB_EXT(k5crypto, KRB5_LIBS, krb5_encrypt_data) # Heimdal checks. @@ -29,12 +68,48 @@ $NetBSD: patch-au,v 1.2 2005/06/08 20:15:20 jlam Exp $ AC_CHECK_LIB_EXT(asn1, KRB5_LIBS, copy_Authenticator) AC_CHECK_LIB_EXT(roken, KRB5_LIBS, roken_getaddrinfo_hostspec) -@@ -4108,7 +4108,7 @@ samba_cv_HAVE_BROKEN_LINUX_SENDFILE=yes, - fi - - ;; -- *freebsd* | *DragonFly* ) -+ *freebsd* | *dragonfly* ) - AC_CACHE_CHECK([for freebsd sendfile support],samba_cv_HAVE_SENDFILE,[ - AC_TRY_LINK([\ - #include <sys/types.h> +@@ -4710,13 +4730,37 @@ case "$host_os" in + *linux*) + WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o" + ;; +- *freebsd[[5-9]]*) +- # FreeBSD winbind client is implemented as a wrapper around +- # the Linux version. +- 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" ++ *freebsd*) ++ case "$UNAME_R" in ++ [5-9]*) ++ # FreeBSD winbind client is implemented as a wrapper ++ # around the Linux version. ++ 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" ++ ;; ++ 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/samba/patches/patch-av b/net/samba/patches/patch-av new file mode 100644 index 00000000000..a287e5d19c0 --- /dev/null +++ b/net/samba/patches/patch-av @@ -0,0 +1,13 @@ +$NetBSD: patch-av,v 1.1 2005/11/14 08:05:27 jlam Exp $ + +--- script/installman.sh.orig 2005-10-12 13:03:44.000000000 -0400 ++++ script/installman.sh +@@ -29,7 +29,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/samba/patches/patch-aw b/net/samba/patches/patch-aw new file mode 100644 index 00000000000..d3197be09e6 --- /dev/null +++ b/net/samba/patches/patch-aw @@ -0,0 +1,13 @@ +$NetBSD: patch-aw,v 1.1 2005/11/14 08:05:27 jlam Exp $ + +--- script/installmodules.sh.orig 2005-10-12 13:03:44.000000000 -0400 ++++ script/installmodules.sh +@@ -9,7 +9,7 @@ shift + + for d in $BASEDIR $LIBDIR; 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-ax b/net/samba/patches/patch-ax new file mode 100644 index 00000000000..b330fc609ef --- /dev/null +++ b/net/samba/patches/patch-ax @@ -0,0 +1,13 @@ +$NetBSD: patch-ax,v 1.1 2005/11/14 08:05:27 jlam Exp $ + +--- script/installscripts.sh.orig 2005-10-12 13:03:44.000000000 -0400 ++++ 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/samba/patches/patch-ay b/net/samba/patches/patch-ay new file mode 100644 index 00000000000..186955dc805 --- /dev/null +++ b/net/samba/patches/patch-ay @@ -0,0 +1,31 @@ +$NetBSD: patch-ay,v 1.1 2005/11/14 08:05:27 jlam Exp $ + +--- script/installswat.sh.orig 2005-10-12 13:03:44.000000000 -0400 ++++ script/installswat.sh +@@ -84,7 +84,7 @@ if [ -d $SRCDIR../docs/htmldocs/ ]; then + + INSTALLDIR=$SWATDIR/help/`echo $dir | sed 's/htmldocs\///g'` + if [ ! -d $INSTALLDIR ]; then +- mkdir $INSTALLDIR ++ mkdir -p $INSTALLDIR + fi + + for f in $SRCDIR../docs/$dir/*.html; do +@@ -96,7 +96,7 @@ if [ -d $SRCDIR../docs/htmldocs/ ]; then + + if [ -d $SRCDIR../docs/$dir/images/ ]; then + if [ ! -d $INSTALLDIR/images/ ]; then +- mkdir $INSTALLDIR/images ++ mkdir -p $INSTALLDIR/images + if [ ! -d $INSTALLDIR/images/ ]; then + echo Failed to make directory $SWATDIR/help/images, does $USER have privileges? + exit 1 +@@ -120,7 +120,7 @@ if [ "x$BOOKDIR" != "x" -a -f $SRCDIR../ + + for d in $BOOKDIR $BOOKDIR/figs ; 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-ba b/net/samba/patches/patch-ba new file mode 100644 index 00000000000..1d1eb511f40 --- /dev/null +++ b/net/samba/patches/patch-ba @@ -0,0 +1,86 @@ +$NetBSD: patch-ba,v 1.1 2005/11/14 08:05:27 jlam Exp $ + +--- Makefile.in.orig 2005-10-12 13:03:23.000000000 -0400 ++++ Makefile.in +@@ -90,6 +90,9 @@ SWATDIR = @swatdir@ + # the directory where lock files go + LOCKDIR = @lockdir@ + ++# the directory where persistent-state files go ++STATEDIR = @statedir@ ++ + # the directory where pid files go + PIDDIR = @piddir@ + +@@ -113,7 +116,7 @@ PASSWD_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB + PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DSBINDIR=\"$(SBINDIR)\" + PATH_FLAGS2 = $(PATH_FLAGS1) -DBINDIR=\"$(BINDIR)\" -DDRIVERFILE=\"$(DRIVERFILE)\" + PATH_FLAGS3 = $(PATH_FLAGS2) -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" +-PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\" ++PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DSTATEDIR=\"$(STATEDIR)\" -DPIDDIR=\"$(PIDDIR)\" + PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" \ + -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"@SHLIBEXT@\" + PATH_FLAGS6 = $(PATH_FLAGS5) -DCONFIGDIR=\"$(CONFIGDIR)\" +@@ -908,7 +911,7 @@ bin/pdbedit@EXEEXT@: $(PDBEDIT_OBJ) @BUI + + bin/smbget@EXEEXT@: $(SMBGET_OBJ) @BUILD_POPT@ bin/.dummy + @echo Linking $@ +- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) ++ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) + + bin/samtest@EXEEXT@: $(SAMTEST_OBJ) @BUILD_POPT@ bin/.dummy + @echo Linking $@ +@@ -936,11 +939,11 @@ bin/msgtest@EXEEXT@: $(MSGTEST_OBJ) bin/ + + bin/smbcacls@EXEEXT@: $(SMBCACLS_OBJ) @BUILD_POPT@ bin/.dummy + @echo Linking $@ +- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCACLS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) ++ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCACLS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) + + bin/smbcquotas@EXEEXT@: $(SMBCQUOTAS_OBJ) @BUILD_POPT@ bin/.dummy + @echo Linking $@ +- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) ++ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) + + bin/locktest@EXEEXT@: $(LOCKTEST_OBJ) bin/.dummy + @echo Linking $@ +@@ -995,7 +998,7 @@ bin/smbwrapper.@SHLIBEXT@: $(PICOBJS) bi + bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS) + @echo Linking libsmbclient shared library $@ + @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \ +- $(KRB5LIBS) $(LDAP_LIBS) \ ++ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \ + @SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR) + + bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS) +@@ -1275,11 +1278,11 @@ bin/ntlm_auth@EXEEXT@: $(NTLM_AUTH_OBJ) + @echo Linking $@ + @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP) $(NTLM_AUTH_OBJ) \ + $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBS) \ +- @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) ++ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) + + bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_PICOOBJ) + @echo "Linking shared library $@" +- @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) $(LIBS) -lc $(LDAP_LIBS) $(KRB5LIBS) ++ @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) $(LIBS) -lc $(LDAP_LIBS) $(KRB5LIBS) $(PASSDB_LIBS) + + bin/libmsrpc.a: $(LIBMSRPC_PICOBJ) + @-$(AR) -rc $@ $(LIBMSRPC_PICOBJ) +@@ -1325,7 +1328,7 @@ install-everything: install installmodul + # is not used + + installdirs: +- @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(PRIVATEDIR) $(DESTDIR)$(PIDDIR) $(DESTDIR)$(LOCKDIR) $(DESTDIR)$(MANDIR) ++ @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(PRIVATEDIR) $(DESTDIR)$(PIDDIR) $(DESTDIR)$(LOCKDIR) $(DESTDIR)$(STATEDIR) $(DESTDIR)$(MANDIR) + + installservers: all installdirs + @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(SBIN_PROGS) +@@ -1421,6 +1424,7 @@ showlayout: + @echo " privatedir: $(PRIVATE_DIR)" + @echo " configdir: $(CONFIGDIR)" + @echo " lockdir: $(LOCKDIR)" ++ @echo " statedir: $(STATEDIR)" + @echo " piddir: $(PIDDIR)" + @echo " swatdir: $(SWATDIR)" + diff --git a/net/samba/patches/patch-bb b/net/samba/patches/patch-bb new file mode 100644 index 00000000000..0d8d2fc0641 --- /dev/null +++ b/net/samba/patches/patch-bb @@ -0,0 +1,13 @@ +$NetBSD: patch-bb,v 1.1 2005/11/14 08:05:27 jlam Exp $ + +--- groupdb/mapping.c.orig 2005-10-12 13:03:29.000000000 -0400 ++++ groupdb/mapping.c +@@ -129,7 +129,7 @@ static BOOL init_group_mapping(void) + + if (tdb) + return True; +- tdb = tdb_open_log(lock_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); ++ tdb = tdb_open_log(state_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); + if (!tdb) { + DEBUG(0,("Failed to open group mapping database\n")); + return False; diff --git a/net/samba/patches/patch-bc b/net/samba/patches/patch-bc new file mode 100644 index 00000000000..f8ebfbc1d95 --- /dev/null +++ b/net/samba/patches/patch-bc @@ -0,0 +1,13 @@ +$NetBSD: patch-bc,v 1.1 2005/11/14 08:05:27 jlam Exp $ + +--- intl/lang_tdb.c.orig 2005-10-12 13:03:31.000000000 -0400 ++++ intl/lang_tdb.c +@@ -136,7 +136,7 @@ BOOL lang_tdb_init(const char *lang) + goto done; + } + +- asprintf(&path, "%s%s.tdb", lock_path("lang_"), lang); ++ asprintf(&path, "%s%s.tdb", state_path("lang_"), lang); + + DEBUG(10, ("lang_tdb_init: loading %s\n", path)); + diff --git a/net/samba/patches/patch-bd b/net/samba/patches/patch-bd new file mode 100644 index 00000000000..d56cfc8c8b2 --- /dev/null +++ b/net/samba/patches/patch-bd @@ -0,0 +1,13 @@ +$NetBSD: patch-bd,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- lib/account_pol.c.orig 2005-10-12 13:03:31.000000000 -0400 ++++ lib/account_pol.c +@@ -47,7 +47,7 @@ BOOL init_account_policy(void) + + if (tdb) + return True; +- tdb = tdb_open_log(lock_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); ++ tdb = tdb_open_log(state_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); + if (!tdb) { + DEBUG(0,("Failed to open account policy database\n")); + return False; diff --git a/net/samba/patches/patch-be b/net/samba/patches/patch-be new file mode 100644 index 00000000000..4002f2358f4 --- /dev/null +++ b/net/samba/patches/patch-be @@ -0,0 +1,22 @@ +$NetBSD: patch-be,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- nmbd/nmbd_winsserver.c.orig 2005-10-12 13:03:37.000000000 -0400 ++++ nmbd/nmbd_winsserver.c +@@ -234,7 +234,7 @@ BOOL initialise_wins(void) + + add_samba_names_to_subnet(wins_server_subnet); + +- if((fp = x_fopen(lock_path(WINS_LIST),O_RDONLY,0)) == NULL) { ++ if((fp = x_fopen(state_path(WINS_LIST),O_RDONLY,0)) == NULL) { + DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n", + WINS_LIST, strerror(errno) )); + return True; +@@ -1810,7 +1810,7 @@ void wins_write_database(BOOL background + } + } + +- slprintf(fname,sizeof(fname)-1,"%s/%s", lp_lockdir(), WINS_LIST); ++ pstrcpy(fname, state_path(WINS_LIST)); + all_string_sub(fname,"//", "/", 0); + slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid()); + diff --git a/net/samba/patches/patch-bf b/net/samba/patches/patch-bf new file mode 100644 index 00000000000..88a59ce7f53 --- /dev/null +++ b/net/samba/patches/patch-bf @@ -0,0 +1,13 @@ +$NetBSD: patch-bf,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- nsswitch/winbindd_util.c.orig 2005-10-12 13:03:28.000000000 -0400 ++++ nsswitch/winbindd_util.c +@@ -1159,7 +1159,7 @@ BOOL winbindd_upgrade_idmap(void) + SMB_STRUCT_STAT stbuf; + TDB_CONTEXT *idmap_tdb; + +- pstrcpy(idmap_name, lock_path("winbindd_idmap.tdb")); ++ pstrcpy(idmap_name, state_path("winbindd_idmap.tdb")); + + if (!file_exist(idmap_name, &stbuf)) { + /* nothing to convert return */ diff --git a/net/samba/patches/patch-bg b/net/samba/patches/patch-bg new file mode 100644 index 00000000000..2d90caf76e8 --- /dev/null +++ b/net/samba/patches/patch-bg @@ -0,0 +1,49 @@ +$NetBSD: patch-bg,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- printing/nt_printing.c.orig 2005-10-12 13:03:27.000000000 -0400 ++++ printing/nt_printing.c +@@ -342,8 +342,7 @@ static int sec_desc_upg_fn( TDB_CONTEXT + SEC_DESC *sec, *new_sec; + TALLOC_CTX *ctx = state; + int result, i; +- uint32 sd_size; +- size_t size_new_sec; ++ size_t sd_size, size_new_sec; + DOM_SID sid; + + if (!data.dptr || data.dsize == 0) +@@ -530,28 +529,28 @@ BOOL nt_printing_init(void) + + if (tdb_drivers) + tdb_close(tdb_drivers); +- tdb_drivers = tdb_open_log(lock_path("ntdrivers.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); ++ tdb_drivers = tdb_open_log(state_path("ntdrivers.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); + if (!tdb_drivers) { + DEBUG(0,("nt_printing_init: Failed to open nt drivers database %s (%s)\n", +- lock_path("ntdrivers.tdb"), strerror(errno) )); ++ state_path("ntdrivers.tdb"), strerror(errno) )); + return False; + } + + if (tdb_printers) + tdb_close(tdb_printers); +- tdb_printers = tdb_open_log(lock_path("ntprinters.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); ++ tdb_printers = tdb_open_log(state_path("ntprinters.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); + if (!tdb_printers) { + DEBUG(0,("nt_printing_init: Failed to open nt printers database %s (%s)\n", +- lock_path("ntprinters.tdb"), strerror(errno) )); ++ state_path("ntprinters.tdb"), strerror(errno) )); + return False; + } + + if (tdb_forms) + tdb_close(tdb_forms); +- tdb_forms = tdb_open_log(lock_path("ntforms.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); ++ tdb_forms = tdb_open_log(state_path("ntforms.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); + if (!tdb_forms) { + DEBUG(0,("nt_printing_init: Failed to open nt forms database %s (%s)\n", +- lock_path("ntforms.tdb"), strerror(errno) )); ++ state_path("ntforms.tdb"), strerror(errno) )); + return False; + } + diff --git a/net/samba/patches/patch-bh b/net/samba/patches/patch-bh new file mode 100644 index 00000000000..3cd313ac869 --- /dev/null +++ b/net/samba/patches/patch-bh @@ -0,0 +1,20 @@ +$NetBSD: patch-bh,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- registry/reg_db.c.orig 2005-10-12 13:03:45.000000000 -0400 ++++ registry/reg_db.c +@@ -198,12 +198,12 @@ BOOL init_registry_db( void ) + if ( tdb_reg ) + return True; + +- if ( !(tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600)) ) ++ if ( !(tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600)) ) + { +- tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); ++ tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); + if ( !tdb_reg ) { + DEBUG(0,("init_registry: Failed to open registry %s (%s)\n", +- lock_path("registry.tdb"), strerror(errno) )); ++ state_path("registry.tdb"), strerror(errno) )); + return False; + } + diff --git a/net/samba/patches/patch-bi b/net/samba/patches/patch-bi new file mode 100644 index 00000000000..146587b2492 --- /dev/null +++ b/net/samba/patches/patch-bi @@ -0,0 +1,17 @@ +$NetBSD: patch-bi,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- rpc_server/srv_srvsvc_nt.c.orig 2005-10-12 13:03:33.000000000 -0400 ++++ rpc_server/srv_srvsvc_nt.c +@@ -135,10 +135,10 @@ BOOL share_info_db_init(void) + + if (share_tdb && local_pid == sys_getpid()) + return True; +- share_tdb = tdb_open_log(lock_path("share_info.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); ++ share_tdb = tdb_open_log(state_path("share_info.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); + if (!share_tdb) { + DEBUG(0,("Failed to open share info database %s (%s)\n", +- lock_path("share_info.tdb"), strerror(errno) )); ++ state_path("share_info.tdb"), strerror(errno) )); + return False; + } + diff --git a/net/samba/patches/patch-bj b/net/samba/patches/patch-bj new file mode 100644 index 00000000000..e05e7392909 --- /dev/null +++ b/net/samba/patches/patch-bj @@ -0,0 +1,13 @@ +$NetBSD: patch-bj,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- sam/idmap_tdb.c.orig 2005-10-12 13:03:37.000000000 -0400 ++++ sam/idmap_tdb.c +@@ -487,7 +487,7 @@ static NTSTATUS db_idmap_init( char *par + BOOL tdb_is_new = False; + + /* use the old database if present */ +- tdbfile = SMB_STRDUP(lock_path("winbindd_idmap.tdb")); ++ tdbfile = SMB_STRDUP(state_path("winbindd_idmap.tdb")); + if (!tdbfile) { + DEBUG(0, ("idmap_init: out of memory!\n")); + return NT_STATUS_NO_MEMORY; diff --git a/net/samba/patches/patch-bk b/net/samba/patches/patch-bk new file mode 100644 index 00000000000..e22670c1157 --- /dev/null +++ b/net/samba/patches/patch-bk @@ -0,0 +1,13 @@ +$NetBSD: patch-bk,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- utils/net_idmap.c.orig 2005-10-12 13:03:42.000000000 -0400 ++++ utils/net_idmap.c +@@ -126,7 +126,7 @@ static NTSTATUS net_idmap_fixup_hwm(void + return NT_STATUS_UNSUCCESSFUL; + } + +- tdbfile = SMB_STRDUP(lock_path("winbindd_idmap.tdb")); ++ tdbfile = SMB_STRDUP(state_path("winbindd_idmap.tdb")); + if (!tdbfile) { + DEBUG(0, ("idmap_init: out of memory!\n")); + return NT_STATUS_NO_MEMORY; diff --git a/net/samba/patches/patch-bl b/net/samba/patches/patch-bl new file mode 100644 index 00000000000..3ad811b3d46 --- /dev/null +++ b/net/samba/patches/patch-bl @@ -0,0 +1,22 @@ +$NetBSD: patch-bl,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- wrepld/process.c.orig 2005-10-12 13:03:27.000000000 -0400 ++++ wrepld/process.c +@@ -197,7 +197,7 @@ static void get_our_last_id(WINS_OWNER * + { + TDB_CONTEXT *tdb; + +- tdb = tdb_open_log(lock_path(WINS_LIST), 0, TDB_DEFAULT, O_RDONLY, 0600); ++ tdb = tdb_open_log(state_path(WINS_LIST), 0, TDB_DEFAULT, O_RDONLY, 0600); + if (!tdb) { + DEBUG(2,("get_our_last_id: Can't open wins database file %s. Error was %s\n", WINS_LIST, strerror(errno) )); + return; +@@ -489,7 +489,7 @@ static void send_entry_request(GENERIC_P + } + + +- tdb = tdb_open_log(lock_path(WINS_LIST), 0, TDB_DEFAULT, O_RDONLY, 0600); ++ tdb = tdb_open_log(state_path(WINS_LIST), 0, TDB_DEFAULT, O_RDONLY, 0600); + if (!tdb) { + DEBUG(2,("send_entry_request: Can't open wins database file %s. Error was %s\n", WINS_LIST, strerror(errno) )); + return; diff --git a/net/samba/patches/patch-bm b/net/samba/patches/patch-bm new file mode 100644 index 00000000000..96d9f703391 --- /dev/null +++ b/net/samba/patches/patch-bm @@ -0,0 +1,17 @@ +$NetBSD: patch-bm,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- dynconfig.c.orig 2005-10-12 13:03:42.000000000 -0400 ++++ dynconfig.c +@@ -68,5 +68,12 @@ const fstring dyn_SHLIBEXT = SHLIBEXT; + const pstring dyn_LOCKDIR = LOCKDIR; + const pstring dyn_PIDDIR = PIDDIR; + ++/** ++ * @brief Directory holding persistent-state files. ++ * ++ * Not writable, but used to set a default in the parameter table. ++ **/ ++const pstring dyn_STATEDIR = STATEDIR; ++ + const pstring dyn_SMB_PASSWD_FILE = SMB_PASSWD_FILE; + const pstring dyn_PRIVATE_DIR = PRIVATE_DIR; diff --git a/net/samba/patches/patch-bn b/net/samba/patches/patch-bn new file mode 100644 index 00000000000..3a6e3ec875b --- /dev/null +++ b/net/samba/patches/patch-bn @@ -0,0 +1,11 @@ +$NetBSD: patch-bn,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- include/dynconfig.h.orig 2005-10-12 13:03:39.000000000 -0400 ++++ include/dynconfig.h +@@ -34,5 +34,6 @@ extern pstring dyn_LIBDIR; + extern const fstring dyn_SHLIBEXT; + extern const pstring dyn_LOCKDIR; + extern const pstring dyn_PIDDIR; ++extern const pstring dyn_STATEDIR; + extern const pstring dyn_SMB_PASSWD_FILE; + extern const pstring dyn_PRIVATE_DIR; diff --git a/net/samba/patches/patch-bo b/net/samba/patches/patch-bo new file mode 100644 index 00000000000..e0eabe3f1b7 --- /dev/null +++ b/net/samba/patches/patch-bo @@ -0,0 +1,15 @@ +$NetBSD: patch-bo,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- nmbd/nmbd.c.orig 2005-10-12 13:03:37.000000000 -0400 ++++ nmbd/nmbd.c +@@ -763,6 +763,10 @@ static BOOL open_sockets(BOOL isdaemon, + mkdir(lp_lockdir(), 0755); + } + ++ if (!directory_exist(lp_statedir(), NULL)) { ++ mkdir(lp_statedir(), 0755); ++ } ++ + pidfile_create("nmbd"); + message_init(); + message_register(MSG_FORCE_ELECTION, nmbd_message_election); diff --git a/net/samba/patches/patch-bp b/net/samba/patches/patch-bp new file mode 100644 index 00000000000..41396946190 --- /dev/null +++ b/net/samba/patches/patch-bp @@ -0,0 +1,14 @@ +$NetBSD: patch-bp,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- smbd/server.c.orig 2005-10-12 13:03:25.000000000 -0400 ++++ smbd/server.c +@@ -867,6 +867,9 @@ 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/samba/patches/patch-bq b/net/samba/patches/patch-bq new file mode 100644 index 00000000000..537231fcf16 --- /dev/null +++ b/net/samba/patches/patch-bq @@ -0,0 +1,17 @@ +$NetBSD: patch-bq,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- utils/testparm.c.orig 2005-10-12 13:03:42.000000000 -0400 ++++ utils/testparm.c +@@ -67,6 +67,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/samba/patches/patch-br b/net/samba/patches/patch-br new file mode 100644 index 00000000000..651bb100543 --- /dev/null +++ b/net/samba/patches/patch-br @@ -0,0 +1,31 @@ +$NetBSD: patch-br,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- lib/util.c.orig 2005-10-12 13:03:29.000000000 -0400 ++++ lib/util.c +@@ -2370,6 +2370,26 @@ char *lock_path(const char *name) + } + + /***************************************************************** ++ A useful function for returning a path in the Samba state directory. ++*****************************************************************/ ++ ++char *state_path(const char *name) ++{ ++ static pstring fname; ++ ++ pstrcpy(fname,lp_statedir()); ++ trim_char(fname,'\0','/'); ++ ++ if (!directory_exist(fname,NULL)) ++ mkdir(fname,0755); ++ ++ pstrcat(fname,"/"); ++ pstrcat(fname,name); ++ ++ return fname; ++} ++ ++/***************************************************************** + A useful function for returning a path in the Samba pid directory. + *****************************************************************/ + diff --git a/net/samba/patches/patch-bs b/net/samba/patches/patch-bs new file mode 100644 index 00000000000..bba2c4e94af --- /dev/null +++ b/net/samba/patches/patch-bs @@ -0,0 +1,68 @@ +$NetBSD: patch-bs,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- param/loadparm.c.orig 2005-10-12 13:03:28.000000000 -0400 ++++ param/loadparm.c +@@ -106,6 +106,7 @@ typedef struct + char *szDeletePrinterCommand; + char *szOs2DriverMap; + char *szLockDir; ++ char *szStateDir; + char *szPidDir; + char *szRootdir; + char *szDefaultService; +@@ -275,6 +276,7 @@ typedef struct + BOOL bUnixPasswdSync; + BOOL bPasswdChatDebug; + int iPasswdChatTimeout; ++ BOOL bPasswdExpandGecos; + BOOL bTimestampLogs; + BOOL bNTSmbSupport; + BOOL bNTPipeSupport; +@@ -844,6 +846,7 @@ static struct parm_struct parm_table[] = + {"passwd chat", P_STRING, P_GLOBAL, &Globals.szPasswdChat, NULL, NULL, FLAG_ADVANCED}, + {"passwd chat debug", P_BOOL, P_GLOBAL, &Globals.bPasswdChatDebug, NULL, NULL, FLAG_ADVANCED}, + {"passwd chat timeout", P_INTEGER, P_GLOBAL, &Globals.iPasswdChatTimeout, NULL, NULL, FLAG_ADVANCED}, ++ {"passwd expand gecos", P_BOOL, P_GLOBAL, &Globals.bPasswdExpandGecos, NULL, NULL, FLAG_ADVANCED}, + {"check password script", P_STRING, P_GLOBAL, &Globals.szCheckPasswordScript, NULL, NULL, FLAG_ADVANCED}, + {"username map", P_STRING, P_GLOBAL, &Globals.szUsernameMap, NULL, NULL, FLAG_ADVANCED}, + {"password level", P_INTEGER, P_GLOBAL, &Globals.pwordlevel, NULL, NULL, FLAG_ADVANCED}, +@@ -1160,6 +1163,7 @@ static struct parm_struct parm_table[] = + {"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED}, + {"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_ADVANCED}, + {"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_HIDE}, ++ {"state directory", P_STRING, P_GLOBAL, &Globals.szStateDir, NULL, NULL, FLAG_ADVANCED}, + {"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED}, + #ifdef WITH_UTMP + {"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED}, +@@ -1402,6 +1406,7 @@ static void init_globals(void) + string_set(&Globals.szPasswdProgram, ""); + string_set(&Globals.szPidDir, dyn_PIDDIR); + string_set(&Globals.szLockDir, dyn_LOCKDIR); ++ string_set(&Globals.szStateDir, dyn_STATEDIR); + string_set(&Globals.szSocketAddress, "0.0.0.0"); + pstrcpy(s, "Samba "); + pstrcat(s, SAMBA_VERSION_STRING); +@@ -1480,6 +1485,7 @@ static void init_globals(void) + 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 */ +@@ -1705,6 +1711,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) +@@ -1833,6 +1840,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/samba/patches/patch-bt b/net/samba/patches/patch-bt new file mode 100644 index 00000000000..70e3fb7b4b5 --- /dev/null +++ b/net/samba/patches/patch-bt @@ -0,0 +1,30 @@ +$NetBSD: patch-bt,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- ../docs/htmldocs/manpages/smb.conf.5.html.orig 2005-08-19 13:56:11.000000000 -0400 ++++ ../docs/htmldocs/manpages/smb.conf.5.html +@@ -2797,6 +2797,11 @@ passdb backend = mysql:my_plugin_args td + the subsequent answers must be received in one tenth of this time. The default it + two seconds.</p><p>Default: <span class="emphasis"><em><em class="parameter"><code>passwd chat timeout</code></em> = 2 + </em></span> ++</p></dd><dt><span class="term"><a name="PASSWDEXPANDGECOS"></a>passwd expand gecos (G)</span></dt><dd><p>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 if off by ++ default.</p><p>Default: <span class="emphasis"><em><em class="parameter"><code>passwd expand gecos</code></em> = no ++</em></span> + </p></dd><dt><span class="term"><a name="PASSWDPROGRAM"></a>passwd program (G)</span></dt><dd><p>The name of a program that can be used to set + UNIX user passwords. Any occurrences of <em class="parameter"><code>%u</code></em> + will be replaced with the user name. The user name is checked for +@@ -3613,6 +3618,13 @@ smb passwd file = /etc/samba/smbpasswd + speed up case insensitive name mappings. You should never need + to change this parameter.</p><p>Default: <span class="emphasis"><em><em class="parameter"><code>stat cache</code></em> = yes + </em></span> ++</p></dd><dt><span class="term"><a name="STATEDIRECTORY"></a>state directory (G)</span></dt><dd><p>This parameter defines the directory the Samba daemon ++ processes will use for storing state files that must persist ++ across machine reboots. ++ </p><p>Default: <span class="emphasis"><em><em class="parameter"><code>state directory</code></em> = ${prefix}/var/locks ++</em></span> ++</p><p>Example: <span class="emphasis"><em><em class="parameter"><code>state directory</code></em> = /var/db/samba ++</em></span> + </p></dd><dt><span class="term"><a name="STOREDOSATTRIBUTES"></a>store dos attributes (S)</span></dt><dd><p>If this parameter is set Samba no longer attempts to + map DOS attributes like SYSTEM, HIDDEN, ARCHIVE or READ-ONLY + to UNIX permission bits (such as the <a class="indexterm" name="id2536336"></a>map hidden. Instead, DOS attributes will be stored onto an extended diff --git a/net/samba/patches/patch-bu b/net/samba/patches/patch-bu new file mode 100644 index 00000000000..e60d8f445aa --- /dev/null +++ b/net/samba/patches/patch-bu @@ -0,0 +1,33 @@ +$NetBSD: patch-bu,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- ../docs/manpages/smb.conf.5.orig 2005-08-19 13:53:26.000000000 -0400 ++++ ../docs/manpages/smb.conf.5 +@@ -2963,6 +2963,12 @@ This integer specifies the number of sec + Default: \fB\fIpasswd chat timeout\fR = 2 \fR + + .TP ++passwd expand gecos (G) ++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\&. ++ ++Default: \fB\fIpasswd expand gecos\fR = no \fR ++ ++.TP + passwd program (G) + The name of a program that can be used to set UNIX user passwords\&. Any occurrences of \fI%u\fR will be replaced with the user name\&. The user name is checked for existence before calling the password changing program\&. + +@@ -3923,6 +3929,15 @@ This parameter determines if \fBsmbd\fR( + Default: \fB\fIstat cache\fR = yes \fR + + .TP ++state directory (G) ++This parameter defines the directory the Samba daemon processes will use for storing state files that must persist across machine reboots\&. ++ ++Default: \fB\fIstate directory\fR = ${prefix}/var/locks \fR ++ ++Example: \fB\fIstate directory\fR = /var/db/samba \fR ++ ++ ++.TP + store dos attributes (S) + If this parameter is set Samba no longer attempts to map DOS attributes like SYSTEM, HIDDEN, ARCHIVE or READ\-ONLY to UNIX permission bits (such as the map hidden\&. Instead, DOS attributes will be stored onto an extended attribute in the UNIX filesystem, associated with the file or directory\&. For this to operate correctly, the parameters map hidden, map system, map archive must be set to off\&. This parameter writes the DOS attributes as a string into the extended attribute named "user\&.DOSATTRIB"\&. This extended attribute is explicitly hidden from smbd clients requesting an EA list\&. On Linux the filesystem must have been mounted with the mount option user_xattr in order for extended attributes to work, also extended attributes must be compiled into the Linux kernel\&. + diff --git a/net/samba/patches/patch-bv b/net/samba/patches/patch-bv new file mode 100644 index 00000000000..3292780c784 --- /dev/null +++ b/net/samba/patches/patch-bv @@ -0,0 +1,51 @@ +$NetBSD: patch-bv,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- lib/util_pw.c.orig 2005-10-12 13:03:30.000000000 -0400 ++++ 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 +@@ -144,3 +145,38 @@ struct passwd *getpwuid_alloc(uid_t uid) + + return alloc_copy_passwd(temp); + } ++ ++ ++/**************************************************************** ++ Expand any `&' characters in pw_gecos with a capitalized pw_name. ++****************************************************************/ ++ ++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/samba/patches/patch-bw b/net/samba/patches/patch-bw new file mode 100644 index 00000000000..f2395b69ae6 --- /dev/null +++ b/net/samba/patches/patch-bw @@ -0,0 +1,34 @@ +$NetBSD: patch-bw,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- include/config.h.in.orig 2005-10-12 22:20:00.000000000 -0400 ++++ include/config.h.in +@@ -244,9 +244,6 @@ + /* Whether we have CUPS */ + #undef HAVE_CUPS + +-/* Define to 1 if you have the `des_set_key' function. */ +-#undef HAVE_DES_SET_KEY +- + /* Whether the 'dev64_t' type is available */ + #undef HAVE_DEV64_T + +@@ -305,6 +302,9 @@ + /* Whether errno() is available */ + #undef HAVE_ERRNO_DECL + ++/* Define to 1 if you have the `EVP_des_cbc' function. */ ++#undef HAVE_EVP_DES_CBC ++ + /* Define to 1 if you have the <execinfo.h> header file. */ + #undef HAVE_EXECINFO_H + +@@ -449,6 +449,9 @@ + /* Define to 1 if you have the `getpwanam' function. */ + #undef HAVE_GETPWANAM + ++/* Define to 1 if you have the `getpwent_r' function. */ ++#undef HAVE_GETPWENT_R ++ + /* Define to 1 if you have the `getrlimit' function. */ + #undef HAVE_GETRLIMIT + diff --git a/net/samba/patches/patch-bx b/net/samba/patches/patch-bx new file mode 100644 index 00000000000..219dc18b660 --- /dev/null +++ b/net/samba/patches/patch-bx @@ -0,0 +1,21 @@ +$NetBSD: patch-bx,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- nsswitch/winbind_nss.h.orig 2005-10-12 13:03:28.000000000 -0400 ++++ nsswitch/winbind_nss.h +@@ -56,7 +56,15 @@ typedef enum nss_status NSS_STATUS; + + #include "nsswitch/winbind_nss_hpux.h" + +-#else /* Nothing's defined. Neither gnu nor sun nor hp */ ++#elif defined(__NetBSD__) && defined(HAVE_GETPWENT_R) ++ ++/* ++ * NetBSD 3 and newer ++ */ ++ ++#include "nsswitch/winbind_nss_netbsd.h" ++ ++#else /* Nothing's defined. Neither gnu nor netbsd nor sun nor hp */ + + typedef enum + { diff --git a/net/samba/patches/patch-by b/net/samba/patches/patch-by new file mode 100644 index 00000000000..fbe702a48fb --- /dev/null +++ b/net/samba/patches/patch-by @@ -0,0 +1,410 @@ +$NetBSD: patch-by,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- /dev/null 2005-10-30 02:57:41.000000000 -0500 ++++ nsswitch/winbind_nss_netbsd.c 2005-10-30 03:04:23.000000000 -0500 +@@ -0,0 +1,405 @@ ++/* ++ Unix SMB/CIFS implementation. ++ ++ NetBSD loadable authentication module, providing identification ++ routines against Samba winbind/Windows NT Domain ++ ++ Copyright (C) Luke Mewburn 2004-2005 ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Library General Public ++ License as published by the Free Software Foundation; either ++ version 2 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Library General Public License for more details. ++ ++ You should have received a copy of the GNU Library General Public ++ License along with this library; if not, write to the ++ Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ Boston, MA 02111-1307, USA. ++*/ ++ ++#include <sys/param.h> ++ ++#include "winbind_client.h" ++ ++#include <stdarg.h> ++#include <syslog.h> ++ ++ /* dynamic nsswitch with "new" getpw* nsdispatch API available */ ++#if defined(NSS_MODULE_INTERFACE_VERSION) && defined(HAVE_GETPWENT_R) ++ ++/* ++ group functions ++ --------------- ++*/ ++ ++static struct group _winbind_group; ++static char _winbind_groupbuf[1024]; ++ ++int ++netbsdwinbind_endgrent(void *nsrv, void *nscb, va_list ap) ++{ ++ int rv; ++ ++ rv = _nss_winbind_endgrent(); ++ return rv; ++} ++ ++int ++netbsdwinbind_setgrent(void *nsrv, void *nscb, va_list ap) ++{ ++ int rv; ++ ++ rv = _nss_winbind_setgrent(); ++ return rv; ++} ++ ++int ++netbsdwinbind_getgrent(void *nsrv, void *nscb, va_list ap) ++{ ++ struct group **retval = va_arg(ap, struct group **); ++ ++ int rv, rerrno; ++ ++ *retval = NULL; ++ rv = _nss_winbind_getgrent_r(&_winbind_group, ++ _winbind_groupbuf, sizeof(_winbind_groupbuf), &rerrno); ++ if (rv == NS_SUCCESS) ++ *retval = &_winbind_group; ++ return rv; ++} ++ ++int ++netbsdwinbind_getgrent_r(void *nsrv, void *nscb, va_list ap) ++{ ++ int *retval = va_arg(ap, int *); ++ struct group *grp = va_arg(ap, struct group *); ++ char *buffer = va_arg(ap, char *); ++ size_t buflen = va_arg(ap, size_t); ++ struct group **result = va_arg(ap, struct group **); ++ ++ int rv, rerrno; ++ ++ *result = NULL; ++ rerrno = 0; ++ ++ rv = _nss_winbind_getgrent_r(grp, buffer, buflen, rerrno); ++ if (rv == NS_SUCCESS) ++ *result = grp; ++ else ++ *retval = rerrno; ++ return rv; ++} ++ ++int ++netbsdwinbind_getgrgid(void *nsrv, void *nscb, va_list ap) ++{ ++ struct group **retval = va_arg(ap, struct group **); ++ gid_t gid = va_arg(ap, gid_t); ++ ++ int rv, rerrno; ++ ++ *retval = NULL; ++ rv = _nss_winbind_getgrgid_r(gid, &_winbind_group, ++ _winbind_groupbuf, sizeof(_winbind_groupbuf), &rerrno); ++ if (rv == NS_SUCCESS) ++ *retval = &_winbind_group; ++ return rv; ++} ++ ++int ++netbsdwinbind_getgrgid_r(void *nsrv, void *nscb, va_list ap) ++{ ++ int *retval = va_arg(ap, int *); ++ gid_t gid = va_arg(ap, gid_t); ++ struct group *grp = va_arg(ap, struct group *); ++ char *buffer = va_arg(ap, char *); ++ size_t buflen = va_arg(ap, size_t); ++ struct group **result = va_arg(ap, struct group **); ++ ++ int rv, rerrno; ++ ++ *result = NULL; ++ rerrno = 0; ++ ++ rv = _nss_winbind_getgrgid_r(gid, grp, buffer, buflen, &rerrno); ++ if (rv == NS_SUCCESS) ++ *result = grp; ++ else ++ *retval = rerrno; ++ return rv; ++} ++ ++int ++netbsdwinbind_getgrnam(void *nsrv, void *nscb, va_list ap) ++{ ++ struct group **retval = va_arg(ap, struct group **); ++ const char *name = va_arg(ap, const char *); ++ ++ int rv, rerrno; ++ ++ *retval = NULL; ++ rv = _nss_winbind_getgrnam_r(name, &_winbind_group, ++ _winbind_groupbuf, sizeof(_winbind_groupbuf), &rerrno); ++ if (rv == NS_SUCCESS) ++ *retval = &_winbind_group; ++ return rv; ++} ++ ++int ++netbsdwinbind_getgrnam_r(void *nsrv, void *nscb, va_list ap) ++{ ++ int *retval = va_arg(ap, int *); ++ const char *name = va_arg(ap, const char *); ++ struct group *grp = va_arg(ap, struct group *); ++ char *buffer = va_arg(ap, char *); ++ size_t buflen = va_arg(ap, size_t); ++ struct group **result = va_arg(ap, struct group **); ++ ++ int rv, rerrno; ++ ++ *result = NULL; ++ rerrno = 0; ++ ++ rv = _nss_winbind_getgrnam_r(name, grp, buffer, buflen, &rerrno); ++ if (rv == NS_SUCCESS) ++ *result = grp; ++ else ++ *retval = rerrno; ++ return rv; ++} ++ ++int ++netbsdwinbind_getgroupmembership(void *nsrv, void *nscb, va_list ap) ++{ ++ int *result = va_arg(ap, int *); ++ const char *uname = va_arg(ap, const char *); ++ gid_t agroup = va_arg(ap, gid_t); ++ gid_t *groups = va_arg(ap, gid_t *); ++ int maxgrp = va_arg(ap, int); ++ int *groupc = va_arg(ap, int *); ++ ++ struct winbindd_request request; ++ struct winbindd_response response; ++ gid_t *wblistv; ++ int wblistc, i, isdup, dupc; ++ ++ ZERO_STRUCT(request); ++ ZERO_STRUCT(response); ++ strncpy(request.data.username, uname, ++ sizeof(request.data.username) - 1); ++ i = winbindd_request_response(WINBINDD_GETGROUPS, &request, &response); ++ if (i != NSS_STATUS_SUCCESS) ++ return NS_NOTFOUND; ++ wblistv = (gid_t *)response.extra_data; ++ wblistc = response.data.num_entries; ++ ++ for (i = 0; i < wblistc; i++) { /* add winbind gids */ ++ isdup = 0; /* skip duplicates */ ++ for (dupc = 0; dupc < MIN(maxgrp, *groupc); dupc++) { ++ if (groups[dupc] == wblistv[i]) { ++ isdup = 1; ++ break; ++ } ++ } ++ if (isdup) ++ continue; ++ if (*groupc < maxgrp) /* add this gid */ ++ groups[*groupc] = wblistv[i]; ++ else ++ *result = -1; ++ (*groupc)++; ++ } ++ SAFE_FREE(wblistv); ++ return NS_NOTFOUND; ++} ++ ++ ++/* ++ passwd functions ++ ---------------- ++*/ ++ ++static struct passwd _winbind_passwd; ++static char _winbind_passwdbuf[1024]; ++ ++int ++netbsdwinbind_endpwent(void *nsrv, void *nscb, va_list ap) ++{ ++ int rv; ++ ++ rv = _nss_winbind_endpwent(); ++ return rv; ++} ++ ++int ++netbsdwinbind_setpwent(void *nsrv, void *nscb, va_list ap) ++{ ++ int rv; ++ ++ rv = _nss_winbind_setpwent(); ++ return rv; ++} ++ ++int ++netbsdwinbind_getpwent(void *nsrv, void *nscb, va_list ap) ++{ ++ struct passwd **retval = va_arg(ap, struct passwd **); ++ ++ int rv, rerrno; ++ ++ *retval = NULL; ++ ++ rv = _nss_winbind_getpwent_r(&_winbind_passwd, ++ _winbind_passwdbuf, sizeof(_winbind_passwdbuf), &rerrno); ++ if (rv == NS_SUCCESS) ++ *retval = &_winbind_passwd; ++ return rv; ++} ++ ++int ++netbsdwinbind_getpwent_r(void *nsrv, void *nscb, va_list ap) ++{ ++ int *retval = va_arg(ap, int *); ++ struct passwd *pw = va_arg(ap, struct passwd *); ++ char *buffer = va_arg(ap, char *); ++ size_t buflen = va_arg(ap, size_t); ++ struct passwd **result = va_arg(ap, struct passwd **); ++ ++ int rv, rerrno; ++ ++ *result = NULL; ++ rerrno = 0; ++ ++ rv = _nss_winbind_getpwent_r(pw, buffer, buflen, rerrno); ++ if (rv == NS_SUCCESS) ++ *result = pw; ++ else ++ *retval = rerrno; ++ return rv; ++} ++ ++int ++netbsdwinbind_getpwnam(void *nsrv, void *nscb, va_list ap) ++{ ++ struct passwd **retval = va_arg(ap, struct passwd **); ++ const char *name = va_arg(ap, const char *); ++ ++ int rv, rerrno; ++ ++ *retval = NULL; ++ rv = _nss_winbind_getpwnam_r(name, &_winbind_passwd, ++ _winbind_passwdbuf, sizeof(_winbind_passwdbuf), &rerrno); ++ if (rv == NS_SUCCESS) ++ *retval = &_winbind_passwd; ++ return rv; ++} ++ ++int ++netbsdwinbind_getpwnam_r(void *nsrv, void *nscb, va_list ap) ++{ ++ int *retval = va_arg(ap, int *); ++ const char *name = va_arg(ap, const char *); ++ struct passwd *pw = va_arg(ap, struct passwd *); ++ char *buffer = va_arg(ap, char *); ++ size_t buflen = va_arg(ap, size_t); ++ struct passwd **result = va_arg(ap, struct passwd **); ++ ++ int rv, rerrno; ++ ++ *result = NULL; ++ rerrno = 0; ++ ++ rv = _nss_winbind_getpwnam_r(name, pw, buffer, buflen, &rerrno); ++ if (rv == NS_SUCCESS) ++ *result = pw; ++ else ++ *retval = rerrno; ++ return rv; ++} ++ ++int ++netbsdwinbind_getpwuid(void *nsrv, void *nscb, va_list ap) ++{ ++ struct passwd **retval = va_arg(ap, struct passwd **); ++ uid_t uid = va_arg(ap, uid_t); ++ ++ int rv, rerrno; ++ ++ *retval = NULL; ++ rv = _nss_winbind_getpwuid_r(uid, &_winbind_passwd, ++ _winbind_passwdbuf, sizeof(_winbind_passwdbuf), &rerrno); ++ if (rv == NS_SUCCESS) ++ *retval = &_winbind_passwd; ++ return rv; ++} ++ ++int ++netbsdwinbind_getpwuid_r(void *nsrv, void *nscb, va_list ap) ++{ ++ int *retval = va_arg(ap, int *); ++ uid_t uid = va_arg(ap, uid_t); ++ struct passwd *pw = va_arg(ap, struct passwd *); ++ char *buffer = va_arg(ap, char *); ++ size_t buflen = va_arg(ap, size_t); ++ struct passwd **result = va_arg(ap, struct passwd **); ++ ++ int rv, rerrno; ++ ++ *result = NULL; ++ rerrno = 0; ++ ++ rv = _nss_winbind_getpwuid_r(uid, pw, buffer, buflen, &rerrno); ++ if (rv == NS_SUCCESS) ++ *result = pw; ++ else ++ *retval = rerrno; ++ return rv; ++} ++ ++ ++/* ++ nsswitch module setup ++ --------------------- ++*/ ++ ++ ++static ns_mtab winbind_methods[] = { ++ ++{ NSDB_GROUP, "endgrent", netbsdwinbind_endgrent, NULL }, ++{ NSDB_GROUP, "getgrent", netbsdwinbind_getgrent, NULL }, ++{ NSDB_GROUP, "getgrent_r", netbsdwinbind_getgrent_r, NULL }, ++{ NSDB_GROUP, "getgrgid", netbsdwinbind_getgrgid, NULL }, ++{ NSDB_GROUP, "getgrgid_r", netbsdwinbind_getgrgid_r, NULL }, ++{ NSDB_GROUP, "getgrnam", netbsdwinbind_getgrnam, NULL }, ++{ NSDB_GROUP, "getgrnam_r", netbsdwinbind_getgrnam_r, NULL }, ++{ NSDB_GROUP, "setgrent", netbsdwinbind_setgrent, NULL }, ++{ NSDB_GROUP, "setgroupent", netbsdwinbind_setgrent, NULL }, ++{ NSDB_GROUP, "getgroupmembership", netbsdwinbind_getgroupmembership, NULL }, ++ ++{ NSDB_PASSWD, "endpwent", netbsdwinbind_endpwent, NULL }, ++{ NSDB_PASSWD, "getpwent", netbsdwinbind_getpwent, NULL }, ++{ NSDB_PASSWD, "getpwent_r", netbsdwinbind_getpwent_r, NULL }, ++{ NSDB_PASSWD, "getpwnam", netbsdwinbind_getpwnam, NULL }, ++{ NSDB_PASSWD, "getpwnam_r", netbsdwinbind_getpwnam_r, NULL }, ++{ NSDB_PASSWD, "getpwuid", netbsdwinbind_getpwuid, NULL }, ++{ NSDB_PASSWD, "getpwuid_r", netbsdwinbind_getpwuid_r, NULL }, ++{ NSDB_PASSWD, "setpassent", netbsdwinbind_setpwent, NULL }, ++{ NSDB_PASSWD, "setpwent", netbsdwinbind_setpwent, NULL }, ++ ++}; ++ ++ns_mtab * ++nss_module_register(const char *source, unsigned int *mtabsize, ++ nss_module_unregister_fn *unreg) ++{ ++ *mtabsize = sizeof(winbind_methods)/sizeof(winbind_methods[0]); ++ *unreg = NULL; ++ return (winbind_methods); ++} ++ ++#endif /* NSS_MODULE_INTERFACE_VERSION && HAVE_GETPWENT_R */ diff --git a/net/samba/patches/patch-bz b/net/samba/patches/patch-bz new file mode 100644 index 00000000000..ee5c0a4a955 --- /dev/null +++ b/net/samba/patches/patch-bz @@ -0,0 +1,47 @@ +$NetBSD: patch-bz,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- /dev/null 2005-10-30 02:57:41.000000000 -0500 ++++ nsswitch/winbind_nss_netbsd.h 2005-10-30 03:04:23.000000000 -0500 +@@ -0,0 +1,42 @@ ++/* ++ Unix SMB/CIFS implementation. ++ ++ NetBSD loadable authentication module, providing identification ++ routines against Samba winbind/Windows NT Domain ++ ++ Copyright (C) Luke Mewburn 2004-2005 ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Library General Public ++ License as published by the Free Software Foundation; either ++ version 2 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Library General Public License for more details. ++ ++ You should have received a copy of the GNU Library General Public ++ License along with this library; if not, write to the ++ Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ Boston, MA 02111-1307, USA. ++*/ ++ ++#ifndef _WINBIND_NSS_NETBSD_H ++#define _WINBIND_NSS_NETBSD_H ++ ++#include <nsswitch.h> ++ ++ /* dynamic nsswitch with "new" getpw* nsdispatch API available */ ++#if defined(NSS_MODULE_INTERFACE_VERSION) && defined(HAVE_GETPWENT_R) ++ ++typedef int NSS_STATUS; ++ ++#define NSS_STATUS_SUCCESS NS_SUCCESS ++#define NSS_STATUS_NOTFOUND NS_NOTFOUND ++#define NSS_STATUS_UNAVAIL NS_UNAVAIL ++#define NSS_STATUS_TRYAGAIN NS_TRYAGAIN ++ ++#endif /* NSS_MODULE_INTERFACE_VERSION && HAVE_GETPWENT_R */ ++ ++#endif /* _WINBIND_NSS_NETBSD_H */ diff --git a/net/samba/patches/patch-ca b/net/samba/patches/patch-ca new file mode 100644 index 00000000000..411cdd0064b --- /dev/null +++ b/net/samba/patches/patch-ca @@ -0,0 +1,13 @@ +$NetBSD: patch-ca,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- passdb/pdb_ldap.c.orig 2005-10-12 13:03:35.000000000 -0400 ++++ passdb/pdb_ldap.c +@@ -694,7 +694,7 @@ static BOOL init_sam_from_ldap(struct ld + + if (ldap_state->is_nds_ldap) { + char *user_dn; +- int pwd_len; ++ size_t pwd_len; + char clear_text_pw[512]; + + /* Make call to Novell eDirectory ldap extension to get clear text password. diff --git a/net/samba/patches/patch-cb b/net/samba/patches/patch-cb new file mode 100644 index 00000000000..af630b8b2aa --- /dev/null +++ b/net/samba/patches/patch-cb @@ -0,0 +1,22 @@ +$NetBSD: patch-cb,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- rpc_server/srv_reg_nt.c.orig 2005-10-12 13:03:33.000000000 -0400 ++++ rpc_server/srv_reg_nt.c +@@ -66,7 +66,7 @@ SEC_DESC* construct_registry_sd( TALLOC_ + size_t i = 0; + SEC_DESC *sd; + SEC_ACL *acl; +- uint32 sd_size; ++ size_t sd_size; + + /* basic access for Everyone */ + +@@ -987,7 +987,7 @@ static WERROR make_default_reg_sd( TALLO + SEC_ACE ace[2]; /* at most 2 entries */ + SEC_ACCESS mask; + SEC_ACL *psa = NULL; +- uint32 sd_size; ++ size_t sd_size; + + /* set the owner to BUILTIN\Administrator */ + diff --git a/net/samba/patches/patch-cc b/net/samba/patches/patch-cc new file mode 100644 index 00000000000..5026936ba64 --- /dev/null +++ b/net/samba/patches/patch-cc @@ -0,0 +1,22 @@ +$NetBSD: patch-cc,v 1.1 2005/11/14 08:05:28 jlam Exp $ + +--- rpc_server/srv_svcctl_nt.c.orig 2005-10-12 13:03:34.000000000 -0400 ++++ rpc_server/srv_svcctl_nt.c +@@ -81,7 +81,7 @@ static SEC_DESC* construct_scm_sd( TALLO + size_t i = 0; + SEC_DESC *sd; + SEC_ACL *acl; +- uint32 sd_size; ++ size_t sd_size; + + /* basic access for Everyone */ + +@@ -115,7 +115,7 @@ static SEC_DESC* construct_service_sd( T + size_t i = 0; + SEC_DESC *sd; + SEC_ACL *acl; +- uint32 sd_size; ++ size_t sd_size; + + /* basic access for Everyone */ + |