Update ja-samba package to 2.2.7.2.1.0 (samba-2.2.7b-ja-1.0).

              Changelog of Samba2.2 Japanese Edition

                                                    Samba Users Group Japan

   Here is the fix list of Samba2.2 Japanese Edition.
   The sign of each line means:

   *: Fix of Samba Japanese Edition only
   x: Fix of sending a patch to Samba Team
   c: Fix of being commited a patch by Samba Team

samba-2.2.7b-ja-1.0
~~~~~~~~~~~~~~~~~~~
   Changes to the original version
      c Fixed a security problem which is fixed at samba 2.2.8a
                                                          [sugj-tech:5233]
      c Fixed using CIDR of 'hosts allow/deny' parameters [samba-jp:14286]

8 files changed, 8 insertions, 127 deletions

diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile
index 7a605e00f62..df189ed395f 100644
--- a/net/ja-samba/Makefile
+++ b/net/ja-samba/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/04/08 03:39:13 taca Exp $
+# $NetBSD: Makefile,v 1.13 2003/04/09 05:05:12 taca Exp $
 
 .include "Makefile.common"
 
-PKGNAME=		ja-samba-${SAMBA_BASE_VERS:S/a/.1/}.${SAMBA_JA_VERS}
-PKGREVISION=		2
+PKGNAME=		ja-samba-${SAMBA_BASE_VERS:S/b/.2/}.${SAMBA_JA_VERS}
 CATEGORIES=		net
 
 MAINTAINER=		tech-pkg-ja@jp.netbsd.org
diff --git a/net/ja-samba/Makefile.common b/net/ja-samba/Makefile.common
index f57dae6a63e..c3722374d1c 100644
--- a/net/ja-samba/Makefile.common
+++ b/net/ja-samba/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.1 2003/03/29 08:18:46 taca Exp $
+# $NetBSD: Makefile.common,v 1.2 2003/04/09 05:05:13 taca Exp $
 
 DISTNAME=		samba-${SAMBA_BASE_VERS}-ja-${SAMBA_JA_VERS}
-SAMBA_BASE_VERS=	2.2.7a
-SAMBA_JA_VERS=		1.1
+SAMBA_BASE_VERS=	2.2.7b
+SAMBA_JA_VERS=		1.0
 WRKSRC?=		${WRKDIR}/${DISTNAME}/source
 CATEGORIES?=		net
 MASTER_SITES=		ftp://ftp.samba.gr.jp/pub/samba-jp/samba-${SAMBA_BASE_VERS}-ja/ \
diff --git a/net/ja-samba/distinfo b/net/ja-samba/distinfo
index 0b558c531e5..201c6a837f1 100644
--- a/net/ja-samba/distinfo
+++ b/net/ja-samba/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2003/04/08 03:39:13 taca Exp $
+$NetBSD: distinfo,v 1.9 2003/04/09 05:05:13 taca Exp $
 
-SHA1 (samba-2.2.7a-ja-1.1.tar.bz2) = 7555ad9055a5c2e19f7506138713ade174d26816
-Size (samba-2.2.7a-ja-1.1.tar.bz2) = 7307743 bytes
+SHA1 (samba-2.2.7b-ja-1.0.tar.bz2) = 524b2bd26c32e35f3a8f7e9b9261110bdbda9850
+Size (samba-2.2.7b-ja-1.0.tar.bz2) = 7306866 bytes
 SHA1 (patch-aa) = 8203fd9ebfa835eb9d866cb228cd007b0d4d2b07
 SHA1 (patch-ab) = 94918890889671309f7161e68311bf960f33df0e
 SHA1 (patch-ac) = 6f37a1d40ce40621f5f98d7fa501614dd9776b3d
@@ -14,8 +14,3 @@ SHA1 (patch-an) = 55c7f9785c19d84b8ad74bbf0827162b156e2327
 SHA1 (patch-ao) = cc0b3d73d0c7de4cd46e66b0d66b2c3bbaddeb41
 SHA1 (patch-ap) = 199e2f8e5f2a5ac5aace21e6ada1fd8887a19059
 SHA1 (patch-aq) = e5b442fb7eb837bb2771ac71c73e6f95ae6fdfc2
