diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2018-06-29 13:45:52 -0400 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2018-06-29 13:45:52 -0400 |
| commit | 7927b44a2ea2b49d4f8514ca9d9531d9eae8e143 (patch) | |
| tree | 1d3a574a02faf68a89e887cbfedb63ea0e59684d /cups | |
| parent | ae9f0b239f5b370aeccd55dcae7e3a1e276aa4e3 (diff) | |
Mirror macOS web interface authentication fix from master.
Diffstat (limited to 'cups')
| -rw-r--r-- | cups/auth.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/cups/auth.c b/cups/auth.c index 740b07989..175c53892 100644 --- a/cups/auth.c +++ b/cups/auth.c @@ -1121,10 +1121,6 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ if (cups_auth_find(www_auth, "Negotiate")) return (1); # endif /* HAVE_GSSAPI */ -# ifdef HAVE_AUTHORIZATION_H - if (cups_auth_find(www_auth, "AuthRef")) - return (1); -# endif /* HAVE_AUTHORIZATION_H */ # if defined(SO_PEERCRED) && defined(AF_LOCAL) /* @@ -1174,7 +1170,7 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ * No certificate for this PID; see if we can get the root certificate... */ - DEBUG_printf(("9cups_local_auth: Unable to open file %s: %s", filename, strerror(errno))); + DEBUG_printf(("9cups_local_auth: Unable to open file \"%s\": %s", filename, strerror(errno))); if (!cups_auth_param(schemedata, "trc", trc, sizeof(trc))) { @@ -1186,7 +1182,8 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ } snprintf(filename, sizeof(filename), "%s/certs/0", cg->cups_statedir); - fp = fopen(filename, "r"); + if ((fp = fopen(filename, "r")) == NULL) + DEBUG_printf(("9cups_local_auth: Unable to open file \"%s\": %s", filename, strerror(errno))); } if (fp) |