From 99cdb462083381c88689a4e698ca48b6ed4cf5ac Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 15 Jan 2003 18:57:41 +0000 Subject: *lots of small merges form HEAD *sync up configure.in *don't build torture tools in make all *make sure to remove torture tools as part of make clean (This used to be commit 0fb724b3216eeeb97e61ff12755ca3a31bcad6ef) --- source3/printing/nt_printing.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'source3/printing/nt_printing.c') diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 72e3d38bb3..73f1dd5f0d 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -2738,9 +2738,14 @@ BOOL is_printer_published(int snum, GUID *guid) SPOOL_DSSPOOLER_KEY)) < 0) return False; - ctr = &printer->info_2->data.keys[i].values; + if (!(ctr = &printer->info_2->data.keys[i].values)) { + return False; + } + + if (!(guid_val = regval_ctr_getvalue(ctr, "objectGUID"))) { + return False; + } - guid_val = regval_ctr_getvalue(ctr, "objectGUID"); if (regval_size(guid_val) == sizeof(GUID)) memcpy(guid, regval_data_p(guid_val), sizeof(GUID)); -- cgit