*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)

2 files changed, 11 insertions, 8 deletions

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));
 
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index d41367af8b..cc3941fe96 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -54,15 +54,13 @@ struct printif	cups_printif =
  * 'cups_passwd_cb()' - The CUPS password callback...
  */
 
-const char *				/* O - Password or NULL */
+static const char *				/* O - Password or NULL */
 cups_passwd_cb(const char *prompt)	/* I - Prompt */
 {
  /*
   * Always return NULL to indicate that no password is available...
   */
 
-  (void)prompt;
-
   return (NULL);
 }
 
@@ -209,10 +207,10 @@ void cups_printer_fn(void (*fn)(char *, char *))
 /*
  * 'cups_printername_ok()' - Provide the equivalent of pcap_printername_ok()
  *                           for CUPS.
+ * O - 1 if printer name OK
+ * I - Name of printer 
  */
-
-int					/* O - 1 if printer name OK */
-cups_printername_ok(char *name)		/* I - Name of printer */
+int cups_printername_ok(const char *name)
 {
 	http_t		*http;		/* HTTP connection to server */
 	ipp_t		*request,	/* IPP Request */