-SHA1 (patch-ar) = 1974317b2be6689df6d0ad06138fa5a28dfaf99f
-SHA1 (patch-as) = 3aa4e0d7f254d2302940b4b6540b4e1b96582b2b
-SHA1 (patch-at) = 1b4215e00c243eb21d009ef13896371eecacf5c3
-SHA1 (patch-au) = ad02a1175a5aeb2e6a8f65b280df0e550d557970
-SHA1 (patch-bb) = 86475e740b3b9d903929f678aa9f274d5a64b78a
diff --git a/net/ja-samba/patches/patch-ar b/net/ja-samba/patches/patch-ar
deleted file mode 100644
index 98c7939405b..00000000000
--- a/net/ja-samba/patches/patch-ar
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2003/04/07 18:10:08 taca Exp $
-
---- smbd/ipc.c.orig	2003-03-17 13:17:56.000000000 +0900
-+++ smbd/ipc.c
-@@ -398,7 +398,7 @@ int reply_trans(connection_struct *conn,
-   
- 	if (tdscnt)  {
- 		if((data = (char *)malloc(tdscnt)) == NULL) {
--			DEBUG(0,("reply_trans: data malloc fail for %d bytes !\n", tdscnt));
-+			DEBUG(0,("reply_trans: data malloc fail for %u bytes !\n", tdscnt));
- 			END_PROFILE(SMBtrans);
- 			return(ERROR_DOS(ERRDOS,ERRnomem));
- 		} 
-@@ -412,7 +412,7 @@ int reply_trans(connection_struct *conn,
- 
- 	if (tpscnt) {
- 		if((params = (char *)malloc(tpscnt)) == NULL) {
--			DEBUG(0,("reply_trans: param malloc fail for %d bytes !\n", tpscnt));
-+			DEBUG(0,("reply_trans: param malloc fail for %u bytes !\n", tpscnt));
- 			SAFE_FREE(data);
- 			END_PROFILE(SMBtrans);
- 			return(ERROR_DOS(ERRDOS,ERRnomem));
-@@ -428,7 +428,7 @@ int reply_trans(connection_struct *conn,
- 	if (suwcnt) {
- 		int i;
- 		if((setup = (uint16 *)malloc(suwcnt*sizeof(uint16))) == NULL) {
--			DEBUG(0,("reply_trans: setup malloc fail for %d bytes !\n", (int)(suwcnt * sizeof(uint16))));
-+			DEBUG(0,("reply_trans: setup malloc fail for %u bytes !\n", (unsigned int)(suwcnt * sizeof(uint16))));
- 			SAFE_FREE(data);
- 			SAFE_FREE(params);
- 			END_PROFILE(SMBtrans);
-@@ -524,7 +524,7 @@ int reply_trans(connection_struct *conn,
- 	}
- 	
- 	
--	DEBUG(3,("trans <%s> data=%d params=%d setup=%d\n",
-+	DEBUG(3,("trans <%s> data=%u params=%u setup=%u\n",
- 		 name,tdscnt,tpscnt,suwcnt));
- 	
- 	/*
diff --git a/net/ja-samba/patches/patch-as b/net/ja-samba/patches/patch-as
deleted file mode 100644
index 5c013e8c37c..00000000000
--- a/net/ja-samba/patches/patch-as
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.1 2003/04/07 18:10:08 taca Exp $
-
---- smbd/password.c.orig	2002-11-21 22:05:51.000000000 +0900
-+++ smbd/password.c
-@@ -816,7 +816,7 @@ and given password ok\n", user));
- 		if (!ok && lp_username(snum)) {
- 			char *auser;
- 			pstring user_list;
--			StrnCpy(user_list,lp_username(snum),sizeof(pstring));
-+			StrnCpy(user_list,lp_username(snum),sizeof(pstring)-1);
- 
- 			pstring_sub(user_list,"%S",lp_servicename(snum), True);
- 	  
diff --git a/net/ja-samba/patches/patch-at b/net/ja-samba/patches/patch-at
deleted file mode 100644
index 8d1c65444aa..00000000000
--- a/net/ja-samba/patches/patch-at
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-at,v 1.1 2003/04/07 18:10:08 taca Exp $
-
---- smbd/reply.c.orig	2003-02-05 15:15:15.000000000 +0900
-+++ smbd/reply.c
-@@ -1490,6 +1490,9 @@ int reply_search(connection_struct *conn
- 
-         for (i=numentries;(i<maxentries) && !finished;i++)
-         {
-+	  /* check to make sure we have room in the buffer */
-+	  if ( ((PTR_DIFF(p, outbuf))+DIR_STRUCT_SIZE) > BUFFER_SIZE )
-+	  	break;
-           finished = 
-             !get_dir_entry(conn,mask,dirtype,fname,&size,&mode,&date,check_descend);
-           if (!finished)
-@@ -3603,6 +3606,9 @@ int reply_printqueue(connection_struct *
-     
- 
- 		for (i=first;i<first+num_to_get;i++) {
-+			/* check to make sure we have room in the buffer */
-+			if ( (PTR_DIFF(p, outbuf)+28) > BUFFER_SIZE )
-+				break;
- 			put_dos_date2(p,0,queue[i].time);
- 			SCVAL(p,4,(queue[i].status==LPQ_PRINTING?2:3));
- 			SSVAL(p,5, queue[i].job);
diff --git a/net/ja-samba/patches/patch-au b/net/ja-samba/patches/patch-au
deleted file mode 100644
index af9799bc677..00000000000
--- a/net/ja-samba/patches/patch-au
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-au,v 1.1 2003/04/07 18:10:08 taca Exp $
-
---- smbd/statcache.c.orig	2001-11-09 18:27:43.000000000 +0900
-+++ smbd/statcache.c
-@@ -88,7 +88,7 @@ void stat_cache_add( char *full_orig_nam
-    * StrnCpy always null terminates.
-    */
- 
--  StrnCpy(orig_name, full_orig_name, namelen);
-+  StrnCpy(orig_name, full_orig_name, MIN(namelen, sizeof(orig_name)-1));
-   if(!case_sensitive)
-     strupper( orig_name );
- 
diff --git a/net/ja-samba/patches/patch-bb b/net/ja-samba/patches/patch-bb
deleted file mode 100644
index 36952d67e82..00000000000
--- a/net/ja-samba/patches/patch-bb
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-bb,v 1.3 2003/04/08 03:39:14 taca Exp $
-
---- smbd/trans2.c.orig	2003-03-17 13:17:56.000000000 +0900
-+++ smbd/trans2.c
-@@ -217,7 +217,6 @@ static int call_trans2open(connection_st
- 	int16 open_ofun;
- 	int32 open_size;
- 	char *pname;
--	int16 namelen;
- 
- 	pstring fname;
- 	mode_t unixmode;
-@@ -247,9 +246,8 @@ static int call_trans2open(connection_st
- 	open_ofun = SVAL(params,12);
- 	open_size = IVAL(params,14);
- 	pname = &params[28];
--	namelen = strlen(pname)+1;
- 
--	StrnCpy(fname,pname,namelen);
-+	pstrcpy(fname,pname);
- 	if (strchr(fname,'?'))
- 		return(ERROR_DOS(ERRDOS,ERRinvalidname));
-