diff options
author | Gerald Carter <jerry@samba.org> | 2004-07-13 19:20:37 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:52:12 -0500 |
commit | aca738698904fe7c8c19202e3b4a080e7939864d (patch) | |
tree | 7d61765285fd1171b35054f49a0611281bb9be77 | |
parent | 75900ae52615f899c3da56341446c5fedfe1c58f (diff) | |
download | samba-aca738698904fe7c8c19202e3b4a080e7939864d.tar.gz samba-aca738698904fe7c8c19202e3b4a080e7939864d.tar.bz2 samba-aca738698904fe7c8c19202e3b4a080e7939864d.zip |
r1484: BUG 1520: work around bug in xp sp2 rc2 where the client sends a fnpcn() request without previously sending a ffpcn(). Return what win2k sp4 does
(This used to be commit 3f73d19807cbcbae8e5cfd96fd5c9b4de8c388a3)
-rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 06ba543597..08553bfe65 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -3725,6 +3725,12 @@ static WERROR printserver_notify_info(pipes_struct *p, POLICY_HND *hnd, info->data=NULL; info->count=0; + /* a bug in xp sp2 rc2 causes it to send a fnpcn request without + sending a ffpcn() request first */ + + if ( !option ) + return WERR_BADFID; + for (i=0; i<option->count; i++) { option_type=&(option->ctr.type[i]); @@ -3787,6 +3793,12 @@ static WERROR printer_notify_info(pipes_struct *p, POLICY_HND *hnd, SPOOL_NOTIFY info->data=NULL; info->count=0; + /* a bug in xp sp2 rc2 causes it to send a fnpcn request without + sending a ffpcn() request first */ + + if ( !option ) + return WERR_BADFID; + get_printer_snum(p, hnd, &snum); for (i=0; i<option->count; i++) { |