]> git.ipfire.org Git - thirdparty/cups.git/blobdiff - scheduler/auth.c
Merge changes from CUPS 1.6svn-r9968.
[thirdparty/cups.git] / scheduler / auth.c
index 83aa9c113f4d3f3379ef58791aaa1fd51b1ac3ad..01f16634eb57d0f20e3d8e95e46a947140312dc3 100644 (file)
@@ -1,53 +1,49 @@
 /*
- * "$Id: auth.c 5232 2006-03-05 17:59:19Z mike $"
+ * "$Id: auth.c 7830 2008-08-04 20:38:50Z mike $"
  *
- *   Authorization routines for the Common UNIX Printing System (CUPS).
+ *   Authorization routines for the CUPS scheduler.
  *
- *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 1997-2007 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
+ *   This file contains Kerberos support code, copyright 2006 by
+ *   Jelmer Vernooij.
  *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   These coded instructions, statements, and computer programs are the
+ *   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/".
  *
  * Contents:
  *
+ *   cupsdAddIPMask()          - Add an IP address authorization mask.
  *   cupsdAddLocation()        - Add a location for authorization.
  *   cupsdAddName()            - Add a name to a location...
- *   cupsdAllowHost()          - Add a host name that is allowed to access the
- *                               location.
- *   cupsdAllowIP()            - Add an IP address or network that is allowed to
- *                               access the location.
+ *   cupsdAddNameMask()        - Add a host or interface name authorization
+ *                               mask.
+ *   cupsdAuthorize()          - Validate any authorization credentials.
+ *   cupsdCheckAccess()        - Check whether the given address is allowed to
+ *                               access a location.
  *   cupsdCheckAuth()          - Check authorization masks.
  *   cupsdCheckGroup()         - Check for a user's group membership.
  *   cupsdCopyLocation()       - Make a copy of a location...
- *   cupsdDeleteAllLocations() - Free all memory used for location authorization.
- *   cupsdDeleteLocation()     - Free all memory used by a location.
- *   cupsdDenyHost()           - Add a host name that is not allowed to access the
- *                               location.
- *   cupsdDenyIP()             - Add an IP address or network that is not allowed
- *                               to access the location.
+ *   cupsdDeleteAllLocations() - Free all memory used for location
+ *                               authorization.
  *   cupsdFindBest()           - Find the location entry that best matches the
  *                               resource.
  *   cupsdFindLocation()       - Find the named location.
- *   cupsdGetMD5Passwd()       - Get an MD5 password.
+ *   cupsdFreeLocation()       - Free all memory used by a location.
  *   cupsdIsAuthorized()       - Check to see if the user is authorized...
- *   add_allow()               - Add an allow mask to the location.
- *   add_deny()                - Add a deny mask to the location.
+ *   cupsdNewLocation()        - Create a new location for authorization.
+ *   check_authref()           - Check if an authorization services reference
+ *                               has the supplied right.
  *   compare_locations()       - Compare two locations.
+ *   copy_authmask()           - Copy function for auth masks.
  *   cups_crypt()              - Encrypt the password using the DES or MD5
  *                               algorithms, as needed.
+ *   free_authmask()           - Free function for auth masks.
+ *   get_md5_password()        - Get an MD5 password.
  *   pam_func()                - PAM conversation function.
  *   to64()                    - Base64-encode an integer value...
  */
 #ifdef HAVE_MEMBERSHIP_H
 #  include <membership.h>
 #endif /* HAVE_MEMBERSHIP_H */
+#ifdef HAVE_AUTHORIZATION_H
+#  include <Security/AuthorizationTags.h>
+#  ifdef HAVE_SECBASEPRIV_H
+#    include <Security/SecBasePriv.h>
+#  else
+extern const char *cssmErrorString(int error);
+#  endif /* HAVE_SECBASEPRIV_H */
+#endif /* HAVE_AUTHORIZATION_H */
+#ifdef HAVE_SYS_PARAM_H
+#  include <sys/param.h>
+#endif /* HAVE_SYS_PARAM_H */
+#ifdef HAVE_SYS_UCRED_H
+#  include <sys/ucred.h>
+typedef struct xucred cupsd_ucred_t;
+#  define CUPSD_UCRED_UID(c) (c).cr_uid
+#else
+typedef struct ucred cupsd_ucred_t;
+#  define CUPSD_UCRED_UID(c) (c).uid
+#endif /* HAVE_SYS_UCRED_H */
+#ifdef HAVE_KRB5_IPC_CLIENT_SET_TARGET_UID
+/* Not in public headers... */
+extern void    krb5_ipc_client_set_target_uid(uid_t);
+extern void    krb5_ipc_client_clear_target(void);
+#endif /* HAVE_KRB5_IPC_CLIENT_SET_TARGET_UID */
 
 
 /*
  * Local functions...
  */
 
-static cupsd_authmask_t        *add_allow(cupsd_location_t *loc);
-static cupsd_authmask_t        *add_deny(cupsd_location_t *loc);
+#ifdef HAVE_AUTHORIZATION_H
+static int             check_authref(cupsd_client_t *con, const char *right);
+#endif /* HAVE_AUTHORIZATION_H */
 static int             compare_locations(cupsd_location_t *a,
                                          cupsd_location_t *b);
-#if !HAVE_LIBPAM
+static cupsd_authmask_t        *copy_authmask(cupsd_authmask_t *am, void *data);
+#if !HAVE_LIBPAM && !defined(HAVE_USERSEC_H)
 static char            *cups_crypt(const char *pw, const char *salt);
-#endif /* !HAVE_LIBPAM */
+#endif /* !HAVE_LIBPAM && !HAVE_USERSEC_H */
+static void            free_authmask(cupsd_authmask_t *am, void *data);
+static char            *get_md5_password(const char *username,
+                                         const char *group, char passwd[33]);
 #if HAVE_LIBPAM
 static int             pam_func(int, const struct pam_message **,
                                 struct pam_response **, void *);
-#else
+#elif !defined(HAVE_USERSEC_H)
 static void            to64(char *s, unsigned long v, int n);
 #endif /* HAVE_LIBPAM */
 
@@ -115,55 +140,72 @@ typedef struct cupsd_authdata_s           /**** Authentication data ****/
  * Local globals...
  */
 
-#if defined(__hpux) && defined(HAVE_LIBPAM)
+#if defined(__hpux) && HAVE_LIBPAM
 static cupsd_authdata_t        *auth_data;     /* Current client being authenticated */
 #endif /* __hpux && HAVE_LIBPAM */
 
 
 /*
- * 'cupsdAddLocation()' - Add a location for authorization.
+ * 'cupsdAddIPMask()' - Add an IP address authorization mask.
  */
 
-cupsd_location_t *                     /* O - Pointer to new location record */
-cupsdAddLocation(const char *location) /* I - Location path */
+int                                    /* O  - 1 on success, 0 on failure */
+cupsdAddIPMask(
+    cups_array_t   **masks,            /* IO - Masks array (created as needed) */
+    const unsigned address[4],         /* I  - IP address */
+    const unsigned netmask[4])         /* I  - IP netmask */
 {
-  cupsd_location_t     *temp;          /* New location */
-
+  cupsd_authmask_t     temp;           /* New host/domain mask */
 
- /*
-  * Make sure the locations array is created...
-  */
 
-  if (!Locations)
-    Locations = cupsArrayNew((cups_array_func_t)compare_locations, NULL);
+  cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                  "cupsdAddIPMask(masks=%p(%p), address=%x:%x:%x:%x, "
+                 "netmask=%x:%x:%x:%x)",
+                 masks, *masks,
+                 address[0], address[1], address[2], address[3],
+                 netmask[0], netmask[1], netmask[2], netmask[3]);
 
-  if (!Locations)
-    return (NULL);
+  temp.type = CUPSD_AUTH_IP;
+  memcpy(temp.mask.ip.address, address, sizeof(temp.mask.ip.address));
+  memcpy(temp.mask.ip.netmask, netmask, sizeof(temp.mask.ip.netmask));
 
  /*
-  * Try to allocate memory for the new location.
+  * Create the masks array as needed and add...
   */
 
-  if ((temp = calloc(1, sizeof(cupsd_location_t))) == NULL)
-    return (NULL);
+  if (!*masks)
+    *masks = cupsArrayNew3(NULL, NULL, NULL, 0,
+                          (cups_acopy_func_t)copy_authmask,
+                          (cups_afree_func_t)free_authmask);
 
- /*
-  * Initialize the record and copy the name over...
-  */
-
-  temp->location = strdup(location);
-  temp->length   = strlen(temp->location);
+  return (cupsArrayAdd(*masks, &temp));
+}
 
-  cupsArrayAdd(Locations, temp);
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdAddLocation: added location \'%s\'",
-                  location);
+/*
+ * 'cupsdAddLocation()' - Add a location for authorization.
+ */
 
+void
+cupsdAddLocation(cupsd_location_t *loc)        /* I - Location to add */
+{
  /*
-  * Return the new record...
+  * Make sure the locations array is created...
   */
 
-  return (temp);
+  if (!Locations)
+    Locations = cupsArrayNew3((cups_array_func_t)compare_locations, NULL,
+                              (cups_ahash_func_t)NULL, 0,
+                             (cups_acopy_func_t)NULL,
+                             (cups_afree_func_t)cupsdFreeLocation);
+
+  if (Locations)
+  {
+    cupsArrayAdd(Locations, loc);
+
+    cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdAddLocation: Added location \"%s\"",
+                    loc->location ? loc->location : "(null)");
+  }
 }
 
 
@@ -175,125 +217,98 @@ void
 cupsdAddName(cupsd_location_t *loc,    /* I - Location to add to */
              char             *name)   /* I - Name to add */
 {
-  char **temp;                         /* Pointer to names array */
-
-
   cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdAddName(loc=%p, name=\"%s\")",
                   loc, name);
 
-  if (loc->num_names == 0)
-    temp = malloc(sizeof(char *));
-  else
-    temp = realloc(loc->names, (loc->num_names + 1) * sizeof(char *));
-
-  if (temp == NULL)
-  {
-    cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to add name to location %s: %s",
-                    loc->location, strerror(errno));
-    return;
-  }
-
-  loc->names = temp;
+  if (!loc->names)
+    loc->names = cupsArrayNew3(NULL, NULL, NULL, 0,
+                               (cups_acopy_func_t)_cupsStrAlloc,
+                               (cups_afree_func_t)_cupsStrFree);
 
-  if ((temp[loc->num_names] = strdup(name)) == NULL)
+  if (!cupsArrayAdd(loc->names, name))
   {
     cupsdLogMessage(CUPSD_LOG_ERROR,
                     "Unable to duplicate name for location %s: %s",
-                    loc->location, strerror(errno));
+                    loc->location ? loc->location : "nil", strerror(errno));
     return;
   }
-
-  loc->num_names ++;
 }
 
 
 /*
- * 'cupsdAllowHost()' - Add a host name that is allowed to access the location.
+ * 'cupsdAddNameMask()' - Add a host or interface name authorization mask.
  */
 
