Merge changes from CUPS 1.6svn-r9939.

[thirdparty/cups.git] / cups / ipp.h

diff --git a/cups/ipp.h b/cups/ipp.h
index 4f3dd5eec74cd4989b1952de00185be7f7592e66..1626cabb2893dd0bb61f4ebbf42125bd8fc7494e 100644 (file)
--- a/cups/ipp.h
+++ b/cups/ipp.h
@@ -3,7 +3,7 @@
  *
  *   Internet Printing Protocol definitions for CUPS.
  *
- *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -93,7 +93,8 @@ typedef enum ipp_tag_e                        /**** Format tags for attributes ****/
   IPP_TAG_END_COLLECTION,              /* End of collection value */
   IPP_TAG_TEXT = 0x41,                 /* Text value */
   IPP_TAG_NAME,                                /* Name value */
-  IPP_TAG_KEYWORD = 0x44,              /* Keyword value */
+  IPP_TAG_RESERVED_STRING,             /* Reserved for future string value @private@ */
+  IPP_TAG_KEYWORD,                     /* Keyword value */
   IPP_TAG_URI,                         /* URI value */
   IPP_TAG_URISCHEME,                   /* URI scheme value */
   IPP_TAG_CHARSET,                     /* Character set value */
@@ -240,6 +241,7 @@ typedef enum ipp_op_e                       /**** IPP operations ****/
   IPP_CANCEL_MY_JOBS,                  /* Cancel-My-Jobs */
   IPP_RESUBMIT_JOB,                    /* Resubmit-Job */
   IPP_CLOSE_JOB,                       /* Close-Job */
+  IPP_IDENTIFY_PRINTER,                        /* Identify-Printer (proposed IPP JPS3) */
   IPP_PRIVATE = 0x4000,                        /* Reserved @private@ */
   CUPS_GET_DEFAULT,                    /* Get the default printer */
   CUPS_GET_PRINTERS,                   /* Get a list of printers and/or classes */
@@ -310,7 +312,11 @@ typedef enum ipp_status_e          /**** IPP status codes ****/
   IPP_PRINTER_BUSY,                    /* server-error-busy */
   IPP_ERROR_JOB_CANCELED,              /* server-error-job-canceled */
   IPP_MULTIPLE_JOBS_NOT_SUPPORTED,     /* server-error-multiple-document-jobs-not-supported */
-  IPP_PRINTER_IS_DEACTIVATED           /* server-error-printer-is-deactivated */
+  IPP_PRINTER_IS_DEACTIVATED,          /* server-error-printer-is-deactivated */
+
+  IPP_AUTHENTICATION_CANCELED = 0x1000,        /* Authentication canceled by user @since CUPS 1.5/Mac OS X 10.7@ */
+  IPP_PKI_ERROR,                       /* Error negotiating a secure connection @since CUPS 1.5/Mac OS X 10.7@ */
+  IPP_UPGRADE_REQUIRED                 /* TLS upgrade required */
 } ipp_status_t;
 #define IPP_ERROR_JOB_CANCELLED IPP_ERROR_JOB_CANCELED