Merge changes from CUPS 1.5svn-r8950.

[thirdparty/cups.git] / config.h.in

diff --git a/config.h.in b/config.h.in
index 5199ee4f381dd3a3e547bc854fb908de9f89a817..cf33d3ac129f16519e7396135d8c413caff1ec87 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -1,9 +1,9 @@
 /*
- * "$Id: config.h.in 7687 2008-06-24 01:28:36Z mike $"
+ * "$Id: config.h.in 7918 2008-09-08 22:03:01Z mike $"
  *
  *   Configuration file for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2009 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -31,7 +31,7 @@
 #define CUPS_DEFAULT_USER      "lp"
 #define CUPS_DEFAULT_GROUP     "sys"
 #define CUPS_DEFAULT_SYSTEM_GROUPS     "sys root system"
-#define CUPS_DEFAULT_PRINTADMIN_AUTH   "@SYSTEM"
+#define CUPS_DEFAULT_PRINTOPERATOR_AUTH        "@SYSTEM"
 
 
 /*
@@ -335,14 +335,6 @@
 #undef HAVE_DNSSD
 
 
-/*
- * Do we have Darwin's CoreFoundation and SystemConfiguration frameworks?
- */
-
-#undef HAVE_COREFOUNDATION
-#undef HAVE_SYSTEMCONFIGURATION
-
-
 /*
  * Do we have <sys/ioctl.h>?
  */
@@ -350,14 +342,6 @@
 #undef HAVE_SYS_IOCTL_H
 
 
-/*
- * Do we have mkstemp() and/or mkstemps()?
- */
-
-#undef HAVE_MKSTEMP
-#undef HAVE_MKSTEMPS
-
-
 /*
  * Does the "tm" structure contain the "tm_gmtoff" member?
  */
@@ -434,6 +418,7 @@
 
 #undef HAVE_USERSEC_H
 
+
 /*
  * Do we have pthread support?
  */
@@ -541,6 +526,7 @@
 #undef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY
 #undef HAVE_GSS_C_NT_HOSTBASED_SERVICE
 #undef HAVE_KRB5_CC_NEW_UNIQUE
+#undef HAVE_KRB5_IPC_CLIENT_SET_TARGET_UID
 #undef HAVE_KRB5_H
 #undef HAVE_HEIMDAL
 
@@ -600,10 +586,31 @@
  * Which random number generator function to use...
  */
 
+#undef HAVE_ARC4RANDOM
 #undef HAVE_RANDOM
-#undef HAVE_MRAND48
 #undef HAVE_LRAND48
 
+#ifdef HAVE_ARC4RANDOM
+#  define CUPS_RAND() arc4random()
+#  define CUPS_SRAND(v) arc4random_stir()
+#elif defined(HAVE_RANDOM)
+#  define CUPS_RAND() random()
+#  define CUPS_SRAND(v) srandom(v)
+#elif defined(HAVE_LRAND48)
+#  define CUPS_RAND() lrand48()
+#  define CUPS_SRAND(v) srand48(v)
+#else
+#  define CUPS_RAND() rand()
+#  define CUPS_SRAND(v) srand(v)
+#endif /* HAVE_ARC4RANDOM */
+
+
+/*
+ * Do we have vproc_transaction_begin/end?
+ */
+
+#undef HAVE_VPROC_TRANSACTION_BEGIN
+
 
 /*
  * Do we have libusb?
@@ -622,5 +629,5 @@
 #endif /* !_CUPS_CONFIG_H_ */
 
 /*
- * End of "$Id: config.h.in 7687 2008-06-24 01:28:36Z mike $".
+ * End of "$Id: config.h.in 7918 2008-09-08 22:03:01Z mike $".
  */