Load cups into easysw/current.

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

diff --git a/scheduler/auth.h b/scheduler/auth.h
index f78b587e5bd24b22e384465b61a25e103b905679..87bd72cd986e49cf104712b375fa6c512e525239 100644 (file)
--- a/scheduler/auth.h
+++ b/scheduler/auth.h
@@ -1,10 +1,10 @@
 /*
- * "$Id: auth.h 4812 2005-10-25 18:23:10Z mike $"
+ * "$Id: auth.h 5305 2006-03-18 03:05:12Z mike $"
  *
  *   Authorization definitions for the Common UNIX Printing System (CUPS)
  *   scheduler.
  *
- *   Copyright 1997-2005 by Easy Software Products, all rights reserved.
+ *   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
@@ -97,8 +97,7 @@ typedef struct
 
 typedef struct
 {
-  char                 location[HTTP_MAX_URI];
-                                       /* Location of resource */
+  char                 *location;      /* Location of resource */
   ipp_op_t             op;             /* IPP operation */
   int                  limit,          /* Limit for these types of requests */
                        length,         /* Length of location string */
@@ -122,12 +121,14 @@ typedef struct cupsd_client_s cupsd_client_t;
  * Globals...
  */
 
-VAR int                        NumLocations    VALUE(0);
-                                       /* Number of authorization locations */
-VAR cupsd_location_t   *Locations      VALUE(NULL);
+VAR cups_array_t       *Locations      VALUE(NULL);
                                        /* Authorization locations */
 VAR int                        DefaultAuthType VALUE(AUTH_BASIC);
                                        /* Default AuthType, if not specified */
+#ifdef HAVE_SSL
+VAR http_encryption_t  DefaultEncryption VALUE(HTTP_ENCRYPT_REQUIRED);
+                                       /* Default encryption for authentication */
+#endif /* HAVE_SSL */
 
 
 /*
@@ -153,11 +154,9 @@ extern void                cupsdDenyIP(cupsd_location_t *loc, unsigned address[4],
                                    unsigned netmask[4]);
 extern cupsd_location_t        *cupsdFindBest(const char *path, http_state_t state);
 extern cupsd_location_t        *cupsdFindLocation(const char *location);
-extern char            *cupsdGetMD5Passwd(const char *username, const char *group,
-                                          char passwd[33]);
 extern http_status_t   cupsdIsAuthorized(cupsd_client_t *con, const char *owner);
 
 
 /*
- * End of "$Id: auth.h 4812 2005-10-25 18:23:10Z mike $".
+ * End of "$Id: auth.h 5305 2006-03-18 03:05:12Z mike $".
  */