-void
-cupsdAllowHost(cupsd_location_t *loc,  /* I - Location to add to */
-               char             *name) /* I - Name of host or domain to add */
+int                                    /* O  - 1 on success, 0 on failure */
+cupsdAddNameMask(cups_array_t **masks, /* IO - Masks array (created as needed) */
+                 char         *name)   /* I  - Host or interface name */
 {
-  cupsd_authmask_t     *temp;          /* New host/domain mask */
+  cupsd_authmask_t     temp;           /* New host/domain mask */
   char                 ifname[32],     /* Interface name */
                        *ifptr;         /* Pointer to end of name */
 
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdAllowHost(loc=%p(%s), name=\"%s\")",
-                  loc, loc->location, name);
-
-  if ((temp = add_allow(loc)) == NULL)
-    return;
+  cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                  "cupsdAddNameMask(masks=%p(%p), name=\"%s\")",
+                  masks, *masks, name);
 
-  if (!strcasecmp(name, "@LOCAL"))
+  if (!_cups_strcasecmp(name, "@LOCAL"))
   {
    /*
-    * Allow *interface*...
+    * Deny *interface*...
     */
 
-    temp->type             = AUTH_INTERFACE;
-    temp->mask.name.name   = strdup("*");
-    temp->mask.name.length = 1;
+    temp.type           = CUPSD_AUTH_INTERFACE;
+    temp.mask.name.name = (char *)"*";
   }
-  else if (!strncasecmp(name, "@IF(", 4))
+  else if (!_cups_strncasecmp(name, "@IF(", 4))
   {
    /*
-    * Allow *interface*...
+    * Deny *interface*...
     */
 
     strlcpy(ifname, name + 4, sizeof(ifname));
 
-    ifptr = ifname + strlen(ifname);
+    ifptr = ifname + strlen(ifname) - 1;
 
-    if (ifptr[-1] == ')')
+    if (ifptr >= ifname && *ifptr == ')')
     {
       ifptr --;
       *ifptr = '\0';
     }
 
-    temp->type             = AUTH_INTERFACE;
-    temp->mask.name.name   = strdup(ifname);
-    temp->mask.name.length = ifptr - ifname;
+    temp.type             = CUPSD_AUTH_INTERFACE;
+    temp.mask.name.name   = ifname;
   }
   else
   {
    /*
-    * Allow name...
+    * Deny name...
     */
 
-    temp->type             = AUTH_NAME;
-    temp->mask.name.name   = strdup(name);
-    temp->mask.name.length = strlen(name);
-  }
-}
+    if (*name == '*')
+      name ++;
 
+    temp.type             = CUPSD_AUTH_NAME;
+    temp.mask.name.name   = (char *)name;
+  }
 
-/*
- * 'cupsdAllowIP()' - Add an IP address or network that is allowed to access
- *                    the location.
- */
-
-void
-cupsdAllowIP(cupsd_location_t *loc,    /* I - Location to add to */
-             unsigned   address[4],    /* I - IP address to add */
-             unsigned   netmask[4])    /* I - Netmask of address */
-{
-  cupsd_authmask_t     *temp;          /* New host/domain mask */
+ /*
+  * Set the name length...
+  */
 
+  temp.mask.name.length = strlen(temp.mask.name.name);
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                  "cupsdAllowIP(loc=%p(%s), address=%x:%x:%x:%x, netmask=%x:%x:%x:%x)",
-                 loc, loc->location, address[0], address[1], address[2],
-                 address[3], netmask[0], netmask[1], netmask[2],
-                 netmask[3]);
+ /*
+  * Create the masks array as needed and add...
+  */
 
-  if ((temp = add_allow(loc)) == NULL)
-    return;
+  if (!*masks)
+    *masks = cupsArrayNew3(NULL, NULL, NULL, 0,
+                          (cups_acopy_func_t)copy_authmask,
+                          (cups_afree_func_t)free_authmask);
 
-  temp->type = AUTH_IP;
-  memcpy(temp->mask.ip.address, address, sizeof(temp->mask.ip.address));
-  memcpy(temp->mask.ip.netmask, netmask, sizeof(temp->mask.ip.netmask));
+  return (cupsArrayAdd(*masks, &temp));
 }
 
 
@@ -305,11 +320,11 @@ void
 cupsdAuthorize(cupsd_client_t *con)    /* I - Client connection */
 {
   int          type;                   /* Authentication type */
-  char         *authorization,         /* Pointer into Authorization string */
-               *ptr,                   /* Pointer into string */
-               username[65],           /* Username string */
+  const char   *authorization;         /* Pointer into Authorization string */
+  char         *ptr,                   /* Pointer into string */
+               username[256],          /* Username string */
                password[33];           /* Password string */
-  const char   *localuser;             /* Certificate username */
+  cupsd_cert_t *localuser;             /* Certificate username */
   char         nonce[HTTP_MAX_VALUE],  /* Nonce value from client */
                md5[33],                /* MD5 password */
                basicmd5[33];           /* MD5 of Basic password */
@@ -338,13 +353,19 @@ cupsdAuthorize(cupsd_client_t *con)       /* I - Client connection */
   */
 
   con->best = cupsdFindBest(con->uri, con->http.state);
+  con->type = CUPSD_AUTH_NONE;
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2,
                   "cupsdAuthorize: con->uri=\"%s\", con->best=%p(%s)",
                   con->uri, con->best, con->best ? con->best->location : "");
 
-  if (con->best && con->best->type != AUTH_NONE)
-    type = con->best->type;
+  if (con->best && con->best->type != CUPSD_AUTH_NONE)
+  {
+    if (con->best->type == CUPSD_AUTH_DEFAULT)
+      type = DefaultAuthType;
+    else
+      type = con->best->type;
+  }
   else
     type = DefaultAuthType;
 
@@ -352,7 +373,7 @@ cupsdAuthorize(cupsd_client_t *con) /* I - Client connection */
   * Decode the Authorization string...
   */
 
-  authorization = con->http.fields[HTTP_FIELD_AUTHORIZATION];
+  authorization = httpGetField(&con->http, HTTP_FIELD_AUTHORIZATION);
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdAuthorize: Authorization=\"%s\"",
                   authorization);
@@ -360,39 +381,214 @@ cupsdAuthorize(cupsd_client_t *con)      /* I - Client connection */
   username[0] = '\0';
   password[0] = '\0';
 
-  if (type == AUTH_NONE)
+#ifdef HAVE_GSSAPI
+  con->gss_uid = 0;
+#endif /* HAVE_GSSAPI */
+
+#ifdef HAVE_AUTHORIZATION_H
+  if (con->authref)
+  {
+    AuthorizationFree(con->authref, kAuthorizationFlagDefaults);
+    con->authref = NULL;
+  }
+#endif /* HAVE_AUTHORIZATION_H */
+
+  if (!*authorization)
   {
    /*
-    * No authorization required, return early...
+    * No authorization data provided, return early...
     */
 
     cupsdLogMessage(CUPSD_LOG_DEBUG,
-                    "cupsdAuthorize: No authentication required.");
+                    "cupsdAuthorize: No authentication data provided.");
     return;
   }
-  else if (!*authorization)
+#ifdef HAVE_AUTHORIZATION_H
+  else if (!strncmp(authorization, "AuthRef ", 8) &&
+           !_cups_strcasecmp(con->http.hostname, "localhost"))
   {
+    OSStatus           status;         /* Status */
+    int                        authlen;        /* Auth string length */
+    AuthorizationItemSet *authinfo;    /* Authorization item set */
+
    /*
-    * No authorization data provided, return early...
+    * Get the Authorization Services data...
     */
 
+    authorization += 8;
+    while (isspace(*authorization & 255))
+      authorization ++;
+
+    authlen = sizeof(nonce);
+    httpDecode64_2(nonce, &authlen, authorization);
+
+    if (authlen != kAuthorizationExternalFormLength)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR,
+                     "External Authorization reference size is incorrect!");
+      return;
+    }
+
+    if ((status = AuthorizationCreateFromExternalForm(
+                     (AuthorizationExternalForm *)nonce, &con->authref)) != 0)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR,
+                     "AuthorizationCreateFromExternalForm returned %d (%s)",
+                     (int)status, cssmErrorString(status));
+      return;
+    }
+
+    username[0] = '\0';
+
+    if (!AuthorizationCopyInfo(con->authref, kAuthorizationEnvironmentUsername,
+                              &authinfo))
+    {
+      if (authinfo->count == 1 && authinfo->items[0].value &&
+          authinfo->items[0].valueLength >= 2)
+      {
+        strlcpy(username, authinfo->items[0].value, sizeof(username));
+
+        cupsdLogMessage(CUPSD_LOG_DEBUG,
+                       "cupsdAuthorize: Authorized as \"%s\" using AuthRef",
+                       username);
+      }
+
+      AuthorizationFreeItemSet(authinfo);
+    }
+
+    if (!username[0])
+    {
+     /*
+      * No username in AuthRef, grab username using peer credentials...
+      */
+
+      struct passwd    *pwd;           /* Password entry for this user */
+      cupsd_ucred_t    peercred;       /* Peer credentials */
+      socklen_t                peersize;       /* Size of peer credentials */
+
+      peersize = sizeof(peercred);
+
+      if (getsockopt(con->http.fd, 0, LOCAL_PEERCRED, &peercred, &peersize))
+      {
+        cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to get peer credentials - %s",
+                        strerror(errno));
+        return;
+      }
+
+      if ((pwd = getpwuid(CUPSD_UCRED_UID(peercred))) == NULL)
+      {
+        cupsdLogMessage(CUPSD_LOG_ERROR,
+                        "Unable to find UID %d for peer credentials.",
+                        (int)CUPSD_UCRED_UID(peercred));
+        return;
+      }
+
+      strlcpy(username, pwd->pw_name, sizeof(username));
+
+      cupsdLogMessage(CUPSD_LOG_DEBUG,
+                     "cupsdAuthorize: Authorized as \"%s\" using "
+                     "AuthRef + PeerCred", username);
+    }
+
+    con->type = CUPSD_AUTH_BASIC;
+  }
+#endif /* HAVE_AUTHORIZATION_H */
+#if defined(SO_PEERCRED) && defined(AF_LOCAL)
+  else if (!strncmp(authorization, "PeerCred ", 9) &&
+           con->http.hostaddr->addr.sa_family == AF_LOCAL)
+  {
+   /*
+    * Use peer credentials from domain socket connection...
+    */
+
+    struct passwd      *pwd;           /* Password entry for this user */
+    cupsd_ucred_t      peercred;       /* Peer credentials */
+    socklen_t          peersize;       /* Size of peer credentials */
+#ifdef HAVE_AUTHORIZATION_H
+    const char         *name;          /* Authorizing name */
+
+    for (name = (char *)cupsArrayFirst(con->best->names);
+         name;
+         name = (char *)cupsArrayNext(con->best->names))
+      if (!_cups_strncasecmp(name, "@AUTHKEY(", 9) || !_cups_strcasecmp(name, "@SYSTEM"))
+      {
+       cupsdLogMessage(CUPSD_LOG_ERROR,
+                       "PeerCred authentication not allowed for resource.");
+       return;
+      }
+#endif /* HAVE_AUTHORIZATION_H */
+
+    if ((pwd = getpwnam(authorization + 9)) == NULL)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR, "User \"%s\" does not exist.",
+                      authorization + 9);
+      return;
+    }
+
+    peersize = sizeof(peercred);
+
+#  ifdef __APPLE__
+    if (getsockopt(con->http.fd, 0, LOCAL_PEERCRED, &peercred, &peersize))
+#  else
+    if (getsockopt(con->http.fd, SOL_SOCKET, SO_PEERCRED, &peercred, &peersize))
+#  endif /* __APPLE__ */
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to get peer credentials - %s",
+                      strerror(errno));
+      return;
+    }
+
+    if (pwd->pw_uid != CUPSD_UCRED_UID(peercred))
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR,
+                      "Invalid peer credentials for \"%s\" - got %d, "
+                     "expected %d!", authorization + 9,
+                     CUPSD_UCRED_UID(peercred), pwd->pw_uid);
+#  ifdef HAVE_SYS_UCRED_H
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAuthorize: cr_version=%d",
+                      peercred.cr_version);
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAuthorize: cr_uid=%d",
+                      peercred.cr_uid);
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAuthorize: cr_ngroups=%d",
+                      peercred.cr_ngroups);
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAuthorize: cr_groups[0]=%d",
+                      peercred.cr_groups[0]);
+#  endif /* HAVE_SYS_UCRED_H */
+      return;
+    }
+
+    strlcpy(username, authorization + 9, sizeof(username));
+
+#  ifdef HAVE_GSSAPI
+    con->gss_uid = CUPSD_UCRED_UID(peercred);
+#  endif /* HAVE_GSSAPI */
+
     cupsdLogMessage(CUPSD_LOG_DEBUG,
-                    "cupsdAuthorize: No authentication data provided.");
-    return;
+                    "cupsdAuthorize: Authorized as %s using PeerCred",
+                   username);
+
+    con->type = CUPSD_AUTH_BASIC;
   }
