Merge changes from CUPS 1.5svn-r9675.

[thirdparty/cups.git] / scheduler / main.c

diff --git a/scheduler/main.c b/scheduler/main.c
index d043875cc46a09d1ededadbc78542f06c9921f22..411c6521084a4bfccd92fa6a492745950e366ffe 100644 (file)
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -21,7 +21,6 @@
  *   cupsdClosePipe()      - Close a pipe as necessary.
  *   cupsdFreeStrings()    - Free an array of strings.
  *   cupsdHoldSignals()    - Hold child and termination signals.
- *   cupsdMakeUUID()       - Make a UUID URI conforming to RFC 4122.
  *   cupsdOpenPipe()       - Create a pipe which is closed on exec.
  *   cupsdReleaseSignals() - Release signals for delivery.
  *   cupsdSetString()      - Set a string value.
@@ -947,6 +946,7 @@ main(int  argc,                             /* I - Number of command-line args */
       browse_time = current_time;
     }
 
+#ifndef HAVE_AUTHORIZATION_H
    /*
     * Update the root certificate once every 5 minutes if we have client
     * connections...
@@ -962,6 +962,7 @@ main(int  argc,                             /* I - Number of command-line args */
       cupsdDeleteCert(0);
       cupsdAddCert(0, "root", NULL);
     }
+#endif /* !HAVE_AUTHORIZATION_H */
 
    /*
     * Check for new data on the client sockets...
@@ -1298,54 +1299,6 @@ cupsdHoldSignals(void)
 }
 
 
-/*
- * 'cupsdMakeUUID()' - Make a UUID URI conforming to RFC 4122.
- *
- * The buffer needs to be at least 46 bytes in size.
- */
-
-char *                                 /* I - UUID string */
-cupsdMakeUUID(const char *name,                /* I - Object name */
-              int        number,       /* I - Object number */
-             char       *buffer,       /* I - String buffer */
-             size_t     bufsize)       /* I - Size of buffer */
-{
-  char                 data[1024];     /* Source string for MD5 */
-  _cups_md5_state_t    md5state;       /* MD5 state */
-  unsigned char                md5sum[16];     /* MD5 digest/sum */
-
-
- /*
-  * Build a version 3 UUID conforming to RFC 4122.
-  *
-  * Start with the MD5 sum of the ServerName, RemotePort, object name and
-  * number, and some random data on the end.
-  */
-
-  snprintf(data, sizeof(data), "%s:%d:%s:%d:%04x:%04x", ServerName,
-           RemotePort, name ? name : ServerName, number,
-          CUPS_RAND() & 0xffff, CUPS_RAND() & 0xffff);
-
-  _cupsMD5Init(&md5state);
-  _cupsMD5Append(&md5state, (unsigned char *)data, strlen(data));
-  _cupsMD5Finish(&md5state, md5sum);
-
- /*
-  * Generate the UUID from the MD5...
-  */
-
-  snprintf(buffer, bufsize,
-           "urn:uuid:%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-"
-          "%02x%02x%02x%02x%02x%02x",
-          md5sum[0], md5sum[1], md5sum[2], md5sum[3], md5sum[4], md5sum[5],
-          (md5sum[6] & 15) | 0x30, md5sum[7], (md5sum[8] & 0x3f) | 0x40,
-          md5sum[9], md5sum[10], md5sum[11], md5sum[12], md5sum[13],
-          md5sum[14], md5sum[15]);
-
-  return (buffer);
-}
-
-
 /*
  * 'cupsdOpenPipe()' - Create a pipe which is closed on exec.
  */