Import CUPS v2.0b1

[thirdparty/cups.git] / cups / cups-private.h

diff --git a/cups/cups-private.h b/cups/cups-private.h
index 9328cdadf32b9ef233a3b5f41beb03d6aed64f5e..90420a220db681c76cc369ea604389baff2f1b40 100644 (file)
--- a/cups/cups-private.h
+++ b/cups/cups-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: cups-private.h 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id: cups-private.h 11851 2014-05-07 23:55:35Z msweet $"
  *
  *   Private definitions for CUPS.
  *
@@ -166,9 +166,9 @@ typedef struct _cups_globals_s              /**** CUPS global state data ****/
   void                 *server_cert_data;
                                        /* Server certificate user data */
   int                  server_version, /* Server IPP version */
-                       any_root,       /* Allow any root */
+                       any_root,       /* Allow any (e.g., self-signed) root */
                        expired_certs,  /* Allow expired certs */
-                       expired_root;   /* Allow expired root */
+                       validate_certs; /* Validate certificates */
 
   /* util.c */
   char                 def_printer[256];
@@ -281,5 +281,5 @@ extern char         *_cupsUserDefault(char *name, size_t namesize);
 #endif /* !_CUPS_CUPS_PRIVATE_H_ */
 
 /*
- * End of "$Id: cups-private.h 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id: cups-private.h 11851 2014-05-07 23:55:35Z msweet $".
  */