summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/samba/Makefile186
-rw-r--r--net/samba/distinfo13
-rw-r--r--net/samba/files/smb.conf.sample24
-rw-r--r--net/samba/patches/patch-aa104
-rw-r--r--net/samba/patches/patch-ab166
-rw-r--r--net/samba/pkg/DEINSTALL86
-rw-r--r--net/samba/pkg/INSTALL49
-rw-r--r--net/samba/pkg/PLIST189
8 files changed, 541 insertions, 276 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 3a58dc0842a..776e4b85d77 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,90 +1,116 @@
-# $NetBSD: Makefile,v 1.48 2001/05/10 09:00:23 abs Exp $
-
-DISTNAME= samba-2.0.9
-WRKSRC= ${WRKDIR}/${DISTNAME}/source
-CATEGORIES= net
-MASTER_SITES= ftp://ftp.samba.org/pub/samba/ \
- ftp://ring.asahi-net.or.jp/pub/net/samba/ \
- ftp://samba.anu.edu.au/pub/samba/ \
- ftp://de.samba.org/pub/mirror/samba/ \
- ftp://se.samba.org/pub/samba/ \
- ftp://ftp.sunet.se/pub/unix/utilities/samba/
-
-MAINTAINER= packages@netbsd.org
-HOMEPAGE= http://www.samba.org/
-COMMENT= SMB/CIFS protocol server suite for UNIX
-
-BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf
-BUILD_USES_MSGFMT= YES
-
-.if !exists(/usr/include/readline/readline.h)
-DEPENDS+= readline>=4.0:../../devel/readline
-.endif
+# $NetBSD: Makefile,v 1.49 2001/05/14 18:56:15 jlam Exp $
+
+DISTNAME= samba-2.2.0
+WRKSRC= ${WRKDIR}/${DISTNAME}/source
+CATEGORIES= net
+MASTER_SITES= ftp://ftp.samba.org/pub/samba/ \
+ ftp://ring.asahi-net.or.jp/pub/net/samba/ \
+ ftp://samba.anu.edu.au/pub/samba/ \
+ ftp://de.samba.org/pub/mirror/samba/ \
+ ftp://se.samba.org/pub/samba/ \
+ ftp://ftp.sunet.se/pub/unix/utilities/samba/
+
+MAINTAINER= packages@netbsd.org
+HOMEPAGE= http://www.samba.org/
+COMMENT= SMB/CIFS protocol server suite for UNIX
+
+# Samba uses some GNU readline features (rl_event_hook).
+DEPENDS+= readline>=2.2:../../devel/readline
+
+USE_LIBINTL= # defined
+USE_SSL= # defined
-USE_LIBINTL= YES
-GNU_CONFIGURE= YES
+GNU_CONFIGURE= # defined
+USE_LIBTOOL= # defined
+LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
.include "../../mk/bsd.prefs.mk"
-SAMPLE_CONFIG= ${PREFIX}/share/examples/samba/smb.conf.sample
-SAMBA_LOGDIR= /var/log
-SAMBA_LOCKDIR= /var/run/samba
-SAMBA_ETCDIR?= /etc/samba
-SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private
+SAMBA_LOGDIR= /var/log
+SAMBA_LOCKDIR= /var/run/samba
+SAMBA_ETCDIR?= /etc/samba
+SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private
+
+MAKE_ENV+= ETCDIR=${SAMBA_ETCDIR}
+MAKE_ENV+= LOGDIR=${SAMBA_LOGDIR}
+
+CONFIGURE_ARGS+= --localstatedir=${SAMBA_LOGDIR}
+CONFIGURE_ARGS+= --sbindir=${PREFIX}/sbin
+CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR}
+CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR}
+CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE}
+CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/swat
+
+CONFIGURE_ARGS+= --with-readline=${LOCALBASE}
+CONFIGURE_ARGS+= --with-ssl
+
+# The following should be ${SSLBASE}, but we don't want the configure script
+# to add -I/usr/include at the front of the compiler options, so force it to
+# be ${LOCALBASE} instead. This is needed anyway for many of the
+# dependencies.
+#
+CONFIGURE_ARGS+= --with-sslinc=${LOCALBASE}
-.if ${OPSYS} == "SunOS"
-ROOT_GROUP?= root
-.else
-ROOT_GROUP?= wheel
+CPPFLAGS+= -I${SSLBASE}/include/openssl # ssl.h, err.h
+
+.if defined(SAMBA_WITH_CUPS)
+CONFIGURE_ARGS+= --with-cups
+DEPENDS+= cups>=1.1.1:../../print/cups
+.endif
+
+.if defined(USE_PAM)
+CONFIGURE_ARGS+= --with-pam
+DEPENDS+= PAM-*:../../security/PAM
.endif
-MAKE_ENV+= ETCDIR=${SAMBA_ETCDIR}
-MAKE_ENV+= LOGDIR=${SAMBA_LOGDIR}
+# The following are Linux-only options.
+CONFIGURE_ARGS+= --without-smbwrapper
+CONFIGURE_ARGS+= --without-smbmount
-CONFIGURE_ARGS+=--with-lockdir=${SAMBA_LOCKDIR} \
- --with-privatedir=${SAMBA_PRIVATE} \
- --with-swatdir=${PREFIX}/share/swat \
- --with-i18n-swat \
- --with-sambabook=${PREFIX}/share/swat/using_samba
+CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
-PLIST_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE}
+INSTALL_FILE= ${WRKDIR}/INSTALL
+DEINSTALL_FILE= ${WRKDIR}/DEINSTALL
-INSTALL_FILE= ${WRKDIR}/INSTALL
-DEINSTALL_FILE= ${WRKDIR}/DEINSTALL
+DOCDIR= ${PREFIX}/share/doc/samba
+HTMLDIR= ${PREFIX}/share/doc/html/samba
-pre-configure:
- cd ${WRKSRC}; ${LOCALBASE}/bin/autoreconf
+post-extract:
+ ${FIND} ${WRKDIR}/${DISTNAME} -name ".cvsignore" -exec ${RM} -f {} \;
-post-build:
-.for FILE in nmbd.sh smbd.sh
- ${SED} -e "s,@PREFIX@,${PREFIX},g" \
- -e "s,@ECHO@,${ECHO},g" \
- < ${FILESDIR}/${FILE} > ${WRKDIR}/${FILE}
-.endfor
+pre-install:
+ for file in nmbd.sh smbd.sh; do \
+ ${SED} -e "s,@PREFIX@,${PREFIX},g" \
+ -e "s,@ECHO@,${ECHO},g" \
+ ${FILESDIR}/$${file} > ${WRKDIR}/$${file}; \
+ done
+ ${SED} -e "s|@SAMBA_PRIVATE@|${SAMBA_PRIVATE}|g" \
+ -e "s|@SAMBA_LOCKDIR@|${SAMBA_LOCKDIR}|g" \
+ -e "s|@SAMBA_ETCDIR@|${SAMBA_ETCDIR}|g" \
+ -e "s|@CAT@|${CAT}|g" \
+ -e "s|@CHMOD@|${CHMOD}|g" \
+ -e "s|@CHOWN@|${CHOWN}|g" \
+ -e "s|@CP@|${CP}|g" \
+ -e "s|@MKDIR@|${MKDIR}|g" \
+ -e "s|@RM@|${RM}|g" \
+ ${PKGDIR}/INSTALL > ${INSTALL_FILE}
+ ${SED} -e "s|@SAMBA_PRIVATE@|${SAMBA_PRIVATE}|g" \
+ -e "s|@SAMBA_LOCKDIR@|${SAMBA_LOCKDIR}|g" \
+ -e "s|@SAMBA_ETCDIR@|${SAMBA_ETCDIR}|g" \
+ -e "s|@CAT@|${CAT}|g" \
+ -e "s|@RM@|${RM}|g" \
+ -e "s|@RMDIR@|${RMDIR}|g" \
+ -e "s|@TRUE@|${TRUE}|g" \
+ ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
post-install:
# Install Samba documentation.
- #
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/samba
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/samba/faq
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/samba/textdocs
- cd ${WRKDIR}/${DISTNAME}/docs; \
- for file in \
- NT4-Locking.reg NT4-Locking.txt NT4_PlainPassword.reg \
- THANKS Win2000_PlainPassword.reg Win95_PlainPassword.reg \
- Win98_PlainPassword.reg Win9X-CacheHandling.reg \
- WindowsTerminalServer.reg announce; do \
- ${INSTALL_DATA} $${file} ${PREFIX}/share/doc/samba; \
- done
- for file in ${WRKDIR}/${DISTNAME}/docs/faq/*.html; do \
- ${INSTALL_DATA} $${file} ${PREFIX}/share/doc/samba/faq; \
- done
- for file in ${WRKDIR}/${DISTNAME}/docs/textdocs/*; do \
- ${INSTALL_DATA} $${file} ${PREFIX}/share/doc/samba/textdocs; \
- done
+ ${INSTALL_DATA_DIR} ${DOCDIR} ${HTMLDIR}
+ cd ${WRKDIR}/${DISTNAME}/docs; \
+ ${INSTALL_DATA} announce *.reg textdocs/* ${DOCDIR}; \
+ ${INSTALL_DATA} faq/*.html ${HTMLDIR}
# Install Samba examples.
- #
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/samba
${CP} -R ${WRKDIR}/${DISTNAME}/examples/* ${PREFIX}/share/examples/samba
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/samba
@@ -92,19 +118,15 @@ post-install:
${INSTALL_SCRIPT} ${WRKDIR}/nmbd.sh ${PREFIX}/etc/rc.d/nmbd
${INSTALL_SCRIPT} ${WRKDIR}/smbd.sh ${PREFIX}/etc/rc.d/smbd
+ ${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh \
+ ${PREFIX}/sbin/mksmbpasswd
+
+ ${SED} -e "s|@SAMBA_LOGDIR@|${SAMBA_LOGDIR}|g" \
+ -e "s|@SAMBA_ETCDIR@|${SAMBA_ETCDIR}|g" \
+ -e "s|@PREFIX@|${PREFIX}|g" \
+ ${FILESDIR}/smb.conf.sample > ${WRKDIR}/smb.conf.sample
+ ${INSTALL_DATA} ${WRKDIR}/smb.conf.sample ${PREFIX}/share/examples/samba
- ${SED} -e 's,@LOGDIR@,${SAMBA_LOGDIR},g' \
- -e 's,@ETCDIR@,${SAMBA_ETCDIR},g' \
- -e 's,@PREFIX@,{PREFIX},g' \
- < ${FILESDIR}/smb.conf.sample > ${WRKDIR}/smb.conf.sample
- ${INSTALL_DATA} ${WRKDIR}/smb.conf.sample ${SAMPLE_CONFIG}
- ${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh ${PREFIX}/bin
-
- ${SED} -e "s,@SAMBA_PRIVATE@,${SAMBA_PRIVATE},g" \
- -e "s,@ROOT_GROUP@,${ROOT_GROUP},g" \
- < ${PKGDIR}/INSTALL > ${INSTALL_FILE}
- ${SED} -e "s,@SAMBA_PRIVATE@,${SAMBA_PRIVATE},g" \
- < ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
.include "../../mk/bsd.pkg.mk"
diff --git a/net/samba/distinfo b/net/samba/distinfo
index d36e9a78264..ec8fdfa5d22 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.4 2001/05/10 09:00:23 abs Exp $
+$NetBSD: distinfo,v 1.5 2001/05/14 18:56:16 jlam Exp $
-SHA1 (samba-2.0.9.tar.gz) = 8f0e6b1e6adca36d055d243c8062eb641a42ff38
-Size (samba-2.0.9.tar.gz) = 3495816 bytes
-SHA1 (patch-aa) = 56b1bc048347bb15bf0b9dffe0f3848eac875357
-SHA1 (patch-ab) = f81ae4b2f954804f0e297fea30e49dbe52a452e8
-SHA1 (patch-ac) = 0ba35774d41978563c795fafffb6fafc87d94c0e
-SHA1 (patch-ad) = be7fc7ec26cf741f2d52bde173df71999177fd8a
-SHA1 (patch-ae) = 1ad0547af3efeae925b8e385ff7a21137367ce19
+SHA1 (samba-2.2.0.tar.gz) = a7010ff4b3e99a94e8a618184e551e3e61909859
+Size (samba-2.2.0.tar.gz) = 5835104 bytes
+SHA1 (patch-aa) = 2e9a5ee07f77d643f8a89314a36b905777b3fb19
+SHA1 (patch-ab) = 72c04568af9b986a2e8dd6513b9be57bb28f44c3
diff --git a/net/samba/files/smb.conf.sample b/net/samba/files/smb.conf.sample
index 1db2ca4f5cd..1704527445f 100644
--- a/net/samba/files/smb.conf.sample
+++ b/net/samba/files/smb.conf.sample
@@ -1,4 +1,4 @@
-# $NetBSD: smb.conf.sample,v 1.6 2000/05/02 15:24:09 jlam Exp $
+# $NetBSD: smb.conf.sample,v 1.7 2001/05/14 18:56:16 jlam Exp $
#
# This is the main Samba configuration file. You should read the
# smb.conf(5) manual page in order to understand the options listed
@@ -52,7 +52,7 @@
# this tells Samba to use a separate log file for each machine
# that connects
- log file = @LOGDIR@/log.%m
+ log file = @SAMBA_LOGDIR@/log.%m
# Put a capping on the size of the log files (in Kb).
max log size = 50
@@ -60,9 +60,17 @@
# Security mode. Most people will want user level security. See
# security_level.txt for details.
security = user
+
# Use password server option only with security = server
+# The argument list may include:
+# password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
+# or to auto-locate the domain controller/s
+# password server = *
; password server = <NT-Server-Name>
+# Note: Do NOT use the now deprecated option of "domain controller"
+# This option is no longer implemented.
+
# You may wish to use password encryption. Please read
# ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation.
# Do not enable this option unless you have read those documents
@@ -71,10 +79,12 @@
# Using the following line enables you to customise your configuration
# on a per machine basis. The %m gets replaced with the netbios name
# of the machine that is connecting
-; include = @ETCDIR@/smb.conf.%m
+; include = @SAMBA_ETCDIR@/smb.conf.%m
# Most people will find that this option gives better performance.
# See speed.txt and the manual pages for details
+# You may want to add the following on a Linux system:
+# SO_RCVBUF=8192 SO_SNDBUF=8192
socket options = TCP_NODELAY
# Configure Samba to use multiple interfaces
@@ -100,10 +110,6 @@
# and gives it a slightly higher chance of winning the election
; preferred master = yes
-# Use only if you have an NT server on your network that has been
-# configured at install time to be a primary domain controller.
-; domain controller = <NT-Domain-Controller-SMBName>
-
# Enable this if you want Samba to be a domain logon server for
# Windows95 workstations.
; domain logons = yes
@@ -147,7 +153,7 @@
# Un-comment the following and create the netlogon directory for Domain Logons
; [netlogon]
; comment = Network Logon Service
-; path = @PREFIX@/lib/netlogon
+; path = @SAMBA_ETCDIR@/netlogon
; guest ok = yes
; writable = no
; share modes = no
@@ -156,7 +162,7 @@
# Un-comment the following to provide a specific roving profile share
# the default is to use the user's home directory
;[Profiles]
-; path = @PREFIX@/samba/profiles
+; path = @SAMBA_ETCDIR@/profiles
; browseable = no
; guest ok = yes
diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa
index 6578926fef8..8db84cc61f4 100644
--- a/net/samba/patches/patch-aa
+++ b/net/samba/patches/patch-aa
@@ -1,67 +1,39 @@
-$NetBSD: patch-aa,v 1.13 2001/05/10 09:00:23 abs Exp $
+$NetBSD: patch-aa,v 1.14 2001/05/14 18:56:16 jlam Exp $
---- Makefile.in.orig Thu Mar 16 22:57:08 2000
-+++ Makefile.in
-@@ -25,10 +25,12 @@
- BINDIR = @bindir@
- # we don't use sbindir because we want full compatibility with
- # the previous releases of Samba
--SBINDIR = @bindir@
-+SBINDIR = @sbindir@
- LIBDIR = @libdir@
- VARDIR = @localstatedir@
- MANDIR = @mandir@
-+ETCDIR?= $(BASEDIR)/etc
-+LOGDIR?= $(BASEDIR)/log
- SAMBABOOK = @sambabook@
-
- # The permissions to give the executables
-@@ -37,12 +39,12 @@
- # set these to where to find various files
- # These can be overridden by command line switches (see smbd(8))
- # or in smb.conf (see smb.conf(5))
--SMBLOGFILE = $(VARDIR)/log.smb
--NMBLOGFILE = $(VARDIR)/log.nmb
--CONFIGFILE = $(LIBDIR)/smb.conf
--LMHOSTSFILE = $(LIBDIR)/lmhosts
--DRIVERFILE = $(LIBDIR)/printers.def
--PASSWD_PROGRAM = /bin/passwd
-+SMBLOGFILE = $(LOGDIR)/log.smb
-+NMBLOGFILE = $(LOGDIR)/log.nmb
-+CONFIGFILE = $(ETCDIR)/smb.conf
-+LMHOSTSFILE = $(ETCDIR)/lmhosts
-+DRIVERFILE = $(ETCDIR)/printers.def
-+PASSWD_PROGRAM = /usr/bin/passwd
- # This is where smbpasswd et al go
- PRIVATEDIR = @privatedir@
-
-@@ -463,14 +465,14 @@
-
- installdirs:
- $(SHELL) $(srcdir)/install-sh -d -m $(INSTALLPERMS) \
-- $(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(CODEPAGEDIR)
-+ $(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(ETCDIR) $(LOGDIR) $(CODEPAGEDIR)
-
- installservers: all installdirs
-- @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
-+ @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
-
- installbin: all installdirs
-- @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
-- @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
-+ @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
-+ @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS)
-
- installscripts: installdirs
- @$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
-@@ -495,8 +497,8 @@
- @$(SHELL) $(srcdir)/script/uninstallman.sh $(MANDIR) $(srcdir)
-
- uninstallbin:
-- @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
-- @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
-+ @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
-+ @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS)
-
- uninstallscripts:
- @$(SHELL) $(srcdir)/script/uninstallscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
+--- configure.in.orig Tue Apr 17 01:44:30 2001
++++ configure.in
+@@ -392,9 +392,6 @@
+ AC_CHECK_TYPE(ssize_t, int)
+ AC_CHECK_TYPE(wchar_t, unsigned short)
+
+-# we need libcups for CUPS support...
+-AC_CHECK_LIB(cups,httpConnect)
+-
+ # we need libdl for PAM and the new VFS code
+ AC_CHECK_LIB(dl, dlopen, [LIBS="$LIBS -ldl";
+ AC_DEFINE(HAVE_LIBDL)])
+@@ -1459,6 +1456,24 @@
+ AC_DEFINE(BROKEN_NISPLUS_INCLUDE_FILES)
+ fi
+
++
++################################################
++# check for CUPS support
++AC_MSG_CHECKING(whether to use CUPS)
++AC_ARG_WITH(cups,
++[ --with-cups Include CUPS support
++ --without-cups Don't include CUPS support (default)],
++[ case "$withval" in
++ yes)
++ AC_MSG_RESULT(yes)
++ AC_CHECK_LIB(cups, httpConnect)
++ ;;
++ *)
++ AC_MSG_RESULT(no)
++ ;;
++ esac ],
++ AC_MSG_RESULT(no)
++)
+
+ #################################################
+ # check for smbwrapper support
diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab
index cdeda5eb447..ae64e98a3e8 100644
--- a/net/samba/patches/patch-ab
+++ b/net/samba/patches/patch-ab
@@ -1,14 +1,154 @@
-$NetBSD: patch-ab,v 1.9 2001/05/10 09:00:23 abs Exp $
+$NetBSD: patch-ab,v 1.10 2001/05/14 18:56:17 jlam Exp $
---- acconfig.h.orig Wed Apr 18 00:00:52 2001
-+++ acconfig.h
-@@ -79,7 +79,9 @@
- #undef SIZEOF_INO_T
- #undef SIZEOF_OFF_T
- #undef STAT_STATVFS64
-+#undef HAVE_READLINE
- #undef HAVE_LIBREADLINE
-+#undef HAVE_LIBEDIT
- #undef HAVE_KERNEL_OPLOCKS
- #undef HAVE_IRIX_SPECIFIC_CAPABILITIES
- #undef HAVE_INT16_FROM_RPC_RPC_H
+--- configure.orig Tue Apr 17 01:44:24 2001
++++ configure
+@@ -40,6 +40,9 @@
+ --with-readline[=DIR] Look for readline include/libs in DIR
+ --without-readline Don't include readline support"
+ ac_help="$ac_help
++ --with-cups Include CUPS support
++ --without-cups Don't include CUPS support (default)"
++ac_help="$ac_help
+ --with-smbwrapper Include SMB wrapper support
+ --without-smbwrapper Don't include SMB wrapper support (default)"
+ ac_help="$ac_help
+@@ -3870,58 +3873,9 @@
+ fi
+
+
+-# we need libcups for CUPS support...
+-echo $ac_n "checking for httpConnect in -lcups""... $ac_c" 1>&6
+-echo "configure:3876: checking for httpConnect in -lcups" >&5
+-ac_lib_var=`echo cups'_'httpConnect | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- ac_save_LIBS="$LIBS"
+-LIBS="-lcups $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 3884 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error. */
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char httpConnect();
+-
+-int main() {
+-httpConnect()
+-; return 0; }
+-EOF
+-if { (eval echo configure:3895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+- rm -rf conftest*
+- eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+- echo "configure: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- rm -rf conftest*
+- eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+- echo "$ac_t""yes" 1>&6
+- ac_tr_lib=HAVE_LIB`echo cups | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+- cat >> confdefs.h <<EOF
+-#define $ac_tr_lib 1
+-EOF
+-
+- LIBS="-lcups $LIBS"
+-
+-else
+- echo "$ac_t""no" 1>&6
+-fi
+-
+-
+ # we need libdl for PAM and the new VFS code
+ echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+-echo "configure:3925: checking for dlopen in -ldl" >&5
++echo "configure:3879: checking for dlopen in -ldl" >&5
+ ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -11044,10 +10998,78 @@
+ fi
+
+
++################################################
++# check for CUPS support
++echo $ac_n "checking whether to use CUPS""... $ac_c" 1>&6
++echo "configure:11005: checking whether to use CUPS" >&5
++# Check whether --with-cups or --without-cups was given.
++if test "${with_cups+set}" = set; then
++ withval="$with_cups"
++ case "$withval" in
++ yes)
++ echo "$ac_t""yes" 1>&6
++ echo $ac_n "checking for httpConnect in -lcups""... $ac_c" 1>&6
++echo "configure:11013: checking for httpConnect in -lcups" >&5
++ac_lib_var=`echo cups'_'httpConnect | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++ echo $ac_n "(cached) $ac_c" 1>&6
++else
++ ac_save_LIBS="$LIBS"
++LIBS="-lcups $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 11021 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error. */
++/* We use char because int might match the return type of a gcc2
++ builtin and then its argument prototype would still apply. */
++char httpConnect();
++
++int main() {
++httpConnect()
++; return 0; }
++EOF
++if { (eval echo configure:11032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++ rm -rf conftest*
++ eval "ac_cv_lib_$ac_lib_var=yes"
++else
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
++ rm -rf conftest*
++ eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++ echo "$ac_t""yes" 1>&6
++ ac_tr_lib=HAVE_LIB`echo cups | sed -e 's/[^a-zA-Z0-9_]/_/g' \
++ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
++ cat >> confdefs.h <<EOF
++#define $ac_tr_lib 1
++EOF
++
++ LIBS="-lcups $LIBS"
++
++else
++ echo "$ac_t""no" 1>&6
++fi
++
++ ;;
++ *)
++ echo "$ac_t""no" 1>&6
++ ;;
++ esac
++else
++ echo "$ac_t""no" 1>&6
++
++fi
++
++
+ #################################################
+ # check for smbwrapper support
+ echo $ac_n "checking whether to use smbwrapper""... $ac_c" 1>&6
+-echo "configure:11051: checking whether to use smbwrapper" >&5
++echo "configure:11073: checking whether to use smbwrapper" >&5
+ # Check whether --with-smbwrapper or --without-smbwrapper was given.
+ if test "${with_smbwrapper+set}" = set; then
+ withval="$with_smbwrapper"
diff --git a/net/samba/pkg/DEINSTALL b/net/samba/pkg/DEINSTALL
index 4a564fd8d8c..4f20195cc8a 100644
--- a/net/samba/pkg/DEINSTALL
+++ b/net/samba/pkg/DEINSTALL
@@ -1,27 +1,97 @@
#!/bin/sh
#
-# $NetBSD: DEINSTALL,v 1.2 2000/06/26 23:07:37 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.3 2001/05/14 18:56:17 jlam Exp $
PKGNAME=$1
STAGE=$2
-SAMBA_PRIVATE=@SAMBA_PRIVATE@
+CAT="@CAT@"
+RM="@RM@"
+RMDIR="@RMDIR@"
+TRUE="@TRUE@"
+
+SAMBA_PRIVATE="@SAMBA_PRIVATE@"
+SAMBA_LOCKDIR="@SAMBA_LOCKDIR@"
+ROOT_GROUP="@ROOT_GROUP@"
+SAMPLECONFDIR=${PKG_PREFIX}/share/examples/samba
+CONFDIR=@SAMBA_ETCDIR@
+CONFFILES="smb.conf"
case ${STAGE} in
DEINSTALL)
+ # Remove configuration files if they don't differ from the default
+ # config file.
+ #
+ for file in ${CONFFILES}
+ do
+ FILE=${CONFDIR}/${file}
+ SAMPLEFILE=${SAMPLECONFDIR}/${file}.sample
+ if diff -q ${FILE} ${SAMPLEFILE} >/dev/null
+ then
+ ${RM} -f ${FILE}
+ fi
+ done
;;
+
POST-DEINSTALL)
- cat << EOF
+ modified_files=''
+ for file in ${CONFFILES}
+ do
+ FILE=${CONFDIR}/${file}
+ if [ -f ${FILE} ]
+ then
+ modified_files="${modified_files} ${FILE}"
+ fi
+ done
+
+ ${RMDIR} ${SAMBA_PRIVATE} 2>/dev/null || ${TRUE}
+ ${RMDIR} ${SAMBA_LOCKDIR} 2>/dev/null || ${TRUE}
+ ${RMDIR} ${CONFDIR} 2>/dev/null || ${TRUE}
+
+ existing_dirs=''
+ for dir in ${CONFDIR} ${SAMBA_PRIVATE} ${SAMBA_LOCKDIR}
+ do
+ if [ -d ${dir} ]
+ then
+ existing_dirs="${existing_dirs} ${dir}"
+ fi
+ done
+
+ ${CAT} << EOF
===========================================================================
-If you won't be using ${PKGNAME} any longer, you may want to remove the
-following files:
-
- ${SAMBA_PRIVATE}/smbpasswd
+If you won't be using ${PKGNAME} any longer, you may want to remove:
+EOF
+ if [ -n "${modified_files}" ]
+ then
+ ${CAT} << EOF
+
+ * the following files:
+
+EOF
+ for file in ${modified_files}
+ do
+ echo " ${file}"
+ done
+ fi
+ if [ -n "${existing_dirs}" ]
+ then
+ ${CAT} << EOF
+
+ * the following directories:
+
+EOF
+ for dir in ${existing_dirs}
+ do
+ echo " ${dir}"
+ done
+ fi
+ ${CAT} << EOF
===========================================================================
EOF
;;
+
*)
- echo "Unexpected argument: $2"
+ echo "Unexpected argument: ${STAGE}"
exit 1
;;
esac
diff --git a/net/samba/pkg/INSTALL b/net/samba/pkg/INSTALL
index 0b365aeb0ba..6e960ac774a 100644
--- a/net/samba/pkg/INSTALL
+++ b/net/samba/pkg/INSTALL
@@ -1,32 +1,59 @@
#!/bin/sh
#
-# $NetBSD: INSTALL,v 1.4 2000/05/17 09:22:28 veego Exp $
+# $NetBSD: INSTALL,v 1.5 2001/05/14 18:56:17 jlam Exp $
PKGNAME=$1
STAGE=$2
-SAMBA_PRIVATE=@SAMBA_PRIVATE@
-ROOT_GROUP=@ROOT_GROUP@
+CAT="@CAT@"
+CHMOD="@CHMOD@"
+CHOWN="@CHOWN@"
+CP="@CP@"
+MKDIR="@MKDIR@"
+RM="@RM@"
+
+SAMBA_PRIVATE="@SAMBA_PRIVATE@"
+SAMBA_LOCKDIR="@SAMBA_LOCKDIR@"
+SAMPLECONFDIR=${PKG_PREFIX}/share/examples/samba
+CONFDIR=@SAMBA_ETCDIR@
+CONFFILES="smb.conf"
case ${STAGE} in
PRE-INSTALL)
;;
+
POST-INSTALL)
- mkdir -p ${SAMBA_PRIVATE}
+ ${MKDIR} -p ${CONFDIR} ${SAMBA_PRIVATE} ${SAMBA_LOCKDIR}
+ echo "Installing configuration files:"
+ for file in ${CONFFILES}
+ do
+ FILE=${CONFDIR}/${file}
+ SAMPLEFILE=${SAMPLECONFDIR}/${file}.sample
+ if [ -f ${FILE} ]
+ then
+ echo " ${FILE} already exists"
+ else
+ echo " ${FILE}"
+ ${CP} ${SAMPLEFILE} ${FILE}
+ ${CHMOD} 644 ${FILE}
+ fi
+ done
+
+ # Create SMB password file
if [ ! -f ${SAMBA_PRIVATE}/smbpasswd ]
then
echo -n "Creating ${SAMBA_PRIVATE}/smbpasswd..."
- chown -R root ${SAMBA_PRIVATE}
- chgrp -R ${ROOT_GROUP} ${SAMBA_PRIVATE}
- cat /etc/passwd | ${PKG_PREFIX}/bin/mksmbpasswd.sh \
- >${SAMBA_PRIVATE}/smbpasswd
- chmod 500 ${SAMBA_PRIVATE}
- chmod 600 ${SAMBA_PRIVATE}/smbpasswd
+ ${CHOWN} -R 0:0 ${SAMBA_PRIVATE}
+ ${CAT} /etc/passwd | ${PKG_PREFIX}/sbin/mksmbpasswd \
+ > ${SAMBA_PRIVATE}/smbpasswd
+ ${CHMOD} 600 ${SAMBA_PRIVATE}/smbpasswd
+ ${CHMOD} 500 ${SAMBA_PRIVATE}
echo "done."
fi
;;
+
*)
- echo "Unexpected argument: $2"
+ echo "Unexpected argument: ${STAGE}"
exit 1
;;
esac
diff --git a/net/samba/pkg/PLIST b/net/samba/pkg/PLIST
index c6d3033cce6..da0ad32fbbf 100644
--- a/net/samba/pkg/PLIST
+++ b/net/samba/pkg/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.22 2001/04/18 12:54:47 tron Exp $
-bin/addtosmbpass
+@comment $NetBSD: PLIST,v 1.23 2001/05/14 18:56:17 jlam Exp $
bin/convert_smbpasswd
bin/make_printerdef
bin/make_smbcodepage
bin/make_unicodemap
-bin/mksmbpasswd.sh
bin/nmblookup
bin/rpcclient
+bin/smbcacls
bin/smbclient
+bin/smbcontrol
bin/smbpasswd
bin/smbspool
bin/smbstatus
@@ -22,6 +22,7 @@ lib/codepages/codepage.737
lib/codepages/codepage.775
lib/codepages/codepage.850
lib/codepages/codepage.852
+lib/codepages/codepage.857
lib/codepages/codepage.861
lib/codepages/codepage.866
lib/codepages/codepage.932
@@ -30,8 +31,10 @@ lib/codepages/codepage.949
lib/codepages/codepage.950
lib/codepages/unicode_map.437
lib/codepages/unicode_map.737
+lib/codepages/unicode_map.775
lib/codepages/unicode_map.850
lib/codepages/unicode_map.852
+lib/codepages/unicode_map.857
lib/codepages/unicode_map.861
lib/codepages/unicode_map.866
lib/codepages/unicode_map.932
@@ -39,20 +42,28 @@ lib/codepages/unicode_map.936
lib/codepages/unicode_map.949
lib/codepages/unicode_map.950
lib/codepages/unicode_map.ISO8859-1
+lib/codepages/unicode_map.ISO8859-13
+lib/codepages/unicode_map.ISO8859-15
lib/codepages/unicode_map.ISO8859-2
lib/codepages/unicode_map.ISO8859-5
lib/codepages/unicode_map.ISO8859-7
+lib/codepages/unicode_map.ISO8859-9
lib/codepages/unicode_map.KOI8-R
+man/man1/findsmb.1
man/man1/make_smbcodepage.1
man/man1/make_unicodemap.1
man/man1/nmblookup.1
+man/man1/rpcclient.1
+man/man1/smbcacls.1
man/man1/smbclient.1
+man/man1/smbcontrol.1
man/man1/smbrun.1
man/man1/smbsh.1
man/man1/smbstatus.1
man/man1/smbtar.1
man/man1/testparm.1
man/man1/testprns.1
+man/man1/wbinfo.1
man/man5/lmhosts.5
man/man5/smb.conf.5
man/man5/smbpasswd.5
@@ -65,91 +76,97 @@ man/man8/smbpasswd.8
man/man8/smbspool.8
man/man8/smbumount.8
man/man8/swat.8
+man/man8/winbindd.8
+sbin/mksmbpasswd
sbin/nmbd
sbin/smbd
sbin/swat
+share/doc/html/samba/Samba-Server-FAQ-1.html
+share/doc/html/samba/Samba-Server-FAQ-2.html
+share/doc/html/samba/Samba-Server-FAQ.html
+share/doc/html/samba/Samba-meta-FAQ-1.html
+share/doc/html/samba/Samba-meta-FAQ-2.html
+share/doc/html/samba/Samba-meta-FAQ-3.html
+share/doc/html/samba/Samba-meta-FAQ-4.html
+share/doc/html/samba/Samba-meta-FAQ-5.html
+share/doc/html/samba/Samba-meta-FAQ-6.html
+share/doc/html/samba/Samba-meta-FAQ.html
+share/doc/html/samba/sambafaq-1.html
+share/doc/html/samba/sambafaq-2.html
+share/doc/html/samba/sambafaq-3.html
+share/doc/html/samba/sambafaq-4.html
+share/doc/html/samba/sambafaq-5.html
+share/doc/html/samba/sambafaq.html
share/doc/samba/NT4-Locking.reg
-share/doc/samba/NT4-Locking.txt
share/doc/samba/NT4_PlainPassword.reg
-share/doc/samba/THANKS
share/doc/samba/Win2000_PlainPassword.reg
share/doc/samba/Win95_PlainPassword.reg
share/doc/samba/Win98_PlainPassword.reg
share/doc/samba/Win9X-CacheHandling.reg
+share/doc/samba/WinME_PlainPassword.reg
share/doc/samba/WindowsTerminalServer.reg
share/doc/samba/announce
-share/doc/samba/faq/Samba-Server-FAQ-1.html
-share/doc/samba/faq/Samba-Server-FAQ-2.html
-share/doc/samba/faq/Samba-Server-FAQ.html
-share/doc/samba/faq/Samba-meta-FAQ-1.html
-share/doc/samba/faq/Samba-meta-FAQ-2.html
-share/doc/samba/faq/Samba-meta-FAQ-3.html
-share/doc/samba/faq/Samba-meta-FAQ-4.html
-share/doc/samba/faq/Samba-meta-FAQ-5.html
-share/doc/samba/faq/Samba-meta-FAQ-6.html
-share/doc/samba/faq/Samba-meta-FAQ.html
-share/doc/samba/faq/sambafaq-1.html
-share/doc/samba/faq/sambafaq-2.html
-share/doc/samba/faq/sambafaq-3.html
-share/doc/samba/faq/sambafaq-4.html
-share/doc/samba/faq/sambafaq-5.html
-share/doc/samba/faq/sambafaq.html
-share/doc/samba/textdocs/Application_Serving.txt
-share/doc/samba/textdocs/BROWSING-Config.txt
-share/doc/samba/textdocs/BROWSING.txt
-share/doc/samba/textdocs/BUGS.txt
-share/doc/samba/textdocs/CRLF-LF-Conversions.txt
-share/doc/samba/textdocs/CVS_ACCESS.txt
-share/doc/samba/textdocs/DHCP-Server-Configuration.txt
-share/doc/samba/textdocs/DIAGNOSIS.txt
-share/doc/samba/textdocs/DNIX.txt
-share/doc/samba/textdocs/DOMAIN.txt
-share/doc/samba/textdocs/DOMAIN_CONTROL.txt
-share/doc/samba/textdocs/DOMAIN_MEMBER.txt
-share/doc/samba/textdocs/ENCRYPTION.txt
-share/doc/samba/textdocs/Faxing.txt
-share/doc/samba/textdocs/File-Cacheing.txt
-share/doc/samba/textdocs/GOTCHAS.txt
-share/doc/samba/textdocs/HINTS.txt
-share/doc/samba/textdocs/INSTALL.sambatar
-share/doc/samba/textdocs/MIRRORS.txt
-share/doc/samba/textdocs/Macintosh_Clients.txt
-share/doc/samba/textdocs/NT-Guest-Access.txt
-share/doc/samba/textdocs/NTDOMAIN.txt
-share/doc/samba/textdocs/NT_Security.txt
-share/doc/samba/textdocs/NetBIOS.txt
-share/doc/samba/textdocs/OS2-Client-HOWTO.txt
-share/doc/samba/textdocs/PRINTER_DRIVER.txt
-share/doc/samba/textdocs/PROFILES.txt
-share/doc/samba/textdocs/PROJECTS
-share/doc/samba/textdocs/Passwords.txt
-share/doc/samba/textdocs/Printing.txt
-share/doc/samba/textdocs/README.DCEDFS
-share/doc/samba/textdocs/README.jis
-share/doc/samba/textdocs/README.sambatar
-share/doc/samba/textdocs/Recent-FAQs.txt
-share/doc/samba/textdocs/RoutedNetworks.txt
-share/doc/samba/textdocs/SCO.txt
-share/doc/samba/textdocs/SMBTAR.notes
-share/doc/samba/textdocs/SSLeay.txt
-share/doc/samba/textdocs/Speed.txt
-share/doc/samba/textdocs/Speed2.txt
-share/doc/samba/textdocs/Support.txt
-share/doc/samba/textdocs/Tracing.txt
-share/doc/samba/textdocs/UNIX-SMB.txt
-share/doc/samba/textdocs/UNIX_INSTALL.txt
-share/doc/samba/textdocs/UNIX_SECURITY.txt
-share/doc/samba/textdocs/Win95.txt
-share/doc/samba/textdocs/WinNT.txt
-share/doc/samba/textdocs/cifsntdomain.txt
-share/doc/samba/textdocs/security_level.txt
-share/doc/samba/textdocs/smbmount.txt
+share/doc/samba/Application_Serving.txt
+share/doc/samba/BROWSING-Config.txt
+share/doc/samba/BROWSING.txt
+share/doc/samba/BUGS.txt
+share/doc/samba/CVS_ACCESS.txt
+share/doc/samba/DHCP-Server-Configuration.txt
+share/doc/samba/DIAGNOSIS.txt
+share/doc/samba/DNIX.txt
+share/doc/samba/DOMAIN.txt
+share/doc/samba/Faxing.txt
+share/doc/samba/GOTCHAS.txt
+share/doc/samba/HINTS.txt
+share/doc/samba/INSTALL.sambatar
+share/doc/samba/Imprints.txt
+share/doc/samba/MIRRORS.txt
+share/doc/samba/Macintosh_Clients.txt
+share/doc/samba/NTDOMAIN.txt
+share/doc/samba/NetBIOS.txt
+share/doc/samba/PRINTER_DRIVER.txt
+share/doc/samba/PROFILES.txt
+share/doc/samba/PROJECTS
+share/doc/samba/Passwords.txt
+share/doc/samba/Printing.txt
+share/doc/samba/README.DCEDFS
+share/doc/samba/README.jis
+share/doc/samba/README.sambatar
+share/doc/samba/Recent-FAQs.txt
+share/doc/samba/RoutedNetworks.txt
+share/doc/samba/SCO.txt
+share/doc/samba/SMBTAR.notes
+share/doc/samba/SSLeay.txt
+share/doc/samba/Speed.txt
+share/doc/samba/Speed2.txt
+share/doc/samba/Support.txt
+share/doc/samba/Tracing.txt
+share/doc/samba/UNIX-SMB.txt
+share/doc/samba/UNIX_SECURITY.txt
+share/doc/samba/Win95.txt
+share/doc/samba/WinNT.txt
+share/doc/samba/cifsntdomain.txt
+share/doc/samba/kurs.pdf
+share/doc/samba/kurs.tex
+share/doc/samba/logo.ps
+share/doc/samba/samba-pdc-faq.txt
+share/doc/samba/samba-pdc-howto.txt
+share/doc/samba/security_level.txt
share/examples/samba/README
-share/examples/samba/autofs/README
+share/examples/samba/VFS/Makefile
+share/examples/samba/VFS/README
+share/examples/samba/VFS/audit.c
+share/examples/samba/VFS/skel.c
+share/examples/samba/appliance/Makefile
+share/examples/samba/appliance/README
+share/examples/samba/appliance/appliance.spec
+share/examples/samba/appliance/build.sh
+share/examples/samba/appliance/smb.conf-appliance
share/examples/samba/autofs/auto.a
share/examples/samba/dce-dfs/README
share/examples/samba/dce-dfs/smb.conf
share/examples/samba/misc/extra_smbstatus
+share/examples/samba/misc/swat.pl
share/examples/samba/misc/wall.perl
share/examples/samba/printer-accounting/README
share/examples/samba/printer-accounting/acct-all
@@ -158,6 +175,7 @@ share/examples/samba/printer-accounting/hp5-redir
share/examples/samba/printer-accounting/lp-acct
share/examples/samba/printer-accounting/printcap
share/examples/samba/printing/smbprint
+share/examples/samba/printing/smbprint.newer
share/examples/samba/printing/smbprint.sysv
share/examples/samba/simple/README
share/examples/samba/simple/smb.conf
@@ -177,18 +195,28 @@ share/examples/samba/validchars/nwdos70.out
share/examples/samba/validchars/readme
share/examples/samba/validchars/validchr.c
share/examples/samba/validchars/validchr.com
-share/examples/samba/wins_hook/README
-share/examples/samba/wins_hook/dns_update
share/swat/help/DOMAIN_MEMBER.html
+share/swat/help/ENCRYPTION.html
share/swat/help/NT_Security.html
+share/swat/help/OS2-Client-HOWTO.html
+share/swat/help/Samba-HOWTO-Collection.html
+share/swat/help/Samba-PDC-HOWTO.html
+share/swat/help/UNIX_INSTALL.html
+share/swat/help/findsmb.1.html
share/swat/help/lmhosts.5.html
share/swat/help/make_smbcodepage.1.html
-share/swat/help/make_unicodemap.1.html
+share/swat/help/msdfs_setup.html
share/swat/help/nmbd.8.html
share/swat/help/nmblookup.1.html
+share/swat/help/printer_driver2.html
+share/swat/help/rpcclient.1.html
+share/swat/help/samba-pdc-faq.html
+share/swat/help/samba-pdc-howto.html
share/swat/help/samba.7.html
share/swat/help/smb.conf.5.html
+share/swat/help/smbcacls.1.html
share/swat/help/smbclient.1.html
+share/swat/help/smbcontrol.1.html
share/swat/help/smbd.8.html
share/swat/help/smbmnt.8.html
share/swat/help/smbmount.8.html
@@ -199,11 +227,14 @@ share/swat/help/smbsh.1.html
share/swat/help/smbspool.8.html
share/swat/help/smbstatus.1.html
share/swat/help/smbtar.1.html
+share/swat/help/smbumount.8.html
share/swat/help/swat.8.html
share/swat/help/testparm.1.html
share/swat/help/testprns.1.html
+share/swat/help/wbinfo.1.html
share/swat/help/welcome.html
-share/swat/help/welcome.ja_JP.ujis.html
+share/swat/help/winbind.html
+share/swat/help/winbindd.8.html
share/swat/images/globals.gif
share/swat/images/home.gif
share/swat/images/passwd.gif
@@ -380,7 +411,6 @@ share/swat/using_samba/this_edition.html
@dirrm share/swat/images
@dirrm share/swat/help
@dirrm share/swat
-@dirrm share/examples/samba/wins_hook
@dirrm share/examples/samba/validchars
@dirrm share/examples/samba/tridge
@dirrm share/examples/samba/thoralf
@@ -391,8 +421,9 @@ share/swat/using_samba/this_edition.html
@dirrm share/examples/samba/misc
@dirrm share/examples/samba/dce-dfs
@dirrm share/examples/samba/autofs
+@dirrm share/examples/samba/appliance
+@dirrm share/examples/samba/VFS
@dirrm share/examples/samba
-@dirrm share/doc/samba/textdocs
-@dirrm share/doc/samba/faq
@dirrm share/doc/samba
+@dirrm share/doc/html/samba
@dirrm lib/codepages
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 05:22:35 +0000