summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-03-13 21:59:32 +1100
committerGünther Deschner <gd@samba.org>2012-03-13 17:50:59 +0100
commit6ff5854c4f367c9492c054d116bd94210cfc4a59 (patch)
tree3cf36979da8e2d1d16cd6372abaa40fe0e4dcd62
parent85f128e8f3b8cd86926dc9097e96c31b66ab0f61 (diff)
downloadsamba-6ff5854c4f367c9492c054d116bd94210cfc4a59.tar.gz
samba-6ff5854c4f367c9492c054d116bd94210cfc4a59.tar.bz2
samba-6ff5854c4f367c9492c054d116bd94210cfc4a59.zip
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@samba.org> Autobuild-User: Günther Deschner <gd@samba.org> Autobuild-Date: Tue Mar 13 17:51:00 CET 2012 on sn-devel-104
-rw-r--r--source3/rpc_server/spoolss/srv_spoolss_nt.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index f66bea8197..daed9906fd 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;
}