Update "samba" package to version 2.0.8:

 Samba 2.0.8 is a security bugfix release. Previous versions of Samba
 had a bug with the handling of temporary files that allows local users
 to destroy data on local devices. This bug was discovered during a
 routine security audit by Caldera. While no exploitation of this bug
 is known to have occurred it is fairly easy to exploit so sites with
 untrusted local users should take the threat seriously.
Unfortunately we lose japanese language support by this update.

5 files changed, 63 insertions, 236 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 95d80094502..d111d34eca6 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,34 +1,36 @@
-# $NetBSD: Makefile,v 1.46 2001/03/27 03:20:11 hubertf Exp $
-
-DISTNAME=		samba-2.0.7-ja-1.3
-PKGNAME=		samba-2.0.7.1.3
-WRKSRC=			${WRKDIR}/${DISTNAME}/source
-CATEGORIES=		net
-MASTER_SITES=		ftp://ftp.samba.gr.jp/pub/samba-jp/samba-2.0.7-ja/
-
-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.h)
+# $NetBSD: Makefile,v 1.47 2001/04/18 12:54:47 tron Exp $
+
+DISTNAME=	samba-2.0.8
+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
 
-CONFLICTS+=		samba-2.0.7-ja-*
-
-USE_LIBINTL=		# defined
-GNU_CONFIGURE=		# defined
+USE_LIBINTL=	YES
+GNU_CONFIGURE=	YES
 
 .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
+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
 
 .if ${OPSYS} == "SunOS"
 ROOT_GROUP?=		root
@@ -36,19 +38,19 @@ ROOT_GROUP?=		root
 ROOT_GROUP?=		wheel
 .endif
 
-MAKE_ENV+=		ETCDIR=${SAMBA_ETCDIR}
-MAKE_ENV+=		LOGDIR=${SAMBA_LOGDIR}
+MAKE_ENV+=	ETCDIR=${SAMBA_ETCDIR}
+MAKE_ENV+=	LOGDIR=${SAMBA_LOGDIR}
 
-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_ARGS+=--with-lockdir=${SAMBA_LOCKDIR} \
+		--with-privatedir=${SAMBA_PRIVATE} \
+		--with-swatdir=${PREFIX}/share/swat \
+		--with-i18n-swat \
+		--with-sambabook=${PREFIX}/share/swat/using_samba
 
-PLIST_SUBST+=		SAMBA_PRIVATE=${SAMBA_PRIVATE}
+PLIST_SUBST+=	SAMBA_PRIVATE=${SAMBA_PRIVATE}
 
-INSTALL_FILE=		${WRKDIR}/INSTALL
-DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
+INSTALL_FILE=	${WRKDIR}/INSTALL
+DEINSTALL_FILE=	${WRKDIR}/DEINSTALL
 
 pre-configure:
 	cd ${WRKSRC}; ${LOCALBASE}/bin/autoreconf
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 1a2870d1cd8..b5289243c94 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.1 2001/04/17 11:53:17 agc Exp $
+$NetBSD: distinfo,v 1.2 2001/04/18 12:54:47 tron Exp $
 
-MD5 (samba-2.0.7-ja-1.3.tar.gz) = 39fe6bdad751b9d3af4abcb83191907d
-SHA1 (patch-aa) = a3392d1ebbdad7843e03dfd4ab0bbd647f479470
+SHA1 (samba-2.0.8.tar.gz) = f4bcfbc4e357abea9dd76f64cb6446a458024158
+Size (samba-2.0.8.tar.gz) = 40 bytes
+SHA1 (patch-aa) = 3639b63dbad9a36f384d20e1e41c2284a1a0b2ad
 SHA1 (patch-ac) = b7c77f8658732066f7465b9a3b1703d480d1bdde
-SHA1 (patch-ad) = ab69aad568d3ceb60f72fba4ae4ec299a65c277f
+SHA1 (patch-ad) = 04f0d600ad8c43e75edd6dcb91db5993731edd30
 SHA1 (patch-ae) = 2484733df1d605a8e45db6c8a7ad8deb6b5b1b65
 SHA1 (patch-af) = 5edefa227b74fc8cb70e795c81e9648711df450c
diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa
index 1d0ac65b721..c2cbc5b9d4b 100644
--- a/net/samba/patches/patch-aa
+++ b/net/samba/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2000/09/03 09:17:00 kei Exp $
+$NetBSD: patch-aa,v 1.12 2001/04/18 12:54:47 tron Exp $
 
