[Pkg-samba-maint] r3710 - in branches/samba/squeeze/debian: . patches

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2011-03-14 21:08:41 +0000 (Mon, 14 Mar 2011)
New Revision: 3710

Added:
   branches/samba/squeeze/debian/patches/upstream_7880_0001-s3-rpcclient-Fix-bug-7880-cmd_spoolss_deletedriver-r.patch
Modified:
   branches/samba/squeeze/debian/changelog
   branches/samba/squeeze/debian/patches/series
Log:
Upstream bug 7880: rpcclient deldriver does not remove drivers
from all architectures.

Modified: branches/samba/squeeze/debian/changelog
===================================================================
--- branches/samba/squeeze/debian/changelog	2011-03-14 21:07:05 UTC (rev 3709)
+++ branches/samba/squeeze/debian/changelog	2011-03-14 21:08:41 UTC (rev 3710)
@@ -7,6 +7,8 @@
       domain users. Closes: #611177	  
     - Upstream bug 7777: winbind leaks gids with idmap ldap backend
       Closes: #613624
+    - Upstream bug 7880: rpcclient deldriver does not remove drivers
+      from all architectures.
 
  -- Christian Perrier <bubulle at debian.org>  Sun, 13 Mar 2011 08:07:42 +0100
 

Modified: branches/samba/squeeze/debian/patches/series
===================================================================
--- branches/samba/squeeze/debian/patches/series	2011-03-14 21:07:05 UTC (rev 3709)
+++ branches/samba/squeeze/debian/patches/series	2011-03-14 21:08:41 UTC (rev 3710)
@@ -26,3 +26,4 @@
 bug_611177-617429_upstream_7567_0010-librpc-ndr-handle-NOALIGN-flag-for-relative-pointers.patch
 bug_613624_upstream_7777_0001-First-part-of-fix-for-bug-7777-When-requesting-looku.patch
 bug_613624_upstream_7777_0002-Second-part-of-fix-for-bug-7777-When-requesting-look.patch
+upstream_7880_0001-s3-rpcclient-Fix-bug-7880-cmd_spoolss_deletedriver-r.patch

Added: branches/samba/squeeze/debian/patches/upstream_7880_0001-s3-rpcclient-Fix-bug-7880-cmd_spoolss_deletedriver-r.patch
===================================================================
--- branches/samba/squeeze/debian/patches/upstream_7880_0001-s3-rpcclient-Fix-bug-7880-cmd_spoolss_deletedriver-r.patch	                        (rev 0)
+++ branches/samba/squeeze/debian/patches/upstream_7880_0001-s3-rpcclient-Fix-bug-7880-cmd_spoolss_deletedriver-r.patch	2011-03-14 21:08:41 UTC (rev 3710)
@@ -0,0 +1,44 @@
+From a36085eceb70a28cb2f3e69677f9f3d874bd2336 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb at sernet.de>
+Date: Wed, 22 Dec 2010 15:20:29 +0100
+Subject: [PATCH 13/13] s3-rpcclient: Fix bug #7880: cmd_spoolss_deletedriver() returned without checking all architectures.
+
+Continues now with next architecture if no driver is available.
+
+Because of the broken behavior of the rpccli_*() functions,
+we need special error code handling.
+
+Signed-off-by: Stefan Metzmacher <metze at samba.org>
+(cherry picked from commit f5af66e67d7c6d62315671c0cf57f47973316226)
+(cherry picked from commit dc63f45b523deb5c3d0c4be4239507e5fc4f6a40)
+---
+ source3/rpcclient/cmd_spoolss.c |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
+index 2d79b11..f83474e 100644
+--- a/source3/rpcclient/cmd_spoolss.c
++++ b/source3/rpcclient/cmd_spoolss.c
+@@ -1893,6 +1893,8 @@ static WERROR cmd_spoolss_deletedriver(struct rpc_pipe_client *cli,
+ 
+ 	/* delete the driver for all architectures */
+ 	for (i=0; archi_table[i].long_archi; i++) {
++		result = WERR_OK;
++
+ 		/* make the call to remove the driver */
+ 		status = rpccli_spoolss_DeletePrinterDriver(cli, mem_ctx,
+ 							    cli->srv_name_slash,
+@@ -1900,7 +1902,9 @@ static WERROR cmd_spoolss_deletedriver(struct rpc_pipe_client *cli,
+ 							    argv[1],
+ 							    &result);
+ 		if (!NT_STATUS_IS_OK(status)) {
+-			return result;
++			if (W_ERROR_IS_OK(result)) {
++				result = ntstatus_to_werror(status);
++			}
+ 		}
+ 		if ( !W_ERROR_IS_OK(result) ) {
+ 			if ( !W_ERROR_EQUAL(result, WERR_UNKNOWN_PRINTER_DRIVER) ) {
+-- 
+1.7.4.1
+