diff options
| author | Gerald Carter <jerry@samba.org> | 2002-03-08 22:06:59 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2002-03-08 22:06:59 +0000 |
| commit | 08035d33c587dbc4c34d78f95ee1f2f9277d924d (patch) | |
| tree | c86424c2f4328685689032bbd2e24e7e8cbfe3b6 /source/rpc_server/srv_spoolss_nt.c | |
| parent | 881453c6e661a67ff8ae0aeed5f9e2d2c50ef852 (diff) | |
| download | samba-08035d33c587dbc4c34d78f95ee1f2f9277d924d.tar.gz samba-08035d33c587dbc4c34d78f95ee1f2f9277d924d.tar.xz samba-08035d33c587dbc4c34d78f95ee1f2f9277d924d.zip | |
coupld of minor fixes and correct typo in last commit
Diffstat (limited to 'source/rpc_server/srv_spoolss_nt.c')
| -rw-r--r-- | source/rpc_server/srv_spoolss_nt.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/source/rpc_server/srv_spoolss_nt.c b/source/rpc_server/srv_spoolss_nt.c index a4248dce6f2..82c36d52f5a 100644 --- a/source/rpc_server/srv_spoolss_nt.c +++ b/source/rpc_server/srv_spoolss_nt.c @@ -545,7 +545,7 @@ static int build_notify_data (TALLOC_CTX *ctx, NT_PRINTER_INFO_LEVEL *printer, u DEBUG(10,("build_notify_data: PRINTER_MESSAGE_DRIVER set on [%s][%d]\n", printer->info_2->printername, idx)); if ((data=Realloc(*notify_data, (idx+1)*sizeof(SPOOL_NOTIFY_INFO_DATA))) == NULL) { - DEBUG(0,("cli_spoolss_reply_rrpcn: Realloc() failed with size [%d]!\n", + DEBUG(0,("build_notify_data: Realloc() failed with size [%d]!\n", (idx+1)*sizeof(SPOOL_NOTIFY_INFO_DATA))); return -1; } @@ -622,7 +622,8 @@ static BOOL cli_spoolss_reply_rrpcn(struct cli_state *pcli, POLICY_HND *handle, *status = WERR_NOMEM; goto done; } - notify_info.flags = 0x00000200; + notify_info.version = 0x2; + notify_info.flags = 0x00020000; notify_info.count = data_len; notify_info.data = notify_data; @@ -672,6 +673,9 @@ done: */ SAFE_FREE(notify_data); + if (!W_ERROR_IS_OK(*status)) + DEBUG(5,("cli_spoolss_reply_rrpcn: %s\n", get_dos_error_msg(*status))); + return W_ERROR_IS_OK(*status); } @@ -1308,7 +1312,7 @@ static BOOL getprinterdata_printer_server(TALLOC_CTX *ctx, fstring value, uint32 *type = 0x4; if((*data = (uint8 *)talloc(ctx, 4*sizeof(uint8) )) == NULL) return False; - SIVAL(*data, 0, 0x02); + SIVAL(*data, 0, 0x03); *needed = 0x4; return True; } @@ -7350,7 +7354,7 @@ WERROR _spoolss_getprinterdataex(pipes_struct *p, SPOOL_Q_GETPRINTERDATAEX *q_u, */ if (strcmp(key, "PrinterDriverData") != 0) - return WERR_INVALID_PARAM; + return WERR_BADFILE; DEBUG(10, ("_spoolss_getprinterdataex: pass me to getprinterdata\n")); found = getprinterdata_printer(p, p->mem_ctx, handle, value, @@ -7369,7 +7373,7 @@ WERROR _spoolss_getprinterdataex(pipes_struct *p, SPOOL_Q_GETPRINTERDATAEX *q_u, *data = NULL; } - return WERR_BADFILE; + return WERR_INVALID_PARAM; } if (*needed > *out_size) |