+#endif /* SO_PEERCRED && AF_LOCAL */
   else if (!strncmp(authorization, "Local", 5) &&
-           !strcasecmp(con->http.hostname, "localhost"))
+           !_cups_strcasecmp(con->http.hostname, "localhost"))
   {
    /*
     * Get Local certificate authentication data...
     */
 
     authorization += 5;
-    while (isspace(*authorization))
+    while (isspace(*authorization & 255))
       authorization ++;
 
     if ((localuser = cupsdFindCert(authorization)) != NULL)
-      strlcpy(username, localuser, sizeof(username));
+    {
+      strlcpy(username, localuser->username, sizeof(username));
+
+      cupsdLogMessage(CUPSD_LOG_DEBUG,
+                     "cupsdAuthorize: Authorized as %s using Local",
+                     username);
+    }
     else
     {
       cupsdLogMessage(CUPSD_LOG_ERROR,
@@ -400,9 +596,15 @@ cupsdAuthorize(cupsd_client_t *con)        /* I - Client connection */
                      "found!");
       return;
     }
+
+#ifdef HAVE_GSSAPI
+    if (localuser->ccache)
+      con->type = CUPSD_AUTH_NEGOTIATE;
+    else
+#endif /* HAVE_GSSAPI */
+      con->type = CUPSD_AUTH_BASIC;
   }
-  else if (!strncmp(authorization, "Basic", 5) &&
-           (type == AUTH_BASIC || type == AUTH_BASICDIGEST))
+  else if (!strncmp(authorization, "Basic", 5))
   {
    /*
     * Get the Basic authentication data...
@@ -412,7 +614,7 @@ cupsdAuthorize(cupsd_client_t *con) /* I - Client connection */
 
 
     authorization += 5;
-    while (isspace(*authorization))
+    while (isspace(*authorization & 255))
       authorization ++;
 
     userlen = sizeof(username);
@@ -461,7 +663,8 @@ cupsdAuthorize(cupsd_client_t *con) /* I - Client connection */
 
     switch (type)
     {
-      case AUTH_BASIC :
+      default :
+      case CUPSD_AUTH_BASIC :
           {
 #if HAVE_LIBPAM
           /*
@@ -478,7 +681,13 @@ cupsdAuthorize(cupsd_client_t *con)        /* I - Client connection */
             strlcpy(data.username, username, sizeof(data.username));
            strlcpy(data.password, password, sizeof(data.password));
 
+#  if defined(__sun) || defined(__hpux)
+           pamdata.conv        = (int (*)(int, struct pam_message **,
+                                          struct pam_response **,
+                                          void *))pam_func;
+#  else
            pamdata.conv        = pam_func;
+#  endif /* __sun || __hpux */
            pamdata.appdata_ptr = &data;
 
 #  ifdef __hpux
@@ -494,29 +703,57 @@ cupsdAuthorize(cupsd_client_t *con)       /* I - Client connection */
            if (pamerr != PAM_SUCCESS)
            {
              cupsdLogMessage(CUPSD_LOG_ERROR,
-                             "cupsdAuthorize: pam_start() returned %d (%s)!\n",
+                             "cupsdAuthorize: pam_start() returned %d (%s)!",
                              pamerr, pam_strerror(pamh, pamerr));
-             pam_end(pamh, 0);
              return;
            }
 
+#  ifdef HAVE_PAM_SET_ITEM
+#    ifdef PAM_RHOST
+           pamerr = pam_set_item(pamh, PAM_RHOST, con->http.hostname);
+           if (pamerr != PAM_SUCCESS)
+             cupsdLogMessage(CUPSD_LOG_WARN,
+                             "cupsdAuthorize: pam_set_item(PAM_RHOST) "
+                             "returned %d (%s)!", pamerr,
+                             pam_strerror(pamh, pamerr));
+#    endif /* PAM_RHOST */
+
+#    ifdef PAM_TTY
+           pamerr = pam_set_item(pamh, PAM_TTY, "cups");
+           if (pamerr != PAM_SUCCESS)
+             cupsdLogMessage(CUPSD_LOG_WARN,
+                             "cupsdAuthorize: pam_set_item(PAM_TTY) "
+                             "returned %d (%s)!", pamerr,
+                             pam_strerror(pamh, pamerr));
+#    endif /* PAM_TTY */
+#  endif /* HAVE_PAM_SET_ITEM */
+
            pamerr = pam_authenticate(pamh, PAM_SILENT);
            if (pamerr != PAM_SUCCESS)
            {
              cupsdLogMessage(CUPSD_LOG_ERROR,
                              "cupsdAuthorize: pam_authenticate() returned %d "
-                             "(%s)!\n",
+                             "(%s)!",
                              pamerr, pam_strerror(pamh, pamerr));
              pam_end(pamh, 0);
              return;
            }
 
+#  ifdef HAVE_PAM_SETCRED
+            pamerr = pam_setcred(pamh, PAM_ESTABLISH_CRED | PAM_SILENT);
+           if (pamerr != PAM_SUCCESS)
+             cupsdLogMessage(CUPSD_LOG_WARN,
+                             "cupsdAuthorize: pam_setcred() "
+                             "returned %d (%s)!", pamerr,
+                             pam_strerror(pamh, pamerr));
+#  endif /* HAVE_PAM_SETCRED */
+
            pamerr = pam_acct_mgmt(pamh, PAM_SILENT);
            if (pamerr != PAM_SUCCESS)
            {
              cupsdLogMessage(CUPSD_LOG_ERROR,
                              "cupsdAuthorize: pam_acct_mgmt() returned %d "
-                             "(%s)!\n",
+                             "(%s)!",
                              pamerr, pam_strerror(pamh, pamerr));
              pam_end(pamh, 0);
              return;
@@ -530,13 +767,12 @@ cupsdAuthorize(cupsd_client_t *con)       /* I - Client connection */
            */
 
            char        *authmsg;       /* Authentication message */
-           char        *loginmsg;      /* Login message */
            int         reenter;        /* ??? */
 
 
            cupsdLogMessage(CUPSD_LOG_DEBUG,
-                           "cupsdAuthorize: AIX authenticate of username \"%s\"",
-                            username);
+                           "cupsdAuthorize: AIX authenticate of username "
+                           "\"%s\"", username);
 
            reenter = 1;
            if (authenticate(username, password, &reenter, &authmsg) != 0)
@@ -572,7 +808,7 @@ cupsdAuthorize(cupsd_client_t *con) /* I - Client connection */
              cupsdLogMessage(CUPSD_LOG_ERROR,
                              "cupsdAuthorize: Unknown username \"%s\"!",
                              username);
-             return (HTTP_UNAUTHORIZED);
+             return;
            }
 
 #  ifdef HAVE_SHADOW_H
@@ -649,14 +885,18 @@ cupsdAuthorize(cupsd_client_t *con)       /* I - Client connection */
            }
 #endif /* HAVE_LIBPAM */
           }
+
+         cupsdLogMessage(CUPSD_LOG_DEBUG,
+                         "cupsdAuthorize: Authorized as %s using Basic",
+                         username);
           break;
 
-      case AUTH_BASICDIGEST :
+      case CUPSD_AUTH_BASICDIGEST :
          /*
          * Do Basic authentication with the Digest password file...
          */
 
-         if (!cupsdGetMD5Passwd(username, NULL, md5))
+         if (!get_md5_password(username, NULL, md5))
          {
             cupsdLogMessage(CUPSD_LOG_ERROR,
                            "cupsdAuthorize: Unknown MD5 username \"%s\"!",
@@ -673,10 +913,16 @@ cupsdAuthorize(cupsd_client_t *con)       /* I - Client connection */
                            username);
             return;
          }
+
+         cupsdLogMessage(CUPSD_LOG_DEBUG,
+                         "cupsdAuthorize: Authorized as %s using BasicDigest",
+                         username);
          break;
     }
+
+    con->type = type;
   }
