Bug 52711 - japanese/samba is updated to samba-2.2.8a-ja-1.0
Summary: japanese/samba is updated to samba-2.2.8a-ja-1.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Norikatsu Shigemura
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2003-05-27 05:40 UTC by NAKAJI Hiroyuki
Modified: 2003-06-07 02:35 UTC (History)
0 users

See Also:


Attachments
file.diff (1.51 KB, patch)
2003-05-27 05:40 UTC, NAKAJI Hiroyuki
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description NAKAJI Hiroyuki 2003-05-27 05:40:03 UTC
	Samba-2.2.8a-ja-1.0 was released on May/27/2003 from SUGJ
(http://www.samba.gr.jp/).
Comment 1 Norikatsu Shigemura freebsd_committer freebsd_triage 2003-05-27 06:45:14 UTC
Responsible Changed
From-To: freebsd-ports-bugs->nork

I'll handle this.
Comment 2 Norikatsu Shigemura freebsd_committer freebsd_triage 2003-06-06 20:31:43 UTC
State Changed
From-To: open->feedback

Patch you want to add, please!
Comment 3 nakaji 2003-06-06 23:27:51 UTC
Here is a additional patch, files/patch-forXP, which will fix the
problem that when the name of the share is longer than 12 characters
the share cannot be accessed from Windows XP. The problem was reported
in [samba-jp:14789].

This adhoc fix will be revised and samba-2.2.8a-ja-1.1 will be
released as soon as possible.

Full diff from ports-current/japanese/samba is also available at
http://heimat.jp/~nakaji/FreeBSD/ports/ja-samba.diff

--->8------>8------>8------>8------>8------>8------>8------>8---
--- param/loadparm.c.orig	Tue May 20 11:28:38 2003
+++ param/loadparm.c	Wed Jun  4 23:31:55 2003
@@ -3857,8 +3857,10 @@
 	int iService;
 	fstring serviceName;
 	int len;
+	enum remote_arch_types ra_type = get_remote_arch();
 	
-	len = (get_remote_arch() == RA_WIN2K) ? 127 : 12;
+	len = ( (ra_type == RA_WIN2K) || (ra_type == RA_WINXP) ||
+	        (ra_type == RA_WIN2K3) ) ? 127 : 12;
 
 	for (iService = iNumServices - 1; iService >= 0; iService--)
 	{
--- rpc_server/srv_srvsvc_nt.c.orig	Tue May 20 11:22:11 2003
+++ rpc_server/srv_srvsvc_nt.c	Wed Jun  4 23:31:55 2003
@@ -38,9 +38,11 @@
 	pstring net_name;
 	pstring remark;
 	uint32 type;
+	enum remote_arch_types ra_type = get_remote_arch();
 
 	StrnCpy(net_name, lp_servicename(snum),
-		(get_remote_arch() == RA_WIN2K) ? 127 : 12);
+		(((ra_type == RA_WIN2K) || (ra_type == RA_WINXP) ||
+		  (ra_type == RA_WIN2K3) ) ? 127 : 12 ) );
 	pstrcpy(remark, lp_comment(snum));
 	standard_sub_conn(p->conn, remark, sizeof(remark));
 	len_net_name = strlen(net_name);
--- smbd/trans2.c.orig	Tue May 20 11:17:19 2003
+++ smbd/trans2.c	Wed Jun  4 23:34:21 2003
@@ -921,7 +921,8 @@
 	SMB_STRUCT_STAT sbuf;
 
 	ra_type = get_remote_arch();
-	NT_arch = ((ra_type == RA_WINNT) || (ra_type == RA_WIN2K));
+	NT_arch = ((ra_type == RA_WINNT) || (ra_type == RA_WIN2K) ||
+	           (ra_type == RA_WINXP) || (ra_type == RA_WIN2K3) );
 
 	if (total_params < 12)
 		return(ERROR_DOS(ERRDOS,ERRinvalidparam));
@@ -1488,7 +1489,9 @@
 			/* NT4 always serves this up as unicode but expects it to be
 			 * delivered as ascii! (tridge && JRA)
 			 */
-			if ((get_remote_arch() != RA_WIN2K) && (global_client_caps & CAP_NT_SMBS)) {
+			if (((get_remote_arch() != RA_WIN2K) ||
+			     (get_remote_arch() != RA_WINXP) ||
+			     (get_remote_arch() != RA_WIN2K3)) && (global_client_caps & CAP_NT_SMBS)) {
 				data_len = 18 + strlen(vname);
 				SIVAL(pdata,12,strlen(vname));
 				pstrcpy(pdata+18,vname);      
@@ -3100,7 +3103,8 @@
 	int max_referral_level;
 
 	ra_type = get_remote_arch();
-	NT_arch = ((ra_type == RA_WINNT) || (ra_type == RA_WIN2K));
+	NT_arch = ((ra_type == RA_WINNT) || (ra_type == RA_WIN2K) ||
+	           (ra_type == RA_WINXP) || (ra_type == RA_WIN2K3) );
 
 	DEBUG(10,("call_trans2getdfsreferral\n"));
--->8------>8------>8------>8------>8------>8------>8------>8---
 
>>>>> In <200306061932.h56JWJRp014565@freefall.freebsd.org> 
>>>>>	Norikatsu Shigemura <nork@FreeBSD.org> wrote:
> Synopsis: japanese/samba is updated to samba-2.2.8a-ja-1.0

> State-Changed-From-To: open->feedback
> State-Changed-By: nork
> State-Changed-When: Fri Jun 6 12:31:43 PDT 2003
> State-Changed-Why: 
> Patch you want to add, please!

> http://www.freebsd.org/cgi/query-pr.cgi?pr=52711
-- 
NAKAJI Hiroyuki
Comment 4 Norikatsu Shigemura freebsd_committer freebsd_triage 2003-06-07 02:35:46 UTC
State Changed
From-To: feedback->closed

Committed, thanks!