diff options
Diffstat (limited to 'print/cups/patches/patch-scheduler_auth.c')
| -rw-r--r-- | print/cups/patches/patch-scheduler_auth.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/print/cups/patches/patch-scheduler_auth.c b/print/cups/patches/patch-scheduler_auth.c index d03354ecbf2..aef2055559a 100644 --- a/print/cups/patches/patch-scheduler_auth.c +++ b/print/cups/patches/patch-scheduler_auth.c @@ -1,13 +1,13 @@ -$NetBSD: patch-scheduler_auth.c,v 1.3 2014/06/07 07:34:05 wiz Exp $ +$NetBSD: patch-scheduler_auth.c,v 1.4 2015/01/02 02:03:42 christos Exp $ Don't pull in sys/ucred.h on Solaris as it results in procfs.h being included and conflicts between _FILE_OFFSET_BITS=64 and 32-bit procfs. OpenBSD defines SO_PEERCRED, but it is different from Linux's one. ---- scheduler/auth.c.orig 2014-01-06 22:21:15.000000000 +0000 -+++ scheduler/auth.c -@@ -84,7 +84,7 @@ extern const char *cssmErrorString(int e +--- scheduler/auth.c.orig 2014-08-28 11:37:22.000000000 -0400 ++++ scheduler/auth.c 2014-12-24 14:17:35.000000000 -0500 +@@ -49,7 +49,7 @@ #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif /* HAVE_SYS_PARAM_H */ @@ -16,16 +16,16 @@ OpenBSD defines SO_PEERCRED, but it is different from Linux's one. # include <sys/ucred.h> typedef struct xucred cupsd_ucred_t; # define CUPSD_UCRED_UID(c) (c).cr_uid -@@ -500,7 +500,7 @@ cupsdAuthorize(cupsd_client_t *con) /* I +@@ -435,7 +435,7 @@ con->type = CUPSD_AUTH_BASIC; } #endif /* HAVE_AUTHORIZATION_H */ -#if defined(SO_PEERCRED) && defined(AF_LOCAL) +#if defined(SO_PEERCRED) && defined(AF_LOCAL) && !defined(__OpenBSD__) else if (!strncmp(authorization, "PeerCred ", 9) && - con->http.hostaddr->addr.sa_family == AF_LOCAL) + con->http->hostaddr->addr.sa_family == AF_LOCAL && con->best) { -@@ -1142,7 +1142,7 @@ cupsdAuthorize(cupsd_client_t *con) /* I +@@ -940,7 +940,7 @@ gss_delete_sec_context(&minor_status, &context, GSS_C_NO_BUFFER); |