Merge lp:~csurbhi/ubuntu/maverick/samba/samba-fix.276472 into lp:ubuntu/maverick/samba

[Surbhi Palande]

Adds the translation of Unix Error code -ENOTSUP to NT Error Code NT_STATUS_NOT_SUPPORTED. The absence of this translation wrongly sends back to the client a STATUS_DENIED message.

I have lightly tested this fix on my local machine and also asked users to test it.

[Steve Langasek (vorlon)]

The change makes sense, but should be reviewed by protocol experts before we commit to it. Please submit this patch to <email address hidden> for review; once it's been submitted upstream, I'm happy to apply it to the package.

review: Needs Information

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2010-07-11 19:01:01 +0000
+++ .pc/applied-patches	2010-08-16 12:31:10 +0000
@@ -10,3 +10,4 @@
 smbtar-bashism.patch
 no-unnecessary-cups.patch
 autoconf.patch
+error-trans.fix-276472

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-15 13:26:21 +0000
+++ debian/changelog	2010-08-16 12:31:10 +0000
@@ -1,3 +1,11 @@
+samba (2:3.5.4~dfsg-1ubuntu3) maverick; urgency=low
+
+  * Add the translation of Unix Error code -ENOTSUP to NT Error Code
+    NT_STATUS_NOT_SUPPORTED to prevent the Permission denied error.  
+    (LP: #276472)
+
+ -- Surbhi Palande <[e-mail]>  Mon, 16 Aug 2010 15:09:30 +0300
+
 samba (2:3.5.4~dfsg-1ubuntu2) maverick; urgency=low
 
   * Resync with debian:

=== added file 'debian/patches/error-trans.fix-276472'
--- debian/patches/error-trans.fix-276472	1970-01-01 00:00:00 +0000
+++ debian/patches/error-trans.fix-276472	2010-08-16 12:31:10 +0000
@@ -0,0 +1,15 @@
+Index: b/source3/lib/errmap_unix.c
+===================================================================
+--- a/source3/lib/errmap_unix.c
++++ b/source3/lib/errmap_unix.c
+@@ -105,7 +105,9 @@
+ #ifdef ECANCELED
+ 	{ ECANCELED, ERRDOS, ERRbadfid, NT_STATUS_CANCELLED},
+ #endif
+-
++#ifdef ENOTSUP
++        { ENOTSUP, ERRSRV, ERRnosupport, NT_STATUS_NOT_SUPPORTED},
++#endif
+ 	{ 0, 0, 0, NT_STATUS_OK }
+ };
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-07-11 19:01:01 +0000
+++ debian/patches/series	2010-08-16 12:31:10 +0000
@@ -10,3 +10,4 @@
 smbtar-bashism.patch
 no-unnecessary-cups.patch
 autoconf.patch
+error-trans.fix-276472

=== modified file 'source3/lib/errmap_unix.c'
--- source3/lib/errmap_unix.c	2010-07-11 19:01:01 +0000
+++ source3/lib/errmap_unix.c	2010-08-16 12:31:10 +0000
@@ -105,7 +105,9 @@
 #ifdef ECANCELED
 	{ ECANCELED, ERRDOS, ERRbadfid, NT_STATUS_CANCELLED},
 #endif
-
+#ifdef ENOTSUP
+        { ENOTSUP, ERRSRV, ERRnosupport, NT_STATUS_NOT_SUPPORTED},
+#endif
 	{ 0, 0, 0, NT_STATUS_OK }
 };