[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  6ff5854 s3-spoolss: Consistently fail OpenPrinterEx with "" printername
      from  85f128e nbench: Fix typo.

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


- Log -----------------------------------------------------------------
commit 6ff5854c4f367c9492c054d116bd94210cfc4a59
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Mar 13 21:59:32 2012 +1100

    s3-spoolss: Consistently fail OpenPrinterEx with "" printername
    
    samba3.rpc.spoolss.printserver has become a flakey test recently, and this
    papers over the real problem.
    
    Andrew Bartlett
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Tue Mar 13 17:51:00 CET 2012 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index f66bea8..daed990 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -1710,6 +1710,10 @@ WERROR _spoolss_OpenPrinterEx(struct pipes_struct *p,
 		return WERR_INVALID_PARAM;
 	}
 
+	if (!*r->in.printername) {
+		return WERR_INVALID_PARAM;
+	}
+
 	if (r->in.level > 3) {
 		return WERR_INVALID_PARAM;
 	}


-- 
Samba Shared Repository