diff options
| author | Jeremy Allison <jra@samba.org> | 2000-11-10 19:36:34 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2000-11-10 19:36:34 +0000 |
| commit | c1900772ce6fdedc5c380d88f3640107d52e2096 (patch) | |
| tree | 2751cd4bb9ffd370f8651f941c83b4a488e1787d /source3/printing/printing.c | |
| parent | 3c330068adb081499285d20c8d299d7f70aaf603 (diff) | |
| download | samba-c1900772ce6fdedc5c380d88f3640107d52e2096.tar.gz samba-c1900772ce6fdedc5c380d88f3640107d52e2096.tar.bz2 samba-c1900772ce6fdedc5c380d88f3640107d52e2096.zip | |
printing/nt_printing.c: use getpwuid not smbgetpwuid. Canonicalize printernames.
printing/printing.c: Insure fix for malloc of zero.
rpc_parse/parse_misc.c: Enusre UNISTR's are zero filled.
rpc_parse/parse_spoolss.c: Correct INFO_6 - differs between pre-releases of W2K and shipping build.
rpc_server/srv_spoolss_nt.c: Canonicalize printernames.
Jeremy.
(This used to be commit b17e23a8ff2b44540726968355a4b7e26f244f3b)
Diffstat (limited to 'source3/printing/printing.c')
| -rw-r--r-- | source3/printing/printing.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source3/printing/printing.c b/source3/printing/printing.c index 9fa4b9b8c6..77e32d5bf0 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -1003,6 +1003,8 @@ int print_queue_status(int snum, /* make sure the database is up to date */ if (print_cache_expired(snum)) print_queue_update(snum); + + *queue = NULL; /* * Count the number of entries. @@ -1011,6 +1013,9 @@ int print_queue_status(int snum, tsc.snum = snum; tdb_traverse(tdb, traverse_count_fn_queue, (void *)&tsc); + if (tsc.count == 0) + return 0; + /* Allocate the queue size. */ if (( tstruct.queue = (print_queue_struct *)malloc(sizeof(print_queue_struct)*tsc.count)) == NULL) |