diff options
| author | Didier Raboud <odyx@debian.org> | 2012-10-25 21:07:57 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2012-10-25 21:07:57 +0200 |
| commit | 81ab83f382660bc7980ae954725c4ebf28764b03 (patch) | |
| tree | 523268f698a63a8fd44f3491d94d140266b2403b /scheduler/auth.h | |
| parent | a75966e33dbc3e3e096338fd332f515cb313b58a (diff) | |
| download | cups-upstream/1.6.0.tar.gz | |
Imported Upstream version 1.6.0upstream/1.6.0
Diffstat (limited to 'scheduler/auth.h')
| -rw-r--r-- | scheduler/auth.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scheduler/auth.h b/scheduler/auth.h index f15a6f9b..c6865156 100644 --- a/scheduler/auth.h +++ b/scheduler/auth.h @@ -1,5 +1,5 @@ /* - * "$Id: auth.h 9652 2011-03-25 21:25:38Z mike $" + * "$Id: auth.h 10131 2011-11-30 23:11:23Z mike $" * * Authorization definitions for the CUPS scheduler. * @@ -30,6 +30,7 @@ #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_AUTO 5 /* Kerberos or Basic, depending on configuration of server */ #define CUPSD_AUTH_ANON 0 /* Anonymous access */ #define CUPSD_AUTH_USER 1 /* Must have a valid username/password */ @@ -112,8 +113,6 @@ typedef struct cupsd_client_s cupsd_client_t; VAR cups_array_t *Locations VALUE(NULL); /* Authorization locations */ -VAR int DefaultAuthType VALUE(CUPSD_AUTH_BASIC); - /* Default AuthType, if not specified */ #ifdef HAVE_SSL VAR http_encryption_t DefaultEncryption VALUE(HTTP_ENCRYPT_REQUIRED); /* Default encryption for authentication */ @@ -148,5 +147,5 @@ extern cupsd_location_t *cupsdNewLocation(const char *location); /* - * End of "$Id: auth.h 9652 2011-03-25 21:25:38Z mike $". + * End of "$Id: auth.h 10131 2011-11-30 23:11:23Z mike $". */ |