diff options
| author | Jeremy Allison <jra@samba.org> | 2002-01-23 03:15:04 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2002-01-23 03:15:04 +0000 |
| commit | 6b0ee142a694f29ecef91b22d0406a8362a7eb46 (patch) | |
| tree | 58aac14d3791d28b52607a4a1be24ffbbf40e4be | |
| parent | 6aecfb149e6c1dcfb6b952a88079f90120e3ba43 (diff) | |
| download | samba-6b0ee142a694f29ecef91b22d0406a8362a7eb46.tar.gz samba-6b0ee142a694f29ecef91b22d0406a8362a7eb46.tar.xz samba-6b0ee142a694f29ecef91b22d0406a8362a7eb46.zip | |
Don't clear a printer handle before passing it to the close fn (D'oh !).
Jeremy.
| -rw-r--r-- | source/libsmb/unexpected.c | 2 | ||||
| -rw-r--r-- | source/rpc_server/srv_spoolss_nt.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/libsmb/unexpected.c b/source/libsmb/unexpected.c index b77e7490a0d..6a54250506d 100644 --- a/source/libsmb/unexpected.c +++ b/source/libsmb/unexpected.c @@ -147,7 +147,7 @@ check for a particular packet in the unexpected packet queue struct packet_struct *receive_unexpected(enum packet_type packet_type, int id, char *mailslot_name) { - TDB_CONTEXT *tdb2; + TDB_CONTEXT *tdb2 = NULL; tdb2 = tdb_open_log(lock_path("unexpected.tdb"), 0, 0, O_RDONLY, 0); if (!tdb2) return NULL; diff --git a/source/rpc_server/srv_spoolss_nt.c b/source/rpc_server/srv_spoolss_nt.c index d8151c507bf..981c2c52a3f 100644 --- a/source/rpc_server/srv_spoolss_nt.c +++ b/source/rpc_server/srv_spoolss_nt.c @@ -1027,16 +1027,16 @@ WERROR _spoolss_closeprinter(pipes_struct *p, SPOOL_Q_CLOSEPRINTER *q_u, SPOOL_R if (Printer && Printer->document_started) _spoolss_enddocprinter_internal(p, handle); /* print job was not closed */ + if (!close_printer_handle(p, handle)) + return WERR_BADFID; + /* clear the returned printer handle. Observed behavior from Win2k server. Don't think this really matters. Previous code just copied the value of the closed handle. --jerry */ - memset(&r_u->handle, 0x0, sizeof(r_u->handle)); + memset(&r_u->handle, '\0', sizeof(r_u->handle)); - if (!close_printer_handle(p, handle)) - return WERR_BADFID; - return WERR_OK; } |