diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-09-13 11:53:50 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-09-13 11:53:56 +0900 |
| commit | 5ed126d6de36f982f1f800f54d468dac5730050d (patch) | |
| tree | e879d7ec04890d2b5395408fee767ff8e7fde2a1 /scheduler/conf.c | |
| parent | 1465a9590ad148bed86bf8930007467ad37f7ac0 (diff) | |
| download | cups-5ed126d6de36f982f1f800f54d468dac5730050d.tar.gz cups-5ed126d6de36f982f1f800f54d468dac5730050d.tar.bz2 cups-5ed126d6de36f982f1f800f54d468dac5730050d.zip | |
Imported Upstream version 2.2.3
Change-Id: I3d6e094a6bcee5cd32563c3b4b9e77d653a4949d
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'scheduler/conf.c')
| -rw-r--r-- | scheduler/conf.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/scheduler/conf.c b/scheduler/conf.c index 3cde8bd..36f043f 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -1,7 +1,7 @@ /* * Configuration routines for the CUPS scheduler. * - * Copyright 2007-2016 by Apple Inc. + * Copyright 2007-2017 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -2233,7 +2233,6 @@ parse_aaa(cupsd_location_t *loc, /* I - Location */ if (loc->level == CUPSD_AUTH_ANON) loc->level = CUPSD_AUTH_USER; } -#ifdef HAVE_GSSAPI else if (!_cups_strcasecmp(value, "negotiate")) { loc->type = CUPSD_AUTH_NEGOTIATE; @@ -2241,7 +2240,6 @@ parse_aaa(cupsd_location_t *loc, /* I - Location */ if (loc->level == CUPSD_AUTH_ANON) loc->level = CUPSD_AUTH_USER; } -#endif /* HAVE_GSSAPI */ else { cupsdLogMessage(CUPSD_LOG_WARN, @@ -3175,10 +3173,8 @@ read_cupsd_conf(cups_file_t *fp) /* I - File to read from */ default_auth_type = CUPSD_AUTH_NONE; else if (!_cups_strcasecmp(value, "basic")) default_auth_type = CUPSD_AUTH_BASIC; -#ifdef HAVE_GSSAPI else if (!_cups_strcasecmp(value, "negotiate")) default_auth_type = CUPSD_AUTH_NEGOTIATE; -#endif /* HAVE_GSSAPI */ else if (!_cups_strcasecmp(value, "auto")) default_auth_type = CUPSD_AUTH_AUTO; else |