[SCM] Samba Shared Repository - branch master updated

Stefan Metzmacher metze at samba.org
Wed Jan 12 10:14:01 MST 2011


The branch, master has been updated
       via  4fe0765 s3-docs: Typos in rpcclient man page
       via  98af673 s3-docs: Typos in smbclient man page
       via  f5af66e s3-rpcclient: Fix bug #7880: cmd_spoolss_deletedriver() returned without checking all architectures.
      from  dac7cce s3-net: fix query_service_state() error handling.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4fe0765d911c2a08351805f4a953dc0cd512200d
Author: Björn Baumbach <bb at sernet.de>
Date:   Tue Jan 11 14:28:26 2011 +0100

    s3-docs: Typos in rpcclient man page
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Wed Jan 12 18:13:54 CET 2011 on sn-devel-104

commit 98af6738f6d006c58fca8560a2b78a60cdbefaa8
Author: Björn Baumbach <bb at sernet.de>
Date:   Tue Jan 11 12:43:59 2011 +0100

    s3-docs: Typos in smbclient man page
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

commit f5af66e67d7c6d62315671c0cf57f47973316226
Author: Björn Baumbach <bb at sernet.de>
Date:   Wed Dec 22 15:20:29 2010 +0100

    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>

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/manpages-3/rpcclient.1.xml |    4 ++--
 docs-xml/manpages-3/smbclient.1.xml |    2 +-
 source3/rpcclient/cmd_spoolss.c     |    6 +++++-
 3 files changed, 8 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/rpcclient.1.xml b/docs-xml/manpages-3/rpcclient.1.xml
index 80f5923..8d517ae 100644
--- a/docs-xml/manpages-3/rpcclient.1.xml
+++ b/docs-xml/manpages-3/rpcclient.1.xml
@@ -62,8 +62,8 @@
 
 
 		<varlistentry>
-		<term>-c|--command='command string'</term>
-		<listitem><para>execute semicolon separated commands (listed 
+		<term>-c|--command=&lt;command string&gt;</term>
+		<listitem><para>Execute semicolon separated commands (listed
 		below) </para></listitem>
 		</varlistentry>
 
diff --git a/docs-xml/manpages-3/smbclient.1.xml b/docs-xml/manpages-3/smbclient.1.xml
index 91a5928..9efca50 100644
--- a/docs-xml/manpages-3/smbclient.1.xml
+++ b/docs-xml/manpages-3/smbclient.1.xml
@@ -469,7 +469,7 @@
 		</varlistentry>
 		
 		<varlistentry>
-		<term>-c|--comand command string</term>
+		<term>-c|--command command string</term>
 		<listitem><para>command string is a semicolon-separated list of 
 		commands to be executed instead of prompting from stdin. <parameter>
 		-N</parameter> is implied by <parameter>-c</parameter>.</para>
diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index 50f1209..f9d7b65 100644
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -1945,6 +1945,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,
@@ -1952,7 +1954,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) ) {


-- 
Samba Shared Repository


More information about the samba-cvs mailing list