diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2018-06-29 13:42:38 -0400 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2018-06-29 13:42:38 -0400 |
| commit | bf265b3aa9e0f1f32c831000a114ecec4bfebc76 (patch) | |
| tree | 8174bd3bc7399e8619e0d447450f492e697594f7 /scheduler | |
| parent | 945c83b90e719ed722164fd910c4a3e58bd67430 (diff) | |
Authentication in the web interface did not work on macOS (rdar://41444473)
cups/auth.c:
- cups_local_auth(): Don't check for AuthRef twice, log fopen errors for the
root cert as well.
scheduler/client.c:
- Also allow local auth with AuthRef's.
Diffstat (limited to 'scheduler')
| -rw-r--r-- | scheduler/client.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scheduler/client.c b/scheduler/client.c index 95b9db680..cfb0e1b9b 100644 --- a/scheduler/client.c +++ b/scheduler/client.c @@ -2155,7 +2155,7 @@ cupsdSendHeader( #ifdef HAVE_AUTHORIZATION_H if (!_cups_strncasecmp(name, "@AUTHKEY(", 9)) { - snprintf(auth_key, auth_size, ", AuthRef key=\"%s\"", name + 9); + snprintf(auth_key, auth_size, ", AuthRef key=\"%s\", Local trc=\"y\"", name + 9); need_local = 0; /* end parenthesis is stripped in conf.c */ break; @@ -2166,11 +2166,10 @@ cupsdSendHeader( { #ifdef HAVE_AUTHORIZATION_H if (SystemGroupAuthKey) - snprintf(auth_key, auth_size, ", AuthRef key=\"%s\"", SystemGroupAuthKey); + snprintf(auth_key, auth_size, ", AuthRef key=\"%s\", Local trc=\"y\"", SystemGroupAuthKey); else -#else - strlcpy(auth_key, ", Local trc=\"y\"", auth_size); #endif /* HAVE_AUTHORIZATION_H */ + strlcpy(auth_key, ", Local trc=\"y\"", auth_size); need_local = 0; break; } |