The branch, v3-6-test has been updated
via 9243c4e s3-docs: Typos in rpcclient man page
via b8df394 s3-docs: Typos in smbclient man page
via 25ada24 s3-rpcclient: Fix bug #7880: cmd_spoolss_deletedriver()
returned without checking all architectures.
via b7a6ad5 s3/docs: Remove superfluous bracket.
from 45e9604 s3-net: fix query_service_state() error handling.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 9243c4e594f8ed146d499520aaa5147adceeb1d4
Author: Björn Baumbach <b...@sernet.de>
Date: Tue Jan 11 14:28:26 2011 +0100
s3-docs: Typos in rpcclient man page
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Autobuild-User: Stefan Metzmacher <me...@samba.org>
Autobuild-Date: Wed Jan 12 18:13:54 CET 2011 on sn-devel-104
(cherry picked from commit 4fe0765d911c2a08351805f4a953dc0cd512200d)
commit b8df394a846b751e8c0fdd9919559f1e8d1d08cb
Author: Björn Baumbach <b...@sernet.de>
Date: Tue Jan 11 12:43:59 2011 +0100
s3-docs: Typos in smbclient man page
Signed-off-by: Stefan Metzmacher <me...@samba.org>
(cherry picked from commit 98af6738f6d006c58fca8560a2b78a60cdbefaa8)
commit 25ada2407c5695d958fe04a5c053e1d60997c16d
Author: Björn Baumbach <b...@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 <me...@samba.org>
(cherry picked from commit f5af66e67d7c6d62315671c0cf57f47973316226)
commit b7a6ad5f609ea65331ffea6294e629646e9ac60c
Author: Karolin Seeger <ksee...@samba.org>
Date: Tue Jan 11 21:18:57 2011 +0100
s3/docs: Remove superfluous bracket.
Karolin
(cherry picked from commit 3bf51a9e2853d8ce4f8c573eda7fb1d2ede6f8cb)
Signed-off-by: Stefan Metzmacher <me...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages-3/rpcclient.1.xml | 6 +++---
docs-xml/manpages-3/smbclient.1.xml | 2 +-
source3/rpcclient/cmd_spoolss.c | 6 +++++-
3 files changed, 9 insertions(+), 5 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 1a546a9..8d517ae 100644
--- a/docs-xml/manpages-3/rpcclient.1.xml
+++ b/docs-xml/manpages-3/rpcclient.1.xml
@@ -62,9 +62,9 @@
<varlistentry>
- <term>-c|--command='command string'</term>
- <listitem><para>execute semicolon separated commands (listed
- below)) </para></listitem>
+ <term>-c|--command=<command string></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