---- Makefile.in.orig	Thu Jun  8 13:31:59 2000
-+++ Makefile.in	Sun Sep  3 06:23:06 2000
-@@ -26,10 +26,12 @@
+--- Makefile.in.orig	Thu Mar 16 23:57:08 2000
++++ Makefile.in	Wed Apr 18 14:29:22 2001
+@@ -25,10 +25,12 @@
  BINDIR = @bindir@
  # we don't use sbindir because we want full compatibility with
  # the previous releases of Samba
@@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.11 2000/09/03 09:17:00 kei Exp $
  SAMBABOOK = @sambabook@
  
  # The permissions to give the executables
-@@ -38,12 +40,12 @@
+@@ -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))
@@ -35,12 +35,12 @@ $NetBSD: patch-aa,v 1.11 2000/09/03 09:17:00 kei Exp $
  # This is where smbpasswd et al go
  PRIVATEDIR = @privatedir@
  
-@@ -470,14 +472,14 @@
+@@ -463,14 +465,14 @@
  
  installdirs:
  	$(SHELL) $(srcdir)/install-sh -d -m $(INSTALLPERMS) \
--	$(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(CODEPAGEDIR) ${SWATDIR} ${SAMBABOOK}
-+	$(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(ETCDIR) $(LOGDIR) $(CODEPAGEDIR) ${SWATDIR} ${SAMBABOOK}
+-	$(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)
@@ -54,7 +54,7 @@ $NetBSD: patch-aa,v 1.11 2000/09/03 09:17:00 kei Exp $
  
  installscripts: installdirs
  	@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
-@@ -502,8 +504,8 @@
+@@ -495,8 +497,8 @@
  	@$(SHELL) $(srcdir)/script/uninstallman.sh $(MANDIR) $(srcdir)
  
  uninstallbin:
diff --git a/net/samba/patches/patch-ad b/net/samba/patches/patch-ad
index 0d830ec4ba3..cbb3869aec1 100644
--- a/net/samba/patches/patch-ad
+++ b/net/samba/patches/patch-ad
@@ -1,17 +1,17 @@
-$NetBSD: patch-ad,v 1.3 2001/04/07 10:00:42 hubertf Exp $
+$NetBSD: patch-ad,v 1.4 2001/04/18 12:54:47 tron Exp $
 
---- client/client.c.orig	Wed May 10 16:28:49 2000
-+++ client/client.c
-@@ -1165,7 +1165,7 @@
+--- client/client.c.orig	Wed Apr 18 01:00:52 2001
++++ client/client.c	Wed Apr 18 14:32:09 2001
+@@ -1180,7 +1180,7 @@
  				"find . -name \"%s\" -print > %s",p,tmpname);
  		else
  			slprintf(cmd,sizeof(pstring)-1,
 -				"find . -maxdepth 1 -name \"%s\" -print > %s",p,tmpname);
 +				"ls -1 %s > %s",p,tmpname);
  		system(cmd);
+ 		close(fd);
  
- 		f = sys_fopen(tmpname,"r");
-@@ -1599,22 +1599,19 @@
+@@ -1615,22 +1615,19 @@
  	return True;
  }
  
@@ -38,7 +38,7 @@ $NetBSD: patch-ad,v 1.3 2001/04/07 10:00:42 hubertf Exp $
  	}
  }
  #  endif 
-@@ -1675,7 +1672,7 @@
+@@ -1691,7 +1688,7 @@
    {"setmode",cmd_setmode,"filename <setmode string> change modes of file",{COMPL_REMOTE,COMPL_NONE}},
    {"help",cmd_help,"[command] give help on a command",{COMPL_NONE,COMPL_NONE}},
    {"?",cmd_help,"[command] give help on a command",{COMPL_NONE,COMPL_NONE}},
@@ -47,7 +47,7 @@ $NetBSD: patch-ad,v 1.3 2001/04/07 10:00:42 hubertf Exp $
    {"history",cmd_history,"displays the command history",{COMPL_NONE,COMPL_NONE}},
  #endif
    {"!",NULL,"run a shell command on the local system",{COMPL_NONE,COMPL_NONE}},
-@@ -1735,7 +1732,7 @@
+@@ -1751,7 +1748,7 @@
  	}
  }
  
@@ -56,7 +56,7 @@ $NetBSD: patch-ad,v 1.3 2001/04/07 10:00:42 hubertf Exp $
  /****************************************************************************
  wait for keyboard activity, swallowing network packets
  ****************************************************************************/
-@@ -1814,7 +1811,7 @@
+@@ -1830,7 +1827,7 @@
  	pstring line;
  	char *ptr;
  
