Fix a couple memory leaks in ippfind that were reported by Clang.

[thirdparty/cups.git] / cups / getdevices.c

diff --git a/cups/getdevices.c b/cups/getdevices.c
index 76122ceadd7e8c2cfe4e0df7fc68d331e3429f19..0d539785851df02f4d332241c2afc38e07ec156d 100644 (file)
--- a/cups/getdevices.c
+++ b/cups/getdevices.c
@@ -1,9 +1,9 @@
 /*
  * "$Id$"
  *
- *   cupsGetDevices implementation for the Common UNIX Printing System (CUPS).
+ *   cupsGetDevices implementation for CUPS.
  *
- *   Copyright 2008-2010 by Apple Inc.
+ *   Copyright 2008-2013 by Apple Inc.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Apple Inc. and are protected by Federal copyright
@@ -22,8 +22,7 @@
  * Include necessary headers...
  */
 
-#include "globals.h"
-#include "debug.h"
+#include "cups-private.h"
 
 
 /*
@@ -35,7 +34,7 @@
  * parameters provide comma-delimited lists of backends to include or omit from
  * the request respectively.
  *
- * @since CUPS 1.4/Mac OS X 10.6@
+ * @since CUPS 1.4/OS X 10.6@
  */
 
 ipp_status_t                           /* O - Request status - @code IPP_OK@ on success. */
@@ -72,19 +71,19 @@ cupsGetDevices(
                user_data));
 
   if (!callback)
-    return (IPP_INTERNAL_ERROR);
+    return (IPP_STATUS_ERROR_INTERNAL);
 
   if (!http)
     http = _cupsConnect();
 
   if (!http)
-    return (IPP_SERVICE_UNAVAILABLE);
+    return (IPP_STATUS_ERROR_SERVICE_UNAVAILABLE);
 
  /*
   * Create a CUPS-Get-Devices request...
   */
 
-  request = ippNewRequest(CUPS_GET_DEVICES);
+  request = ippNewRequest(IPP_OP_CUPS_GET_DEVICES);
 
   if (timeout > 0)
     ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "timeout",
@@ -107,21 +106,62 @@ cupsGetDevices(
   }
 
  /*
-  * Send the request...
+  * Send the request and do any necessary authentication...
   */
 
-  DEBUG_puts("2cupsGetDevices: Sending request...");
-  status = cupsSendRequest(http, request, "/", ippLength(request));
+  do
+  {
+    DEBUG_puts("2cupsGetDevices: Sending request...");
+    status = cupsSendRequest(http, request, "/", ippLength(request));
+
+    DEBUG_puts("2cupsGetDevices: Waiting for response status...");
+    while (status == HTTP_STATUS_CONTINUE)
+      status = httpUpdate(http);
+
+    if (status != HTTP_STATUS_OK)
+    {
+      httpFlush(http);
+
+      if (status == HTTP_STATUS_UNAUTHORIZED)
+      {
+       /*
+       * See if we can do authentication...
+       */
+
+       DEBUG_puts("2cupsGetDevices: Need authorization...");
+
+       if (!cupsDoAuthentication(http, "POST", "/"))
+         httpReconnect2(http, 30000, NULL);
+       else
+       {
+         status = HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED;
+         break;
+       }
+      }
+
+#ifdef HAVE_SSL
+      else if (status == HTTP_STATUS_UPGRADE_REQUIRED)
+      {
+       /*
+       * Force a reconnect with encryption...
+       */
+
+       DEBUG_puts("2cupsGetDevices: Need encryption...");
 
-  DEBUG_puts("2cupsGetDevices: Waiting for response status...");
-  while (status == HTTP_CONTINUE)
-    status = httpUpdate(http);
+       if (!httpReconnect2(http, 30000, NULL))
+         httpEncryption(http, HTTP_ENCRYPTION_REQUIRED);
+      }
+#endif /* HAVE_SSL */
+    }
+  }
+  while (status == HTTP_STATUS_UNAUTHORIZED ||
+         status == HTTP_STATUS_UPGRADE_REQUIRED);
 
   DEBUG_printf(("2cupsGetDevices: status=%d", status));
 
   ippDelete(request);
 
-  if (status != HTTP_OK)
+  if (status != HTTP_STATUS_OK)
   {
     _cupsSetHTTPError(status);
     return (cupsLastError());
@@ -147,7 +187,7 @@ cupsGetDevices(
 
   do
   {
-    if ((state = ippRead(http, response)) == IPP_ERROR)
+    if ((state = ippRead(http, response)) == IPP_STATE_ERROR)
       break;
 
     DEBUG_printf(("2cupsGetDevices: state=%d, response->last=%p", state,
@@ -201,7 +241,7 @@ cupsGetDevices(
         device_uri = attr->values[0].string.text;
     }
   }
-  while (state != IPP_DATA);
+  while (state != IPP_STATE_DATA);
 
   DEBUG_printf(("2cupsGetDevices: state=%d, response->last=%p", state,
                response->last));
@@ -218,8 +258,8 @@ cupsGetDevices(
   httpBlocking(http, blocking);
   httpFlush(http);
 
-  if (status == HTTP_ERROR)
-    _cupsSetError(IPP_ERROR, NULL, 0);
+  if (status == HTTP_STATUS_ERROR)
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(http->error), 0);
   else
   {
     attr = ippFindAttribute(response, "status-message", IPP_TAG_TEXT);