-  else if (!strncmp(authorization, "Digest", 6) && type == AUTH_DIGEST)
+  else if (!strncmp(authorization, "Digest", 6))
   {
    /*
     * Get the username, password, and nonce from the Digest attributes...
@@ -727,7 +973,7 @@ cupsdAuthorize(cupsd_client_t *con) /* I - Client connection */
     * Validate the username and password...
     */
 
-    if (!cupsdGetMD5Passwd(username, NULL, md5))
+    if (!get_md5_password(username, NULL, md5))
     {
       cupsdLogMessage(CUPSD_LOG_ERROR,
                      "cupsdAuthorize: Unknown MD5 username \"%s\"!",
@@ -744,11 +990,180 @@ cupsdAuthorize(cupsd_client_t *con)      /* I - Client connection */
                      username);
       return;
     }
+
+    cupsdLogMessage(CUPSD_LOG_DEBUG,
+                    "cupsdAuthorize: Authorized as %s using Digest",
+                   username);
+
+    con->type = CUPSD_AUTH_DIGEST;
+  }
+#ifdef HAVE_GSSAPI
+  else if (!strncmp(authorization, "Negotiate", 9))
+  {
+    int                        len;            /* Length of authorization string */
+    gss_ctx_id_t       context;        /* Authorization context */
+    OM_uint32          major_status,   /* Major status code */
+                       minor_status;   /* Minor status code */
+    gss_buffer_desc    input_token = GSS_C_EMPTY_BUFFER,
+                                       /* Input token from string */
+                       output_token = GSS_C_EMPTY_BUFFER;
+                                       /* Output token for username */
+    gss_name_t         client_name;    /* Client name */
+
+
+#  ifdef __APPLE__
+   /*
+    * If the weak-linked GSSAPI/Kerberos library is not present, don't try
+    * to use it...
+    */
+
+    if (gss_init_sec_context == NULL)
+    {
+      cupsdLogMessage(CUPSD_LOG_WARN,
+                      "GSSAPI/Kerberos authentication failed because the "
+                     "Kerberos framework is not present.");
+      return;
+    }
+#  endif /* __APPLE__ */
+
+   /*
+    * Find the start of the Kerberos input token...
+    */
+
+    authorization += 9;
+    while (isspace(*authorization & 255))
+      authorization ++;
+
+    if (!*authorization)
+    {
+      cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                     "cupsdAuthorize: No authentication data specified.");
+      return;
+    }
+
+   /*
+    * Decode the authorization string to get the input token...
+    */
+
+    len                = strlen(authorization);
+    input_token.value  = malloc(len);
+    input_token.value  = httpDecode64_2(input_token.value, &len,
+                                       authorization);
+    input_token.length = len;
+
+   /*
+    * Accept the input token to get the authorization info...
+    */
+
+    context      = GSS_C_NO_CONTEXT;
+    client_name  = GSS_C_NO_NAME;
+    major_status = gss_accept_sec_context(&minor_status,
+                                         &context,
+                                         GSS_C_NO_CREDENTIAL,
+                                         &input_token,
+                                         GSS_C_NO_CHANNEL_BINDINGS,
+                                         &client_name,
+                                         NULL,
+                                         &output_token,
+                                         NULL,
+                                         NULL,
+                                         NULL);
+
+    if (output_token.length > 0)
+      gss_release_buffer(&minor_status, &output_token);
+
+    if (GSS_ERROR(major_status))
+    {
+      cupsdLogGSSMessage(CUPSD_LOG_DEBUG, major_status, minor_status,
+                        "cupsdAuthorize: Error accepting GSSAPI security "
+                        "context");
+
+      if (context != GSS_C_NO_CONTEXT)
+       gss_delete_sec_context(&minor_status, &context, GSS_C_NO_BUFFER);
+      return;
+    }
+
+    con->have_gss = 1;
+
+   /*
+    * Get the username associated with the client's credentials...
+    */
+
+    if (major_status == GSS_S_CONTINUE_NEEDED)
+      cupsdLogGSSMessage(CUPSD_LOG_DEBUG, major_status, minor_status,
+                        "cupsdAuthorize: Credentials not complete");
+    else if (major_status == GSS_S_COMPLETE)
+    {
+      major_status = gss_display_name(&minor_status, client_name,
+                                     &output_token, NULL);
+
+      if (GSS_ERROR(major_status))
+      {
+       cupsdLogGSSMessage(CUPSD_LOG_DEBUG, major_status, minor_status,
+                          "cupsdAuthorize: Error getting username");
+       gss_release_name(&minor_status, &client_name);
+       gss_delete_sec_context(&minor_status, &context, GSS_C_NO_BUFFER);
+       return;
+      }
+
+      strlcpy(username, output_token.value, sizeof(username));
+
+      cupsdLogMessage(CUPSD_LOG_DEBUG,
+                     "cupsdAuthorize: Authorized as %s using Negotiate",
+                     username);
+
+      gss_release_name(&minor_status, &client_name);
+      gss_release_buffer(&minor_status, &output_token);
+
+      con->type = CUPSD_AUTH_NEGOTIATE;
+    }
+
+    gss_delete_sec_context(&minor_status, &context, GSS_C_NO_BUFFER);
+
+#  if defined(SO_PEERCRED) && defined(AF_LOCAL)
+   /*
+    * Get the client's UID if we are printing locally - that allows a backend
+    * to run as the correct user to get Kerberos credentials of its own.
+    */
+
+    if (_httpAddrFamily(con->http.hostaddr) == AF_LOCAL)
+    {
+      cupsd_ucred_t    peercred;       /* Peer credentials */
+      socklen_t                peersize;       /* Size of peer credentials */
+
+      peersize = sizeof(peercred);
+
+#    ifdef __APPLE__
+      if (getsockopt(con->http.fd, 0, LOCAL_PEERCRED, &peercred, &peersize))
+#    else
+      if (getsockopt(con->http.fd, SOL_SOCKET, SO_PEERCRED, &peercred,
+                     &peersize))
+#    endif /* __APPLE__ */
+      {
+       cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to get peer credentials - %s",
+                       strerror(errno));
+      }
+      else
+      {
+       cupsdLogMessage(CUPSD_LOG_DEBUG,
+                       "cupsdAuthorize: Using credentials for UID %d...",
+                       CUPSD_UCRED_UID(peercred));
+        con->gss_uid = CUPSD_UCRED_UID(peercred);
+      }
+    }
+#  endif /* SO_PEERCRED && AF_LOCAL */
   }
+#endif /* HAVE_GSSAPI */
   else
   {
-    cupsdLogMessage(CUPSD_LOG_DEBUG,
-                    "cupsdAuthorize: Bad authentication data.");
+    char       scheme[256];            /* Auth scheme... */
+
+
+    if (sscanf(authorization, "%255s", scheme) != 1)
+      strcpy(scheme, "UNKNOWN");
+
+    cupsdLogMessage(CUPSD_LOG_ERROR, "Bad authentication data \"%s ...\"",
+                    scheme);
     return;
   }
 
@@ -760,9 +1175,67 @@ cupsdAuthorize(cupsd_client_t *con)       /* I - Client connection */
 
   strlcpy(con->username, username, sizeof(con->username));
   strlcpy(con->password, password, sizeof(con->password));
+}
+
+
+/*
+ * 'cupsdCheckAccess()' - Check whether the given address is allowed to
+ *                        access a location.
+ */
+
+int                                    /* O - 1 if allowed, 0 otherwise */
+cupsdCheckAccess(
+    unsigned         ip[4],            /* I - Client address */
+    char             *name,            /* I - Client hostname */
+    int              namelen,          /* I - Length of hostname */
+    cupsd_location_t *loc)             /* I - Location to check */
+{
+  int  allow;                          /* 1 if allowed, 0 otherwise */
+
+
+  if (!_cups_strcasecmp(name, "localhost"))
+  {
+   /*
+    * Access from localhost (127.0.0.1 or ::1) is always allowed...
+    */
+
+    return (1);
+  }
+  else
+  {
+   /*
+    * Do authorization checks on the domain/address...
+    */
+
+    switch (loc->order_type)
+    {
+      default :
+         allow = 0;    /* anti-compiler-warning-code */
+         break;
+
+      case CUPSD_AUTH_ALLOW : /* Order Deny,Allow */
+          allow = 1;
+
+          if (cupsdCheckAuth(ip, name, namelen, loc->deny))
+           allow = 0;
+
+          if (cupsdCheckAuth(ip, name, namelen, loc->allow))
+           allow = 1;
+         break;
+
+      case CUPSD_AUTH_DENY : /* Order Allow,Deny */
+          allow = 0;
+
+          if (cupsdCheckAuth(ip, name, namelen, loc->allow))
+           allow = 1;
+
+          if (cupsdCheckAuth(ip, name, namelen, loc->deny))
+           allow = 0;
+         break;
+    }
+  }
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAuthorize: username=\"%s\"",
-                  con->username);
+  return (allow);
 }
 
 
@@ -771,25 +1244,27 @@ cupsdAuthorize(cupsd_client_t *con)      /* I - Client connection */
  */
 
 int                                    /* O - 1 if mask matches, 0 otherwise */
