Merge changes from CUPS 1.4svn-r7242.

[thirdparty/cups.git] / scheduler / auth.h

diff --git a/scheduler/auth.h b/scheduler/auth.h
index cd2e98e2fbbfd8960c155a29e3132d59b447f45b..e1434400b1c3ec002d604369081c2a6dcde0adc1 100644 (file)
--- a/scheduler/auth.h
+++ b/scheduler/auth.h
@@ -1,26 +1,17 @@
 /*
- * "$Id$"
+ * "$Id: auth.h 6780 2007-08-08 20:50:42Z mike $"
  *
  *   Authorization definitions for the Common UNIX Printing System (CUPS)
  *   scheduler.
  *
+ *   Copyright 2007-2008 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*
@@ -34,34 +25,36 @@
  * HTTP authorization types and levels...
  */
 
-#define AUTH_NONE              0       /* No authentication */
-#define AUTH_BASIC             1       /* Basic authentication */
-#define AUTH_DIGEST            2       /* Digest authentication */
-#define AUTH_BASICDIGEST       3       /* Basic authentication w/passwd.md5 */
-
-#define AUTH_ANON              0       /* Anonymous access */
-#define AUTH_USER              1       /* Must have a valid username/password */
-#define AUTH_GROUP             2       /* Must also be in a named group */
-
-#define AUTH_ALLOW             0       /* Allow access */
-#define AUTH_DENY              1       /* Deny access */
-
-#define AUTH_NAME              0       /* Authorize host by name */
-#define AUTH_IP                        1       /* Authorize host by IP */
-#define AUTH_INTERFACE         2       /* Authorize host by interface */
-
-#define AUTH_SATISFY_ALL       0       /* Satisfy both address and auth */
-#define AUTH_SATISFY_ANY       1       /* Satisfy either address or auth */
-
-#define AUTH_LIMIT_DELETE      1       /* Limit DELETE requests */
-#define AUTH_LIMIT_GET         2       /* Limit GET requests */
-#define AUTH_LIMIT_HEAD                4       /* Limit HEAD requests */
-#define AUTH_LIMIT_OPTIONS     8       /* Limit OPTIONS requests */
-#define AUTH_LIMIT_POST                16      /* Limit POST requests */
-#define AUTH_LIMIT_PUT         32      /* Limit PUT requests */
-#define AUTH_LIMIT_TRACE       64      /* Limit TRACE requests */
-#define AUTH_LIMIT_ALL         127     /* Limit all requests */
-#define AUTH_LIMIT_IPP         128     /* Limit IPP requests */
+#define CUPSD_AUTH_DEFAULT     -1      /* Use DefaultAuthType */
+#define CUPSD_AUTH_NONE                0       /* No authentication */
+#define CUPSD_AUTH_BASIC       1       /* Basic authentication */
+#define CUPSD_AUTH_DIGEST      2       /* Digest authentication */
+#define CUPSD_AUTH_BASICDIGEST 3       /* Basic authentication w/passwd.md5 */
+#define CUPSD_AUTH_NEGOTIATE   4       /* Kerberos authentication */
+
+#define CUPSD_AUTH_ANON                0       /* Anonymous access */
+#define CUPSD_AUTH_USER                1       /* Must have a valid username/password */
+#define CUPSD_AUTH_GROUP       2       /* Must also be in a named group */
+
+#define CUPSD_AUTH_ALLOW       0       /* Allow access */
+#define CUPSD_AUTH_DENY                1       /* Deny access */
+
+#define CUPSD_AUTH_NAME                0       /* Authorize host by name */
+#define CUPSD_AUTH_IP          1       /* Authorize host by IP */
+#define CUPSD_AUTH_INTERFACE   2       /* Authorize host by interface */
+
+#define CUPSD_AUTH_SATISFY_ALL 0       /* Satisfy both address and auth */
+#define CUPSD_AUTH_SATISFY_ANY 1       /* Satisfy either address or auth */
+
+#define CUPSD_AUTH_LIMIT_DELETE        1       /* Limit DELETE requests */
+#define CUPSD_AUTH_LIMIT_GET   2       /* Limit GET requests */
+#define CUPSD_AUTH_LIMIT_HEAD  4       /* Limit HEAD requests */
+#define CUPSD_AUTH_LIMIT_OPTIONS 8     /* Limit OPTIONS requests */
+#define CUPSD_AUTH_LIMIT_POST  16      /* Limit POST requests */
+#define CUPSD_AUTH_LIMIT_PUT   32      /* Limit PUT requests */
+#define CUPSD_AUTH_LIMIT_TRACE 64      /* Limit TRACE requests */
+#define CUPSD_AUTH_LIMIT_ALL   127     /* Limit all requests */
+#define CUPSD_AUTH_LIMIT_IPP   128     /* Limit IPP requests */
 
 #define IPP_ANY_OPERATION      (ipp_op_t)0
                                        /* Any IPP operation */
@@ -123,7 +116,7 @@ typedef struct cupsd_client_s cupsd_client_t;
 
 VAR cups_array_t       *Locations      VALUE(NULL);
                                        /* Authorization locations */
-VAR int                        DefaultAuthType VALUE(AUTH_BASIC);
+VAR int                        DefaultAuthType VALUE(CUPSD_AUTH_BASIC);
                                        /* Default AuthType, if not specified */
 #ifdef HAVE_SSL
 VAR http_encryption_t  DefaultEncryption VALUE(HTTP_ENCRYPT_REQUIRED);
@@ -141,6 +134,8 @@ extern void         cupsdAllowHost(cupsd_location_t *loc, char *name);
 extern void            cupsdAllowIP(cupsd_location_t *loc, unsigned address[4],
                                     unsigned netmask[4]);
 extern void            cupsdAuthorize(cupsd_client_t *con);
+extern int             cupsdCheckAccess(unsigned ip[4], char *name,
+                                        int namelen, cupsd_location_t *loc);
 extern int             cupsdCheckAuth(unsigned ip[4], char *name, int namelen,
                                       int num_masks, cupsd_authmask_t *masks);
 extern int             cupsdCheckGroup(const char *username,
@@ -158,5 +153,5 @@ extern http_status_t        cupsdIsAuthorized(cupsd_client_t *con, const char *owner);
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: auth.h 6780 2007-08-08 20:50:42Z mike $".
  */