[Pkg-samba-maint] r2826 - in branches/samba/lenny/debian: . patches

[bubulle at alioth.debian.org]

tags 526229 pending
thanks

Author: bubulle
Date: 2009-06-06 09:47:35 +0000 (Sat, 06 Jun 2009)
New Revision: 2826

Added:
   branches/samba/lenny/debian/patches/bug_526229-upstream_6301.patch
Modified:
   branches/samba/lenny/debian/changelog
   branches/samba/lenny/debian/patches/series
Log:
Add patch fixing #526229


Modified: branches/samba/lenny/debian/changelog
===================================================================
--- branches/samba/lenny/debian/changelog	2009-06-06 09:45:28 UTC (rev 2825)
+++ branches/samba/lenny/debian/changelog	2009-06-06 09:47:35 UTC (rev 2826)
@@ -1,3 +1,11 @@
+samba (2:3.2.5-4lenny4) UNRELEASED; urgency=low
+
+  * Fix Connect4 in samr.idl. 
+    This should allow Windows 2000 SP4 workstations to join a Samba
+    domain. Closes: #526229  
+
+ -- Christian Perrier <bubulle at debian.org>  Sat, 06 Jun 2009 11:46:12 +0200
+
 samba (2:3.2.5-4lenny3) stable-proposed-updates; urgency=low
 
   * Have ldap_search_with_timeout() always returns LDAP_TIMELIMIT_EXCEEDED

Added: branches/samba/lenny/debian/patches/bug_526229-upstream_6301.patch
===================================================================
--- branches/samba/lenny/debian/patches/bug_526229-upstream_6301.patch	                        (rev 0)
+++ branches/samba/lenny/debian/patches/bug_526229-upstream_6301.patch	2009-06-06 09:47:35 UTC (rev 2826)
@@ -0,0 +1,44 @@
+Goal: Fix Connect4 in samr.idl broken. It prevents Windows 2000 SP4
+      machines to join samba domains
+
+Fixes: #526229
+
+Status wrt upstream: Fixed in 3.2.12, 3.3.5 and 3.4.0
+
+Author: Volker Lendecke <vl at samba.org>
+
+Index: lenny/source/librpc/gen_ndr/ndr_samr.c
+===================================================================
+--- lenny.orig/source/librpc/gen_ndr/ndr_samr.c
++++ lenny/source/librpc/gen_ndr/ndr_samr.c
+@@ -4430,14 +4430,14 @@
+ 
+ static enum ndr_err_code ndr_push_samr_ConnectVersion(struct ndr_push *ndr, int ndr_flags, enum samr_ConnectVersion r)
+ {
+-	NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r));
++	NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+ 	return NDR_ERR_SUCCESS;
+ }
+ 
+ static enum ndr_err_code ndr_pull_samr_ConnectVersion(struct ndr_pull *ndr, int ndr_flags, enum samr_ConnectVersion *r)
+ {
+-	uint16_t v;
+-	NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &v));
++	uint32_t v;
++	NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+ 	*r = v;
+ 	return NDR_ERR_SUCCESS;
+ }
+Index: lenny/source/librpc/idl/samr.idl
+===================================================================
+--- lenny.orig/source/librpc/idl/samr.idl
++++ lenny/source/librpc/idl/samr.idl
+@@ -1246,7 +1246,7 @@
+ 	/************************/
+ 	/* Function    0x3e     */
+ 
+-	typedef enum {
++	typedef [v1_enum] enum {
+ 		SAMR_CONNECT_PRE_W2K	= 1,
+ 		SAMR_CONNECT_W2K	= 2,
+ 		SAMR_CONNECT_AFTER_W2K	= 3

Modified: branches/samba/lenny/debian/patches/series
===================================================================
--- branches/samba/lenny/debian/patches/series	2009-06-06 09:45:28 UTC (rev 2825)
+++ branches/samba/lenny/debian/patches/series	2009-06-06 09:47:35 UTC (rev 2826)
@@ -29,3 +29,4 @@
 bug_520284_upstream_6160.patch
 bug_520794.patch
 bug_522907_upstream_6279.patch
+bug_526229-upstream_6301.patch