[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  47d366b... s3-rpcclient: Leave setprinterdata directly if not enough args were passed.
       via  f405503... s3-rpc_server: Document rpc_pipe_open_internal.
      from  58c9070... s4-smbtorture: fix RPC-SPOOLSS-WIN after PrinterData IDL changes.

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


- Log -----------------------------------------------------------------
commit 47d366b5729b21e630760c36ef743dd5374a29fd
Author: Andreas Schneider <asn at redhat.com>
Date:   Fri Mar 5 11:15:35 2010 +0100

    s3-rpcclient: Leave setprinterdata directly if not enough args were passed.
    
    If we don't pass enough arguments we don't have to close the connection.
    
    Signed-off-by: Günther Deschner <gd at samba.org>

commit f40550335019aad82180f813f6299d440f4a5977
Author: Andreas Schneider <asn at redhat.com>
Date:   Fri Mar 5 15:54:31 2010 +0100

    s3-rpc_server: Document rpc_pipe_open_internal.
    
    Signed-off-by: Günther Deschner <gd at samba.org>

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

Summary of changes:
 source3/rpc_server/srv_pipe_hnd.c |   28 +++++++++++++++++++++++++++-
 source3/rpcclient/cmd_spoolss.c   |    3 +--
 2 files changed, 28 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c
index f5ea877..8d4e26b 100644
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -1457,7 +1457,33 @@ NTSTATUS np_read_recv(struct tevent_req *req, ssize_t *nread,
 }
 
 /**
- * Create a new RPC client context which uses a local dispatch function.
+ * @brief Create a new RPC client context which uses a local dispatch function.
+ *
+ * @param[in]  mem_ctx  The memory context to use.
+ *
+ * @param[in]  abstract_syntax Normally the syntax_id of the autogenerated
+ *                             ndr_table_<name>.
+ *
+ * @param[in]  dispatch The corresponding autogenerated dispatch function
+ *                      rpc_<name>_dispatch.
+ *
+ * @param[in]  serversupplied_info The server supplied authentication function.
+ *
+ * @param[out] presult  A pointer to store the connected rpc client pipe.
+ *
+ * @return              NT_STATUS_OK on success, a corresponding NT status if an
+ *                      error occured.
+ *
+ * @code
+ *   struct rpc_pipe_client *winreg_pipe;
+ *   NTSTATUS status;
+ *
+ *   status = rpc_pipe_open_internal(tmp_ctx,
+ *                                   &ndr_table_winreg.syntax_id,
+ *                                   rpc_winreg_dispatch,
+ *                                   p->server_info,
+ *                                   &winreg_pipe);
+ * @endcode
  */
 NTSTATUS rpc_pipe_open_internal(TALLOC_CTX *mem_ctx,
 				const struct ndr_syntax_id *abstract_syntax,
diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index b88ff10..ecbc341 100644
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -2395,8 +2395,7 @@ static WERROR cmd_spoolss_setprinterdata(struct rpc_pipe_client *cli,
 		printf ("Usage: %s <printer> <string|binary|dword|multistring>"
 			" <value> <data>\n",
 			argv[0]);
-		result = WERR_INVALID_PARAM;
-		goto done;
+		return WERR_OK;
 	}
 
 	RPCCLIENT_PRINTERNAME(printername, cli, argv[1]);


-- 
Samba Shared Repository