[SCM] Samba Shared Repository - branch v3-6-test updated

Günther Deschner gd at samba.org
Mon Sep 20 12:03:31 MDT 2010


The branch, v3-6-test has been updated
       via  ecd5fcb s3-spoolss: Fix _spoolss_GetPrinter().
      from  59da21b s4-smbtorture: fill in trust_domain_passwords_check_in in NDR lsa test.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit ecd5fcb9e719f248480ad5e900f2e423e6daaef2
Author: Günther Deschner <gd at samba.org>
Date:   Fri Sep 10 16:55:23 2010 +0200

    s3-spoolss: Fix _spoolss_GetPrinter().
    
    In the error case, we need to TALLOC_FREE(r->out.info), don't ask :-)
    
    Guenther
    (cherry picked from commit bf7ca3f5e7e6f126fd8baec5548dfd45bc5e168f)

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

Summary of changes:
 source3/rpc_server/srv_spoolss_nt.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 59c2e78..4837bb8 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -4246,7 +4246,7 @@ WERROR _spoolss_GetPrinter(struct pipes_struct *p,
 				    lp_const_servicename(snum),
 				    &info2);
 	if (!W_ERROR_IS_OK(result)) {
-		return result;
+		goto out;
 	}
 
 	switch (r->in.level) {
@@ -4293,6 +4293,7 @@ WERROR _spoolss_GetPrinter(struct pipes_struct *p,
 		break;
 	}
 
+ out:
 	if (!W_ERROR_IS_OK(result)) {
 		DEBUG(0, ("_spoolss_GetPrinter: failed to construct printer info level %d - %s\n",
 			  r->in.level, win_errstr(result)));


-- 
Samba Shared Repository


More information about the samba-cvs mailing list