@@ -65,7 +65,7 @@ $NetBSD: patch-ad,v 1.3 2001/04/07 10:00:42 hubertf Exp $
  /* Minimal readline support, 29Jun1999, s.xenitellis@rhbnc.ac.uk */
  #ifdef PROMPTSIZE
  #undef PROMPTSIZE
-@@ -1828,7 +1825,7 @@
+@@ -1844,7 +1841,7 @@
  	while (!feof(stdin)) {
  		fstring tok;
  		int i;
@@ -74,7 +74,7 @@ $NetBSD: patch-ad,v 1.3 2001/04/07 10:00:42 hubertf Exp $
  		if ( temp != (char *)NULL )
  		{
  			free( temp );	/* Free memory allocated every time by readline() */
-@@ -2215,7 +2212,7 @@
+@@ -2231,7 +2228,7 @@
  
  	DEBUGLEVEL = 2;
  
diff --git a/net/samba/pkg/PLIST b/net/samba/pkg/PLIST
index 240dc1ad38d..c6d3033cce6 100644
--- a/net/samba/pkg/PLIST
+++ b/net/samba/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2001/02/04 18:08:27 tron Exp $
+@comment $NetBSD: PLIST,v 1.22 2001/04/18 12:54:47 tron Exp $
 bin/addtosmbpass
 bin/convert_smbpasswd
 bin/make_printerdef
@@ -43,28 +43,6 @@ lib/codepages/unicode_map.ISO8859-2
 lib/codepages/unicode_map.ISO8859-5
 lib/codepages/unicode_map.ISO8859-7
 lib/codepages/unicode_map.KOI8-R
-lib/swat-i18n.txt
-man/ja/man1/make_smbcodepage.1
-man/ja/man1/make_unicodemap.1
-man/ja/man1/nmblookup.1
-man/ja/man1/smbclient.1
-man/ja/man1/smbrun.1
-man/ja/man1/smbsh.1
-man/ja/man1/smbstatus.1
-man/ja/man1/smbtar.1
-man/ja/man1/testparm.1
-man/ja/man1/testprns.1
-man/ja/man5/lmhosts.5
-man/ja/man5/smb.conf.5
-man/ja/man5/smbpasswd.5
-man/ja/man7/samba.7
-man/ja/man8/nmbd.8
-man/ja/man8/smbd.8
-man/ja/man8/smbmnt.8
-man/ja/man8/smbmount.8
-man/ja/man8/smbpasswd.8
-man/ja/man8/smbspool.8
-man/ja/man8/swat.8
 man/man1/make_smbcodepage.1
 man/man1/make_unicodemap.1
 man/man1/nmblookup.1
@@ -164,13 +142,9 @@ 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/sambafaq.txt
 share/doc/samba/textdocs/security_level.txt
 share/doc/samba/textdocs/smbmount.txt
 share/examples/samba/README
-share/examples/samba/add-delete-user-script/README
-share/examples/samba/add-delete-user-script/smb-useradd
-share/examples/samba/add-delete-user-script/smb-userdel
 share/examples/samba/autofs/README
 share/examples/samba/autofs/auto.a
 share/examples/samba/dce-dfs/README
@@ -188,22 +162,7 @@ share/examples/samba/printing/smbprint.sysv
 share/examples/samba/simple/README
 share/examples/samba/simple/smb.conf
 share/examples/samba/smb.conf.default
-share/examples/samba/smb.conf.default.ja
 share/examples/samba/smb.conf.sample
-share/examples/samba/smbchartool/COPYING.txt
-share/examples/samba/smbchartool/INSTALL.sh
-share/examples/samba/smbchartool/README
-share/examples/samba/smbchartool/capecho
-share/examples/samba/smbchartool/dot.bashrc.example
-share/examples/samba/smbchartool/gendir.pl
-share/examples/samba/smbchartool/gengaiji.pl
-share/examples/samba/smbchartool/genibmkanji.pl
-share/examples/samba/smbchartool/hexecho
-share/examples/samba/smbchartool/hextestkanji.tar.gz
-share/examples/samba/smbchartool/jcode.pl
-share/examples/samba/smbchartool/smbchartool.html
-share/examples/samba/smbchartool/smbfnconv
-share/examples/samba/smbchartool/smbfnconv.v1.9
 share/examples/samba/svr4-startup/README
 share/examples/samba/svr4-startup/samba.server
 share/examples/samba/thoralf/smb.conf
@@ -220,9 +179,6 @@ 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/locale/en/LC_MESSAGES/i18n_swat.mo
-share/locale/ja/LC_MESSAGES/i18n_swat.mo
-share/locale/ja_JP.SJIS/LC_MESSAGES/i18n_swat.mo
 share/swat/help/DOMAIN_MEMBER.html
 share/swat/help/NT_Security.html
 share/swat/help/lmhosts.5.html
@@ -258,127 +214,6 @@ share/swat/images/status.gif
 share/swat/images/viewconfig.gif
 share/swat/include/footer.html
 share/swat/include/header.html
-share/swat/include/header_css.html
-share/swat/ja/help/Application_Serving.txt.html
-share/swat/ja/help/BROWSING-Config.txt.html
-share/swat/ja/help/BROWSING.txt.html
-share/swat/ja/help/CRLF-LF-Conversions.txt.html
-share/swat/ja/help/CVS_ACCESS.txt.html
-share/swat/ja/help/DIAGNOSIS.txt.html
-share/swat/ja/help/DOMAIN.txt.html
-share/swat/ja/help/DOMAIN_MEMBER.txt.html
-share/swat/ja/help/ENCRYPTION.txt.html
-share/swat/ja/help/File-Cacheing.txt.html
-share/swat/ja/help/HowToUseSamba/1-18.html
-share/swat/ja/help/HowToUseSamba/1-19.html
-share/swat/ja/help/HowToUseSamba/1-6.html
-share/swat/ja/help/HowToUseSamba/MSNET1.GIF
-share/swat/ja/help/HowToUseSamba/MSNETW2.GIF
-share/swat/ja/help/HowToUseSamba/PRTCL95.GIF
-share/swat/ja/help/HowToUseSamba/SAMBA1.GIF
-share/swat/ja/help/HowToUseSamba/WGRPNT1.GIF
-share/swat/ja/help/HowToUseSamba/globals.gif
-share/swat/ja/help/HowToUseSamba/home.gif
-share/swat/ja/help/HowToUseSamba/index.html
-share/swat/ja/help/HowToUseSamba/passwd.gif
-share/swat/ja/help/HowToUseSamba/printers.gif
-share/swat/ja/help/HowToUseSamba/printtool1.gif
-share/swat/ja/help/HowToUseSamba/printtool2.gif
-share/swat/ja/help/HowToUseSamba/printtool3.gif
-share/swat/ja/help/HowToUseSamba/printtool4.gif
-share/swat/ja/help/HowToUseSamba/printtool5.gif
-share/swat/ja/help/HowToUseSamba/printtool6.gif
-share/swat/ja/help/HowToUseSamba/samba.gif
-share/swat/ja/help/HowToUseSamba/shares.gif
-share/swat/ja/help/HowToUseSamba/status.gif
-share/swat/ja/help/HowToUseSamba/swat1.gif
-share/swat/ja/help/HowToUseSamba/userhome.gif
-share/swat/ja/help/HowToUseSamba/userprofile.gif
-share/swat/ja/help/HowToUseSamba/viewconfig.gif
-share/swat/ja/help/HowToUseSamba/x-1-256.gif
-share/swat/ja/help/HowToUseSamba/x-2-256.gif
-share/swat/ja/help/HowToUseSamba/x-3-256.gif
-share/swat/ja/help/Macintosh_Clients.txt.html
-share/swat/ja/help/NT-Guest-Access.txt.html
-share/swat/ja/help/NTDOMAIN.txt.html
-share/swat/ja/help/NT_Security.html
-share/swat/ja/help/NetBIOS.txt.html
-share/swat/ja/help/PRINTER_DRIVER.txt.html
-share/swat/ja/help/PROFILES.txt.html
-share/swat/ja/help/Passwords.txt.html
-share/swat/ja/help/README.smbmount.txt.html
-share/swat/ja/help/Speed.txt.html
-share/swat/ja/help/Speed2.txt.html
-share/swat/ja/help/UNIX-SMB.txt.html
-share/swat/ja/help/UNIX_INSTALL.txt.html
-share/swat/ja/help/Win95.txt.html
-share/swat/ja/help/WinNT.txt.html
-share/swat/ja/help/encrypt-passwd.html
-share/swat/ja/help/lmhosts.5.html
-share/swat/ja/help/make_smbcodepage.1.html
-share/swat/ja/help/make_unicodemap.1.html
-share/swat/ja/help/nmbd.8.html
-share/swat/ja/help/nmblookup.1.html
-share/swat/ja/help/samba-func.html
-share/swat/ja/help/samba-j.html
-share/swat/ja/help/samba.7.html
-share/swat/ja/help/samba2.html
-share/swat/ja/help/sambafaq-1.html
-share/swat/ja/help/sambafaq-2.html
-share/swat/ja/help/sambafaq-3.html
-share/swat/ja/help/sambafaq-4.html
-share/swat/ja/help/sambafaq-5.html
-share/swat/ja/help/sambafaq.html
-share/swat/ja/help/security_level.txt.html
-share/swat/ja/help/smb.conf.5.html
-share/swat/ja/help/smbclient.1.html
-share/swat/ja/help/smbd.8.html
-share/swat/ja/help/smbmnt.8.html
-share/swat/ja/help/smbmount.8.html
-share/swat/ja/help/smbmount.txt.html
-share/swat/ja/help/smbpasswd.5.html
-share/swat/ja/help/smbpasswd.8.html
-share/swat/ja/help/smbrun.1.html
-share/swat/ja/help/smbsh.1.html
-share/swat/ja/help/smbspool.8.html
-share/swat/ja/help/smbstatus.1.html
-share/swat/ja/help/smbtar.1.html
-share/swat/ja/help/swat.8.html
-share/swat/ja/help/testparm.1.html
-share/swat/ja/help/testprns.1.html
-share/swat/ja/help/tuning.japanese.html
-share/swat/ja/help/welcome.html
-share/swat/ja/help/whatsamba.html
-share/swat/ja/images/globals.gif
-share/swat/ja/images/home.gif
-share/swat/ja/images/passwd.gif
-share/swat/ja/images/printers.gif
-share/swat/ja/images/samba.gif
-share/swat/ja/images/shares.gif
-share/swat/ja/images/status.gif
-share/swat/ja/images/viewconfig.gif
-share/swat/ja/include/footer.html
-share/swat/ja/include/header.JP1.html
-share/swat/ja/include/header.html
-share/swat/ja/include/header.nocss.html
-share/swat/ja/include/header.org.html
-share/swat/ja/include/header.sjis.html
-share/swat/ja/include/header_css.html
-share/swat/ja_JP.SJIS/help/welcome.html
-share/swat/ja_JP.SJIS/images/globals.gif
-share/swat/ja_JP.SJIS/images/home.gif
-share/swat/ja_JP.SJIS/images/passwd.gif
-share/swat/ja_JP.SJIS/images/printers.gif
-share/swat/ja_JP.SJIS/images/samba.gif
-share/swat/ja_JP.SJIS/images/shares.gif
-share/swat/ja_JP.SJIS/images/status.gif
-share/swat/ja_JP.SJIS/images/viewconfig.gif
-share/swat/ja_JP.SJIS/include/footer.html
-share/swat/ja_JP.SJIS/include/header.JP1.html
-share/swat/ja_JP.SJIS/include/header.html
-share/swat/ja_JP.SJIS/include/header.nocss.html
-share/swat/ja_JP.SJIS/include/header.org.html
-share/swat/ja_JP.SJIS/include/header_css.html
 share/swat/using_samba/appa_01.html
 share/swat/using_samba/appa_02.html
 share/swat/using_samba/appa_03.html
@@ -541,15 +376,6 @@ share/swat/using_samba/this_edition.html
 @dirrm share/swat/using_samba/gifs
 @dirrm share/swat/using_samba/figs
 @dirrm share/swat/using_samba
-@dirrm share/swat/ja_JP.SJIS/include
-@dirrm share/swat/ja_JP.SJIS/images
-@dirrm share/swat/ja_JP.SJIS/help
-@dirrm share/swat/ja_JP.SJIS
-@dirrm share/swat/ja/include
-@dirrm share/swat/ja/images
-@dirrm share/swat/ja/help/HowToUseSamba
-@dirrm share/swat/ja/help
-@dirrm share/swat/ja
 @dirrm share/swat/include
 @dirrm share/swat/images
 @dirrm share/swat/help
@@ -559,14 +385,12 @@ share/swat/using_samba/this_edition.html
 @dirrm share/examples/samba/tridge
 @dirrm share/examples/samba/thoralf
 @dirrm share/examples/samba/svr4-startup
-@dirrm share/examples/samba/smbchartool
 @dirrm share/examples/samba/simple
 @dirrm share/examples/samba/printing
 @dirrm share/examples/samba/printer-accounting
 @dirrm share/examples/samba/misc
 @dirrm share/examples/samba/dce-dfs
 @dirrm share/examples/samba/autofs
-@dirrm share/examples/samba/add-delete-user-script
 @dirrm share/examples/samba
 @dirrm share/doc/samba/textdocs
 @dirrm share/doc/samba/faq