-cupsdCheckAuth(
-    unsigned         ip[4],            /* I - Client address */
-    char             *name,            /* I - Client hostname */
-    int              name_len,         /* I - Length of hostname */
-    int              num_masks,                /* I - Number of masks */
-    cupsd_authmask_t *masks)           /* I - Masks */
+cupsdCheckAuth(unsigned     ip[4],     /* I - Client address */
+              char         *name,      /* I - Client hostname */
+              int          name_len,   /* I - Length of hostname */
+              cups_array_t *masks)     /* I - Masks */
 {
-  int          i;                      /* Looping var */
-  cupsd_netif_t        *iface;                 /* Network interface */
-  unsigned     netip4;                 /* IPv4 network address */
+  int                  i;              /* Looping var */
+  cupsd_authmask_t     *mask;          /* Current mask */
+  cupsd_netif_t                *iface;         /* Network interface */
+  unsigned             netip4;         /* IPv4 network address */
 #ifdef AF_INET6
-  unsigned     netip6[4];              /* IPv6 network address */
+  unsigned             netip6[4];      /* IPv6 network address */
 #endif /* AF_INET6 */
 
-  while (num_masks > 0)
+
+  for (mask = (cupsd_authmask_t *)cupsArrayFirst(masks);
+       mask;
+       mask = (cupsd_authmask_t *)cupsArrayNext(masks))
   {
-    switch (masks->type)
+    switch (mask->type)
     {
-      case AUTH_INTERFACE :
+      case CUPSD_AUTH_INTERFACE :
          /*
          * Check for a match with a network interface...
          */
@@ -803,8 +1278,17 @@ cupsdCheckAuth(
           netip6[3] = htonl(ip[3]);
 #endif /* AF_INET6 */
 
-          if (!strcmp(masks->mask.name.name, "*"))
+          if (!strcmp(mask->mask.name.name, "*"))
          {
+#ifdef __APPLE__
+           /*
+           * Allow Back-to-My-Mac addresses...
+           */
+
+           if ((ip[0] & 0xff000000) == 0xfd000000)
+             return (1);
+#endif /* __APPLE__ */
+
           /*
            * Check against all local interfaces...
            */
@@ -859,9 +1343,12 @@ cupsdCheckAuth(
            */
 
            for (iface = (cupsd_netif_t *)cupsArrayFirst(NetIFList);
-                iface && !strcmp(masks->mask.name.name, iface->name);
+                iface;
                 iface = (cupsd_netif_t *)cupsArrayNext(NetIFList))
            {
+              if (strcmp(mask->mask.name.name, iface->name))
+                continue;
+
               if (iface->address.addr.sa_family == AF_INET)
              {
               /*
@@ -894,42 +1381,39 @@ cupsdCheckAuth(
          }
          break;
 
-      case AUTH_NAME :
+      case CUPSD_AUTH_NAME :
          /*
          * Check for exact name match...
          */
 
-          if (!strcasecmp(name, masks->mask.name.name))
+          if (!_cups_strcasecmp(name, mask->mask.name.name))
            return (1);
 
          /*
          * Check for domain match...
          */
 
-         if (name_len >= masks->mask.name.length &&
-             masks->mask.name.name[0] == '.' &&
-             !strcasecmp(name + name_len - masks->mask.name.length,
-                         masks->mask.name.name))
+         if (name_len >= mask->mask.name.length &&
+             mask->mask.name.name[0] == '.' &&
+             !_cups_strcasecmp(name + name_len - mask->mask.name.length,
+                         mask->mask.name.name))
            return (1);
           break;
 
-      case AUTH_IP :
+      case CUPSD_AUTH_IP :
          /*
          * Check for IP/network address match...
          */
 
           for (i = 0; i < 4; i ++)
-           if ((ip[i] & masks->mask.ip.netmask[i]) !=
-                   masks->mask.ip.address[i])
+           if ((ip[i] & mask->mask.ip.netmask[i]) !=
+                   mask->mask.ip.address[i])
              break;
 
          if (i == 4)
            return (1);
           break;
     }
-
-    masks ++;
-    num_masks --;
   }
 
   return (0);
@@ -946,13 +1430,13 @@ cupsdCheckGroup(
     struct passwd *user,               /* I - System user info */
     const char    *groupname)          /* I - Group name */
 {
-  int                  i;              /* Looping var */
-  struct group         *group;         /* System group info */
-  char                 junk[33];       /* MD5 password (not used) */
+  int          i;                      /* Looping var */
+  struct group *group;                 /* System group info */
+  char         junk[33];               /* MD5 password (not used) */
 #ifdef HAVE_MBR_UID_TO_UUID
-  uuid_t               useruuid,       /* UUID for username */
-                       groupuuid;      /* UUID for groupname */
-  int                  is_member;      /* True if user is a member of group */
+  uuid_t       useruuid,               /* UUID for username */
+               groupuuid;              /* UUID for groupname */
+  int          is_member;              /* True if user is a member of group */
 #endif /* HAVE_MBR_UID_TO_UUID */
 
 
@@ -981,7 +1465,7 @@ cupsdCheckGroup(
     */
 
     for (i = 0; group->gr_mem[i]; i ++)
-      if (!strcasecmp(username, group->gr_mem[i]))
+      if (!_cups_strcasecmp(username, group->gr_mem[i]))
        return (1);
   }
 
@@ -998,12 +1482,40 @@ cupsdCheckGroup(
   * Check group membership through MacOS X membership API...
   */
 
-  if (user && group)
-    if (!mbr_uid_to_uuid(user->pw_uid, useruuid))
+  if (user && !mbr_uid_to_uuid(user->pw_uid, useruuid))
+  {
+    if (group)
+    {
+     /*
+      * Map group name to UUID and check membership...
+      */
+
       if (!mbr_gid_to_uuid(group->gr_gid, groupuuid))
-       if (!mbr_check_membership(useruuid, groupuuid, &is_member))
+        if (!mbr_check_membership(useruuid, groupuuid, &is_member))
          if (is_member)
            return (1);
+    }
+    else if (groupname[0] == '#')
+    {
+     /*
+      * Use UUID directly and check for equality (user UUID) and
+      * membership (group UUID)...
+      */
+
+      if (!uuid_parse((char *)groupname + 1, groupuuid))
+      {
+        if (!uuid_compare(useruuid, groupuuid))
+         return (1);
+       else if (!mbr_check_membership(useruuid, groupuuid, &is_member))
+         if (is_member)
+           return (1);
+      }
+
+      return (0);
+    }
+  }
+  else if (groupname[0] == '#')
+    return (0);
 #endif /* HAVE_MBR_UID_TO_UUID */
 
  /*
@@ -1012,7 +1524,7 @@ cupsdCheckGroup(
   * file...
   */
 
-  if (cupsdGetMD5Passwd(username, groupname, junk) != NULL)
+  if (get_md5_password(username, groupname, junk) != NULL)
     return (1);
 
  /*
@@ -1029,298 +1541,97 @@ cupsdCheckGroup(
 
 cupsd_location_t *                     /* O - New location */
 cupsdCopyLocation(
-    cupsd_location_t **loc)            /* IO - Original location */
+    cupsd_location_t *loc)             /* I - Original location */
 {
-  int                  i;              /* Looping var */
   cupsd_location_t     *temp;          /* New location */
-  char                 location[HTTP_MAX_URI];
-                                       /* Location of resource */
 
 
  /*
-  * Use a local copy of location because cupsdAddLocation may cause
-  * this memory to be moved...
+  * Make a copy of the original location...
   */
 
-  strlcpy(location, (*loc)->location, sizeof(location));
-
-  if ((temp = cupsdAddLocation(location)) == NULL)
+  if ((temp = calloc(1, sizeof(cupsd_location_t))) == NULL)
     return (NULL);
 
  /*
   * Copy the information from the original location to the new one.
   */
 
-  temp->limit      = (*loc)->limit;
-  temp->order_type = (*loc)->order_type;
-  temp->type       = (*loc)->type;
-  temp->level      = (*loc)->level;
-  temp->satisfy    = (*loc)->satisfy;
-  temp->encryption = (*loc)->encryption;
+  if (!loc)
+    return (temp);
 
-  if ((temp->num_names  = (*loc)->num_names) > 0)
-  {
-   /*
-    * Copy the names array...
-    */
+  if (loc->location)
+    temp->location = _cupsStrAlloc(loc->location);
 
-    if ((temp->names = calloc(temp->num_names, sizeof(char *))) == NULL)
-    {
-      cupsdLogMessage(CUPSD_LOG_ERROR,
-                      "cupsdCopyLocation: Unable to allocate memory for %d names: %s",
-                      temp->num_names, strerror(errno));
-
-      cupsdDeleteLocation(temp);
-      return (NULL);
-    }
+  temp->limit      = loc->limit;
+  temp->order_type = loc->order_type;
+  temp->type       = loc->type;
+  temp->level      = loc->level;
+  temp->satisfy    = loc->satisfy;
+  temp->encryption = loc->encryption;
 
-    for (i = 0; i < temp->num_names; i ++)
-      if ((temp->names[i] = strdup((*loc)->names[i])) == NULL)
-      {
-       cupsdLogMessage(CUPSD_LOG_ERROR,
-                       "cupsdCopyLocation: Unable to copy name \"%s\": %s",
-                        (*loc)->names[i], strerror(errno));
-
-        cupsdDeleteLocation(temp);
-       return (NULL);
-      }
-  }
-
-  if ((temp->num_allow  = (*loc)->num_allow) > 0)
+  if (loc->names)
   {
-   /*
-    * Copy allow rules...
-    */
-
-    if ((temp->allow = calloc(temp->num_allow, sizeof(cupsd_authmask_t))) == NULL)
+    if ((temp->names = cupsArrayDup(loc->names)) == NULL)
     {
       cupsdLogMessage(CUPSD_LOG_ERROR,
-                      "cupsdCopyLocation: Unable to allocate memory for %d allow rules: %s",
-                      temp->num_allow, strerror(errno));
-      cupsdDeleteLocation(temp);
-      return (NULL);
-    }
-
-    for (i = 0; i < temp->num_allow; i ++)
-      switch (temp->allow[i].type = (*loc)->allow[i].type)
-      {
-        case AUTH_NAME :
-           temp->allow[i].mask.name.length = (*loc)->allow[i].mask.name.length;
-           temp->allow[i].mask.name.name   = strdup((*loc)->allow[i].mask.name.name);
-
-            if (temp->allow[i].mask.name.name == NULL)
-           {
-             cupsdLogMessage(CUPSD_LOG_ERROR,
-                             "cupsdCopyLocation: Unable to copy allow name \"%s\": %s",
-                             (*loc)->allow[i].mask.name.name, strerror(errno));
-              cupsdDeleteLocation(temp);
-             return (NULL);
-           }
-           break;
-       case AUTH_IP :
-           memcpy(&(temp->allow[i].mask.ip), &((*loc)->allow[i].mask.ip),
-                  sizeof(cupsd_ipmask_t));
-           break;
-      }
-  }
+                      "Unable to allocate memory for %d names: %s",
+                     cupsArrayCount(loc->names), strerror(errno));
 
-  if ((temp->num_deny  = (*loc)->num_deny) > 0)
-  {
-   /*
-    * Copy deny rules...
-    */
-
-    if ((temp->deny = calloc(temp->num_deny, sizeof(cupsd_authmask_t))) == NULL)
-    {
-      cupsdLogMessage(CUPSD_LOG_ERROR,
-                      "cupsdCopyLocation: Unable to allocate memory for %d deny rules: %s",
-                      temp->num_deny, strerror(errno));
-      cupsdDeleteLocation(temp);
+      cupsdFreeLocation(temp);
       return (NULL);
     }
-
-    for (i = 0; i < temp->num_deny; i ++)
-      switch (temp->deny[i].type = (*loc)->deny[i].type)
-      {
-        case AUTH_NAME :
-           temp->deny[i].mask.name.length = (*loc)->deny[i].mask.name.length;
-           temp->deny[i].mask.name.name   = strdup((*loc)->deny[i].mask.name.name);
-
-            if (temp->deny[i].mask.name.name == NULL)
-           {
-             cupsdLogMessage(CUPSD_LOG_ERROR,
-                             "cupsdCopyLocation: Unable to copy deny name \"%s\": %s",
-                             (*loc)->deny[i].mask.name.name, strerror(errno));
-              cupsdDeleteLocation(temp);
-             return (NULL);
-           }
-           break;
-       case AUTH_IP :
-           memcpy(&(temp->deny[i].mask.ip), &((*loc)->deny[i].mask.ip),
-                  sizeof(cupsd_ipmask_t));
-           break;
-      }
   }
 
-  return (temp);
-}
-
-
-/*
- * 'cupsdDeleteAllLocations()' - Free all memory used for location authorization.
- */
-
-void
-cupsdDeleteAllLocations(void)
-{
-  cupsd_location_t     *loc;           /* Current location */
-
-
- /*
-  * Free all of the allow/deny records first...
-  */
-
-  for (loc = (cupsd_location_t *)cupsArrayFirst(Locations);
-       loc;
-       loc = (cupsd_location_t *)cupsArrayNext(Locations))
-    cupsdDeleteLocation(loc);
-
- /*
-  * Then free the location array...
-  */
-
-  cupsArrayDelete(Locations);
-  Locations = NULL;
-}
-
-
-/*
- * 'cupsdDeleteLocation()' - Free all memory used by a location.
- */
-
-void
-cupsdDeleteLocation(
-    cupsd_location_t *loc)             /* I - Location to delete */
-{
-  int                  i;              /* Looping var */
-  cupsd_authmask_t     *mask;          /* Current mask */
-
-
-  cupsArrayRemove(Locations, loc);
-
-  for (i = loc->num_names - 1; i >= 0; i --)
-    free(loc->names[i]);
-
-  if (loc->num_names > 0)
-    free(loc->names);
-
-  for (i = loc->num_allow, mask = loc->allow; i > 0; i --, mask ++)
-    if (mask->type == AUTH_NAME || mask->type == AUTH_INTERFACE)
-      free(mask->mask.name.name);
-
-  if (loc->num_allow > 0)
-    free(loc->allow);
-
-  for (i = loc->num_deny, mask = loc->deny; i > 0; i --, mask ++)
-    if (mask->type == AUTH_NAME || mask->type == AUTH_INTERFACE)
-      free(mask->mask.name.name);
-
-  if (loc->num_deny > 0)
-    free(loc->deny);
-
-  free(loc->location);
-  free(loc);
-}
-
-
-/*
- * 'cupsdDenyHost()' - Add a host name that is not allowed to access the
- *                     location.
- */
-
-void
-cupsdDenyHost(cupsd_location_t *loc,   /* I - Location to add to */
-              char             *name)  /* I - Name of host or domain to add */
-{
-  cupsd_authmask_t     *temp;          /* New host/domain mask */
-  char                 ifname[32],     /* Interface name */
-                       *ifptr;         /* Pointer to end of name */
-
-
-  cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdDenyHost(loc=%p(%s), name=\"%s\")",
-                  loc, loc->location, name);
-
-  if ((temp = add_deny(loc)) == NULL)
-    return;
-
-  if (!strcasecmp(name, "@LOCAL"))
-  {
-   /*
-    * Deny *interface*...
-    */
-
-    temp->type             = AUTH_INTERFACE;
-    temp->mask.name.name   = strdup("*");
-    temp->mask.name.length = 1;
-  }
-  else if (!strncasecmp(name, "@IF(", 4))
+  if (loc->allow)
   {
    /*
-    * Deny *interface*...
+    * Copy allow rules...
     */
 
-    strlcpy(ifname, name + 4, sizeof(ifname));
-
-    ifptr = ifname + strlen(ifname);
-
-    if (ifptr[-1] == ')')
+    if ((temp->allow = cupsArrayDup(loc->allow)) == NULL)
     {
-      ifptr --;
-      *ifptr = '\0';
+      cupsdLogMessage(CUPSD_LOG_ERROR,
+                      "Unable to allocate memory for %d allow rules: %s",
+                      cupsArrayCount(loc->allow), strerror(errno));
+      cupsdFreeLocation(temp);
+      return (NULL);
     }
-
-    temp->type             = AUTH_INTERFACE;
-    temp->mask.name.name   = strdup(ifname);
-    temp->mask.name.length = ifptr - ifname;
   }
-  else
+
+  if (loc->deny)
   {
    /*
-    * Deny name...
+    * Copy deny rules...
     */
 
-    temp->type             = AUTH_NAME;
-    temp->mask.name.name   = strdup(name);
-    temp->mask.name.length = strlen(name);
+    if ((temp->deny = cupsArrayDup(loc->deny)) == NULL)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR,
+                      "Unable to allocate memory for %d deny rules: %s",
+                      cupsArrayCount(loc->deny), strerror(errno));
+      cupsdFreeLocation(temp);
+      return (NULL);
+    }
   }
+
+  return (temp);
 }
 
 
 /*
- * 'cupsdDenyIP()' - Add an IP address or network that is not allowed to
- *                   access the location.
+ * 'cupsdDeleteAllLocations()' - Free all memory used for location authorization.
  */
 
 void
-cupsdDenyIP(cupsd_location_t *loc,     /* I - Location to add to */
-           unsigned         address[4],/* I - IP address to add */
-           unsigned         netmask[4])/* I - Netmask of address */
+cupsdDeleteAllLocations(void)
 {
-  cupsd_authmask_t     *temp;          /* New host/domain mask */
-
-
-  cupsdLogMessage(CUPSD_LOG_DEBUG,
-                  "cupsdDenyIP(loc=%p(%s), address=%x:%x:%x:%x, netmask=%x:%x:%x:%x)",
-                 loc, loc->location, address[0], address[1], address[2],
-                 address[3], netmask[0], netmask[1], netmask[2],
-                 netmask[3]);
-
-  if ((temp = add_deny(loc)) == NULL)
-    return;
+ /*
+  * Free the location array, which will free all of the locations...
+  */
 
-  temp->type = AUTH_IP;
-  memcpy(temp->mask.ip.address, address, sizeof(temp->mask.ip.address));
-  memcpy(temp->mask.ip.netmask, netmask, sizeof(temp->mask.ip.netmask));
+  cupsArrayDelete(Locations);
+  Locations = NULL;
 }
 
 
@@ -1339,22 +1650,22 @@ cupsdFindBest(const char   *path,       /* I - Resource path */
                        *best;          /* Best match for location so far */
   int                  bestlen;        /* Length of best match */
   int                  limit;          /* Limit field */
-  static const int     limits[] =      /* Map http_status_t to AUTH_LIMIT_xyz */
+  static const int     limits[] =      /* Map http_status_t to CUPSD_AUTH_LIMIT_xyz */
                {
-                 AUTH_LIMIT_ALL,
-                 AUTH_LIMIT_OPTIONS,
-                 AUTH_LIMIT_GET,
-                 AUTH_LIMIT_GET,
-                 AUTH_LIMIT_HEAD,
-                 AUTH_LIMIT_POST,
-                 AUTH_LIMIT_POST,
-                 AUTH_LIMIT_POST,
-                 AUTH_LIMIT_PUT,
-                 AUTH_LIMIT_PUT,
-                 AUTH_LIMIT_DELETE,
-                 AUTH_LIMIT_TRACE,
-                 AUTH_LIMIT_ALL,
-                 AUTH_LIMIT_ALL
+                 CUPSD_AUTH_LIMIT_ALL,
+                 CUPSD_AUTH_LIMIT_OPTIONS,
+                 CUPSD_AUTH_LIMIT_GET,
+                 CUPSD_AUTH_LIMIT_GET,
+                 CUPSD_AUTH_LIMIT_HEAD,
+                 CUPSD_AUTH_LIMIT_POST,
+                 CUPSD_AUTH_LIMIT_POST,
+                 CUPSD_AUTH_LIMIT_POST,
+                 CUPSD_AUTH_LIMIT_PUT,
+                 CUPSD_AUTH_LIMIT_PUT,
+                 CUPSD_AUTH_LIMIT_DELETE,
+                 CUPSD_AUTH_LIMIT_TRACE,
+                 CUPSD_AUTH_LIMIT_ALL,
+                 CUPSD_AUTH_LIMIT_ALL
                };
 
 
@@ -1394,7 +1705,7 @@ cupsdFindBest(const char   *path, /* I - Resource path */
        loc = (cupsd_location_t *)cupsArrayNext(Locations))
   {
     cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdFindBest: Location %s Limit %x",
-                    loc->location, loc->limit);
+                    loc->location ? loc->location : "nil", loc->limit);
 
     if (!strncmp(uri, "/printers/", 10) || !strncmp(uri, "/classes/", 9))
     {
@@ -1402,8 +1713,8 @@ cupsdFindBest(const char   *path, /* I - Resource path */
       * Use case-insensitive comparison for queue names...
       */
 
-      if (loc->length > bestlen &&
-          !strncasecmp(uri, loc->location, loc->length) &&
+      if (loc->length > bestlen && loc->location &&
+          !_cups_strncasecmp(uri, loc->location, loc->length) &&
          loc->location[0] == '/' &&
          (limit & loc->limit) != 0)
       {
@@ -1417,7 +1728,7 @@ cupsdFindBest(const char   *path, /* I - Resource path */
       * Use case-sensitive comparison for other URIs...
       */
 
-      if (loc->length > bestlen &&
+      if (loc->length > bestlen && loc->location &&
           !strncmp(uri, loc->location, loc->length) &&
          loc->location[0] == '/' &&
          (limit & loc->limit) != 0)
@@ -1456,64 +1767,18 @@ cupsdFindLocation(const char *location) /* I - Connection */
 
 
 /*
- * 'cupsdGetMD5Passwd()' - Get an MD5 password.
+ * 'cupsdFreeLocation()' - Free all memory used by a location.
  */
 
-char *                                 /* O - MD5 password string */
-cupsdGetMD5Passwd(const char *username,        /* I - Username */
-                  const char *group,   /* I - Group */
-                  char       passwd[33])/* O - MD5 password string */
+void
+cupsdFreeLocation(cupsd_location_t *loc)/* I - Location to free */
 {
-  cups_file_t  *fp;                    /* passwd.md5 file */
-  char         filename[1024],         /* passwd.md5 filename */
-               line[256],              /* Line from file */
-               tempuser[33],           /* User from file */
-               tempgroup[33];          /* Group from file */
-
-
-  cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                  "cupsdGetMD5Passwd(username=\"%s\", group=\"%s\", passwd=%p)",
-                  username, group ? group : "(null)", passwd);
-
-  snprintf(filename, sizeof(filename), "%s/passwd.md5", ServerRoot);
-  if ((fp = cupsFileOpen(filename, "r")) == NULL)
-  {
-    if (errno != ENOENT)
-      cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to open %s - %s", filename,
-                      strerror(errno));
-
-    return (NULL);
-  }
-
-  while (cupsFileGets(fp, line, sizeof(line)) != NULL)
-  {
-    if (sscanf(line, "%32[^:]:%32[^:]:%32s", tempuser, tempgroup, passwd) != 3)
-    {
-      cupsdLogMessage(CUPSD_LOG_ERROR, "Bad MD5 password line: %s", line);
-      continue;
-    }
-
-    if (!strcmp(username, tempuser) &&
-        (group == NULL || !strcmp(group, tempgroup)))
-    {
-     /*
-      * Found the password entry!
-      */
-
-      cupsdLogMessage(CUPSD_LOG_DEBUG2, "Found MD5 user %s, group %s...",
-                      username, tempgroup);
+  cupsArrayDelete(loc->names);
+  cupsArrayDelete(loc->allow);
+  cupsArrayDelete(loc->deny);
 
-      cupsFileClose(fp);
-      return (passwd);
-    }
-  }
-
- /*
-  * Didn't find a password entry - return NULL!
-  */
-
-  cupsFileClose(fp);
-  return (NULL);
+  _cupsStrFree(loc->location);
+  free(loc);
 }
 
 
@@ -1525,12 +1790,16 @@ http_status_t                           /* O - HTTP_OK if authorized or error code */
 cupsdIsAuthorized(cupsd_client_t *con, /* I - Connection */
                   const char     *owner)/* I - Owner of object */
 {
-  int                  i, j,           /* Looping vars */
-                       auth;           /* Authorization status */
+  int                  i,              /* Looping vars */
+                       auth,           /* Authorization status */
+                       type;           /* Type of authentication */
   unsigned             address[4];     /* Authorization address */
   cupsd_location_t     *best;          /* Best match for location so far */
   int                  hostlen;        /* Length of hostname */
-  const char           *username;      /* Username to authorize */
+  char                 *name,          /* Current username */
+                       username[256],  /* Username to authorize */
+                       ownername[256], /* Owner name to authorize */
+                       *ptr;           /* Pointer into username */
   struct passwd                *pw;            /* User password data */
   static const char * const levels[] = /* Auth levels */
                {
@@ -1540,16 +1809,18 @@ cupsdIsAuthorized(cupsd_client_t *con,  /* I - Connection */
                };
   static const char * const types[] =  /* Auth types */
                {
-                 "NONE",
-                 "BASIC",
-                 "DIGEST",
-                 "BASICDIGEST"
+                 "None",
+                 "Basic",
+                 "Digest",
+                 "BasicDigest",
+                 "Negotiate"
                };
 
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2,
                   "cupsdIsAuthorized: con->uri=\"%s\", con->best=%p(%s)",
-                  con->uri, con->best, con->best ? con->best->location : "");
+                  con->uri, con->best, con->best ? con->best->location ?
+                                          con->best->location : "(null)" : "");
   if (owner)
     cupsdLogMessage(CUPSD_LOG_DEBUG2,
                     "cupsdIsAuthorized: owner=\"%s\"", owner);
@@ -1571,13 +1842,16 @@ cupsdIsAuthorized(cupsd_client_t *con,  /* I - Connection */
 
   best = con->best;
 
+  if ((type = best->type) == CUPSD_AUTH_DEFAULT)
+    type = DefaultAuthType;
+
   cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                  "cupsdIsAuthorized: level=AUTH_%s, type=AUTH_%s, "
-                 "satisfy=AUTH_SATISFY_%s, num_names=%d",
-                  levels[best->level], types[best->type],
-                 best->satisfy ? "ANY" : "ALL", best->num_names);
+                  "cupsdIsAuthorized: level=CUPSD_AUTH_%s, type=%s, "
+                 "satisfy=CUPSD_AUTH_SATISFY_%s, num_names=%d",
+                  levels[best->level], types[type],
+                 best->satisfy ? "ANY" : "ALL", cupsArrayCount(best->names));
 
-  if (best->limit == AUTH_LIMIT_IPP)
+  if (best->limit == CUPSD_AUTH_LIMIT_IPP)
     cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdIsAuthorized: op=%x(%s)",
                     best->op, ippOpString(best->op));
 
@@ -1615,56 +1889,13 @@ cupsdIsAuthorized(cupsd_client_t *con,  /* I - Connection */
 
   hostlen = strlen(con->http.hostname);
 
-  if (!strcasecmp(con->http.hostname, "localhost"))
-  {
-   /*
-    * Access from localhost (127.0.0.1 or ::1) is always allowed...
-    */
-
-    auth = AUTH_ALLOW;
-  }
-  else
-  {
-   /*
-    * Do authorization checks on the domain/address...
-    */
-
-    switch (best->order_type)
-    {
-      default :
-         auth = AUTH_DENY;     /* anti-compiler-warning-code */
-         break;
-
-      case AUTH_ALLOW : /* Order Deny,Allow */
-          auth = AUTH_ALLOW;
-
-          if (cupsdCheckAuth(address, con->http.hostname, hostlen,
-                       best->num_deny, best->deny))
-           auth = AUTH_DENY;
+  auth = cupsdCheckAccess(address, con->http.hostname, hostlen, best)
+             ? CUPSD_AUTH_ALLOW : CUPSD_AUTH_DENY;
 
-          if (cupsdCheckAuth(address, con->http.hostname, hostlen,
-                       best->num_allow, best->allow))
-           auth = AUTH_ALLOW;
-         break;
-
-      case AUTH_DENY : /* Order Allow,Deny */
-          auth = AUTH_DENY;
-
-          if (cupsdCheckAuth(address, con->http.hostname, hostlen,
-                       best->num_allow, best->allow))
-           auth = AUTH_ALLOW;
-
-          if (cupsdCheckAuth(address, con->http.hostname, hostlen,
-                       best->num_deny, best->deny))
-           auth = AUTH_DENY;
-         break;
-    }
-  }
-
-  cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdIsAuthorized: auth=AUTH_%s...",
+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdIsAuthorized: auth=CUPSD_AUTH_%s...",
                   auth ? "DENY" : "ALLOW");
 
-  if (auth == AUTH_DENY && best->satisfy == AUTH_SATISFY_ALL)
+  if (auth == CUPSD_AUTH_DENY && best->satisfy == CUPSD_AUTH_SATISFY_ALL)
     return (HTTP_FORBIDDEN);
 
 #ifdef HAVE_SSL
@@ -1672,10 +1903,13 @@ cupsdIsAuthorized(cupsd_client_t *con,  /* I - Connection */
   * See if encryption is required...
   */
 
-  if (best->encryption >= HTTP_ENCRYPT_REQUIRED && !con->http.tls &&
-      best->satisfy == AUTH_SATISFY_ALL)
+  if ((best->encryption >= HTTP_ENCRYPT_REQUIRED && !con->http.tls &&
+      _cups_strcasecmp(con->http.hostname, "localhost") &&
+      best->satisfy == CUPSD_AUTH_SATISFY_ALL) &&
+      !(type == CUPSD_AUTH_NEGOTIATE ||
+        (type == CUPSD_AUTH_NONE && DefaultAuthType == CUPSD_AUTH_NEGOTIATE)))
   {
-    cupsdLogMessage(CUPSD_LOG_DEBUG2,
+    cupsdLogMessage(CUPSD_LOG_DEBUG,
                     "cupsdIsAuthorized: Need upgrade to TLS...");
     return (HTTP_UPGRADE_REQUIRED);
   }
@@ -1685,12 +1919,12 @@ cupsdIsAuthorized(cupsd_client_t *con,  /* I - Connection */
   * Now see what access level is required...
   */
 
-  if (best->level == AUTH_ANON ||      /* Anonymous access - allow it */
-      (best->type == AUTH_NONE && best->num_names == 0))
+  if (best->level == CUPSD_AUTH_ANON ||        /* Anonymous access - allow it */
+      (type == CUPSD_AUTH_NONE && cupsArrayCount(best->names) == 0))
     return (HTTP_OK);
 
-  if (!con->username[0] && best->type == AUTH_NONE &&
-      best->limit == AUTH_LIMIT_IPP)
+  if (!con->username[0] && type == CUPSD_AUTH_NONE &&
+      best->limit == CUPSD_AUTH_LIMIT_IPP)
   {
    /*
     * Check for unauthenticated username...
@@ -1702,30 +1936,47 @@ cupsdIsAuthorized(cupsd_client_t *con,  /* I - Connection */
     attr = ippFindAttribute(con->request, "requesting-user-name", IPP_TAG_NAME);
     if (attr)
     {
-      cupsdLogMessage(CUPSD_LOG_DEBUG2,
+      cupsdLogMessage(CUPSD_LOG_DEBUG,
                       "cupsdIsAuthorized: requesting-user-name=\"%s\"",
                       attr->values[0].string.text);
-      username = attr->values[0].string.text;
+      strlcpy(username, attr->values[0].string.text, sizeof(username));
     }
-    else if (best->satisfy == AUTH_SATISFY_ALL || auth == AUTH_DENY)
+    else if (best->satisfy == CUPSD_AUTH_SATISFY_ALL || auth == CUPSD_AUTH_DENY)
       return (HTTP_UNAUTHORIZED);      /* Non-anonymous needs user/pass */
     else
       return (HTTP_OK);                        /* unless overridden with Satisfy */
   }
   else
   {
-    cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdIsAuthorized: username=\"%s\"",
+    cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdIsAuthorized: username=\"%s\"",
                    con->username);
 
+#ifdef HAVE_AUTHORIZATION_H
+    if (!con->username[0] && !con->authref)
+#else
     if (!con->username[0])
+#endif /* HAVE_AUTHORIZATION_H */
     {
-      if (best->satisfy == AUTH_SATISFY_ALL || auth == AUTH_DENY)
+      if (best->satisfy == CUPSD_AUTH_SATISFY_ALL || auth == CUPSD_AUTH_DENY)
        return (HTTP_UNAUTHORIZED);     /* Non-anonymous needs user/pass */
       else
        return (HTTP_OK);               /* unless overridden with Satisfy */
     }
 
-    username = con->username;
+
+    if (con->type != type && type != CUPSD_AUTH_NONE &&
+#ifdef HAVE_GSSAPI
+        (type != CUPSD_AUTH_NEGOTIATE || con->gss_uid <= 0) &&
+#endif /* HAVE_GSSAPI */
+        (con->type != CUPSD_AUTH_BASIC || type != CUPSD_AUTH_BASICDIGEST))
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR, "Authorized using %s, expected %s!",
+                      types[con->type], types[type]);
+
+      return (HTTP_UNAUTHORIZED);
+    }
+
+    strlcpy(username, con->username, sizeof(username));
   }
 
  /*
@@ -1736,21 +1987,43 @@ cupsdIsAuthorized(cupsd_client_t *con,  /* I - Connection */
   if (!strcmp(username, "root"))
     return (HTTP_OK);
 
+ /*
+  * Strip any @domain or @KDC from the username and owner...
+  */
+
+  if ((ptr = strchr(username, '@')) != NULL)
+    *ptr = '\0';
+
+  if (owner)
+  {
+    strlcpy(ownername, owner, sizeof(ownername));
+
+    if ((ptr = strchr(ownername, '@')) != NULL)
+      *ptr = '\0';
+  }
+  else
+    ownername[0] = '\0';
+
  /*
   * Get the user info...
   */
 
-  pw = getpwnam(username);
-  endpwent();
+  if (username[0])
+  {
+    pw = getpwnam(username);
+    endpwent();
+  }
+  else
+    pw = NULL;
 
-  if (best->level == AUTH_USER)
+  if (best->level == CUPSD_AUTH_USER)
   {
    /*
     * If there are no names associated with this location, then
     * any valid user is OK...
     */
 
-    if (best->num_names == 0)
+    if (cupsArrayCount(best->names) == 0)
       return (HTTP_OK);
 
    /*
@@ -1761,27 +2034,51 @@ cupsdIsAuthorized(cupsd_client_t *con,  /* I - Connection */
     cupsdLogMessage(CUPSD_LOG_DEBUG2,
                     "cupsdIsAuthorized: Checking user membership...");
 
-    for (i = 0; i < best->num_names; i ++)
+#ifdef HAVE_AUTHORIZATION_H
+   /*
+    * If an authorization reference was supplied it must match a right name...
+    */
+
+    if (con->authref)
+    {
+      for (name = (char *)cupsArrayFirst(best->names);
+           name;
+          name = (char *)cupsArrayNext(best->names))
+      {
+       if (!_cups_strncasecmp(name, "@AUTHKEY(", 9) && check_authref(con, name + 9))
+         return (HTTP_OK);
+       else if (!_cups_strcasecmp(name, "@SYSTEM") && SystemGroupAuthKey &&
+                check_authref(con, SystemGroupAuthKey))
+         return (HTTP_OK);
+      }
+
+      return (HTTP_FORBIDDEN);
+    }
+#endif /* HAVE_AUTHORIZATION_H */
+
+    for (name = (char *)cupsArrayFirst(best->names);
+        name;
+        name = (char *)cupsArrayNext(best->names))
     {
-      if (!strcasecmp(best->names[i], "@OWNER") && owner &&
-          !strcasecmp(username, owner))
+      if (!_cups_strcasecmp(name, "@OWNER") && owner &&
+          !_cups_strcasecmp(username, ownername))
        return (HTTP_OK);
-      else if (!strcasecmp(best->names[i], "@SYSTEM"))
+      else if (!_cups_strcasecmp(name, "@SYSTEM"))
       {
-        for (j = 0; j < NumSystemGroups; j ++)
-         if (cupsdCheckGroup(username, pw, SystemGroups[j]))
+        for (i = 0; i < NumSystemGroups; i ++)
+         if (cupsdCheckGroup(username, pw, SystemGroups[i]))
            return (HTTP_OK);
       }
-      else if (best->names[i][0] == '@')
+      else if (name[0] == '@')
       {
-        if (cupsdCheckGroup(username, pw, best->names[i] + 1))
+        if (cupsdCheckGroup(username, pw, name + 1))
           return (HTTP_OK);
       }
-      else if (!strcasecmp(username, best->names[i]))
+      else if (!_cups_strcasecmp(username, name))
         return (HTTP_OK);
     }
 
-    return (HTTP_UNAUTHORIZED);
+    return (con->username[0] ? HTTP_FORBIDDEN : HTTP_UNAUTHORIZED);
   }
 
  /*
@@ -1795,19 +2092,21 @@ cupsdIsAuthorized(cupsd_client_t *con,  /* I - Connection */
   * Check to see if this user is in any of the named groups...
   */
 
-  for (i = 0; i < best->num_names; i ++)
+  for (name = (char *)cupsArrayFirst(best->names);
+       name;
+       name = (char *)cupsArrayNext(best->names))
   {
     cupsdLogMessage(CUPSD_LOG_DEBUG2,
                     "cupsdIsAuthorized: Checking group \"%s\" membership...",
-                    best->names[i]);
+                    name);
 
-    if (!strcasecmp(best->names[i], "@SYSTEM"))
+    if (!_cups_strcasecmp(name, "@SYSTEM"))
     {
-      for (j = 0; j < NumSystemGroups; j ++)
-       if (cupsdCheckGroup(username, pw, SystemGroups[j]))
+      for (i = 0; i < NumSystemGroups; i ++)
+       if (cupsdCheckGroup(username, pw, SystemGroups[i]))
          return (HTTP_OK);
     }
-    else if (cupsdCheckGroup(username, pw, best->names[i]))
+    else if (cupsdCheckGroup(username, pw, name))
       return (HTTP_OK);
   }
 
@@ -1815,95 +2114,104 @@ cupsdIsAuthorized(cupsd_client_t *con, /* I - Connection */
   * The user isn't part of the specified group, so deny access...
   */
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG2,
+  cupsdLogMessage(CUPSD_LOG_DEBUG,
                   "cupsdIsAuthorized: User not in group(s)!");
 
-  return (HTTP_UNAUTHORIZED);
+  return (con->username[0] ? HTTP_FORBIDDEN : HTTP_UNAUTHORIZED);
 }
 
 
 /*
- * 'add_allow()' - Add an allow mask to the location.
+ * 'cupsdNewLocation()' - Create a new location for authorization.
+ *
+ * Note: Still need to call cupsdAddLocation() to add it to the list of global
+ * locations.
  */
 
-static cupsd_authmask_t *              /* O - New mask record */
-add_allow(cupsd_location_t *loc)       /* I - Location to add to */
+cupsd_location_t *                     /* O - Pointer to new location record */
+cupsdNewLocation(const char *location) /* I - Location path */
 {
-  cupsd_authmask_t     *temp;          /* New mask record */
+  cupsd_location_t     *temp;          /* New location */
 
 
  /*
-  * Range-check...
+  * Try to allocate memory for the new location.
   */
 
-  if (loc == NULL)
+  if ((temp = calloc(1, sizeof(cupsd_location_t))) == NULL)
     return (NULL);
 
  /*
-  * Try to allocate memory for the record...
+  * Initialize the record and copy the name over...
   */
 
-  if (loc->num_allow == 0)
-    temp = malloc(sizeof(cupsd_authmask_t));
-  else
-    temp = realloc(loc->allow, sizeof(cupsd_authmask_t) * (loc->num_allow + 1));
-
-  if (temp == NULL)
+  if ((temp->location = _cupsStrAlloc(location)) == NULL)
+  {
+    free(temp);
     return (NULL);
+  }
 
-  loc->allow = temp;
-  temp       += loc->num_allow;
-  loc->num_allow ++;
+  temp->length = strlen(temp->location);
 
  /*
-  * Clear the mask record and return...
+  * Return the new record...
   */
 
-  memset(temp, 0, sizeof(cupsd_authmask_t));
   return (temp);
 }
 
 
+#ifdef HAVE_AUTHORIZATION_H
 /*
- * 'add_deny()' - Add a deny mask to the location.
+ * 'check_authref()' - Check if an authorization services reference has the
+ *                    supplied right.
  */
 
-static cupsd_authmask_t *              /* O - New mask record */
-add_deny(cupsd_location_t *loc)                /* I - Location to add to */
+static int                             /* O - 1 if right is valid, 0 otherwise */
+check_authref(cupsd_client_t *con,     /* I - Connection */
+             const char     *right)    /* I - Right name */
 {
-  cupsd_authmask_t     *temp;          /* New mask record */
+  OSStatus             status;         /* OS Status */
+  AuthorizationItem    authright;      /* Authorization right */
+  AuthorizationRights  authrights;     /* Authorization rights */
+  AuthorizationFlags   authflags;      /* Authorization flags */
 
 
  /*
-  * Range-check...
+  * Check to see if the user is allowed to perform the task...
   */
 
-  if (loc == NULL)
-    return (NULL);
+  if (!con->authref)
+    return (0);
 
- /*
-  * Try to allocate memory for the record...
-  */
+  authright.name        = right;
+  authright.valueLength = 0;
+  authright.value       = NULL;
+  authright.flags       = 0;
 
-  if (loc->num_deny == 0)
-    temp = malloc(sizeof(cupsd_authmask_t));
-  else
-    temp = realloc(loc->deny, sizeof(cupsd_authmask_t) * (loc->num_deny + 1));
+  authrights.count = 1;
+  authrights.items = &authright;
 
-  if (temp == NULL)
-    return (NULL);
+  authflags = kAuthorizationFlagDefaults |
+             kAuthorizationFlagExtendRights;
 
-  loc->deny = temp;
-  temp      += loc->num_deny;
-  loc->num_deny ++;
+  if ((status = AuthorizationCopyRights(con->authref, &authrights,
+                                       kAuthorizationEmptyEnvironment,
+                                       authflags, NULL)) != 0)
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR,
+                   "AuthorizationCopyRights(\"%s\") returned %d (%s)",
+                   authright.name, (int)status, cssmErrorString(status));
+    return (0);
+  }
 
- /*
-  * Clear the mask record and return...
-  */
+  cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                  "AuthorizationCopyRights(\"%s\") succeeded!",
+                 authright.name);
 
-  memset(temp, 0, sizeof(cupsd_authmask_t));
-  return (temp);
+  return (1);
 }
+#endif /* HAVE_AUTHORIZATION_H */
 
 
 /*
@@ -1918,7 +2226,46 @@ compare_locations(cupsd_location_t *a,   /* I - First location */
 }
 
 
-#if !HAVE_LIBPAM
+/*
+ * 'copy_authmask()' - Copy function for auth masks.
+ */
+
+static cupsd_authmask_t        *               /* O - New auth mask */
+copy_authmask(cupsd_authmask_t *mask,  /* I - Existing auth mask */
+              void             *data)  /* I - User data (unused) */
+{
+  cupsd_authmask_t     *temp;          /* New auth mask */
+
+
+  (void)data;
+
+  if ((temp = malloc(sizeof(cupsd_authmask_t))) != NULL)
+  {
+    memcpy(temp, mask, sizeof(cupsd_authmask_t));
+
+    if (temp->type == CUPSD_AUTH_NAME || temp->type == CUPSD_AUTH_INTERFACE)
+    {
+     /*
+      * Make a copy of the name...
+      */
+
+      if ((temp->mask.name.name = _cupsStrAlloc(temp->mask.name.name)) == NULL)
+      {
+       /*
+        * Failed to make copy...
+       */
+
+        free(temp);
+       temp = NULL;
+      }
+    }
+  }
+
+  return (temp);
+}
+
+
+#if !HAVE_LIBPAM && !defined(HAVE_USERSEC_H)
 /*
  * 'cups_crypt()' - Encrypt the password using the DES or MD5 algorithms,
  *                  as needed.
@@ -2038,7 +2385,86 @@ cups_crypt(const char *pw,               /* I - Password string */
     return (crypt(pw, salt));
   }
 }
-#endif /* !HAVE_LIBPAM */
+#endif /* !HAVE_LIBPAM && !HAVE_USERSEC_H */
+
+
+/*
+ * 'free_authmask()' - Free function for auth masks.
+ */
+
+static void
+free_authmask(cupsd_authmask_t *mask,  /* I - Auth mask to free */
+              void             *data)  /* I - User data (unused) */
+{
+  (void)data;
+
+  if (mask->type == CUPSD_AUTH_NAME || mask->type == CUPSD_AUTH_INTERFACE)
+    _cupsStrFree(mask->mask.name.name);
+
+  free(mask);
+}
+
+
+/*
+ * 'get_md5_password()' - Get an MD5 password.
+ */
+
+static char *                          /* O - MD5 password string */
+get_md5_password(const char *username, /* I - Username */
+                 const char *group,    /* I - Group */
+                 char       passwd[33])        /* O - MD5 password string */
+{
+  cups_file_t  *fp;                    /* passwd.md5 file */
+  char         filename[1024],         /* passwd.md5 filename */
+               line[256],              /* Line from file */
+               tempuser[33],           /* User from file */
+               tempgroup[33];          /* Group from file */
+
+
+  cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                  "get_md5_password(username=\"%s\", group=\"%s\", passwd=%p)",
+                  username, group ? group : "(null)", passwd);
+
+  snprintf(filename, sizeof(filename), "%s/passwd.md5", ServerRoot);
+  if ((fp = cupsFileOpen(filename, "r")) == NULL)
+  {
+    if (errno != ENOENT)
+      cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to open %s - %s", filename,
+                      strerror(errno));
+
+    return (NULL);
+  }
+
+  while (cupsFileGets(fp, line, sizeof(line)) != NULL)
+  {
+    if (sscanf(line, "%32[^:]:%32[^:]:%32s", tempuser, tempgroup, passwd) != 3)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR, "Bad MD5 password line: %s", line);
+      continue;
+    }
+
+    if (!strcmp(username, tempuser) &&
+        (group == NULL || !strcmp(group, tempgroup)))
+    {
+     /*
+      * Found the password entry!
+      */
+
+      cupsdLogMessage(CUPSD_LOG_DEBUG2, "Found MD5 user %s, group %s...",
+                      username, tempgroup);
+
+      cupsFileClose(fp);
+      return (passwd);
+    }
+  }
+
+ /*
+  * Didn't find a password entry - return NULL!
+  */
+
+  cupsFileClose(fp);
+  return (NULL);
+}
 
 
 #if HAVE_LIBPAM
@@ -2132,7 +2558,7 @@ pam_func(
 
   return (PAM_SUCCESS);
 }
-#else
+#elif !defined(HAVE_USERSEC_H)
 
 
 /*
@@ -2156,5 +2582,5 @@ to64(char          *s,                    /* O - Output string */
 
 
 /*
- * End of "$Id: auth.c 5232 2006-03-05 17:59:19Z mike $".
+ * End of "$Id: auth.c 7830 2008-08-04 20:38:50Z mike $".
  */