unbreak compilation on -current now that we have SO_PEERCRED but

with a different struct name to Linux; ok ajacoutot@
This commit is contained in:
djm 2010-07-01 10:45:57 +00:00
parent 4e025a90ef
commit 0857e2ce53
3 changed files with 18 additions and 6 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.12 2009/03/13 21:33:43 jasper Exp $
# $OpenBSD: Makefile,v 1.13 2010/07/01 10:45:57 djm Exp $
COMMENT= drivers for several smart card readers
DISTNAME= openct-0.6.15
PKGNAME= ${DISTNAME}p1
PKGNAME= ${DISTNAME}p2
CATEGORIES= security
SHARED_LIBS= openct 1.1

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1 2009/03/13 21:33:43 jasper Exp $
--- configure.orig Mon Mar 2 08:16:29 2009
+++ configure Mon Mar 2 08:16:53 2009
@@ -23258,7 +23258,7 @@
$OpenBSD: patch-configure,v 1.2 2010/07/01 10:45:57 djm Exp $
--- configure.orig Thu Jul 31 23:03:41 2008
+++ configure Thu Jul 1 11:48:12 2010
@@ -23258,7 +23258,7 @@ cat >>confdefs.h <<_ACEOF
#define OPENCT_MODULES_PATH "${ifddir}"
_ACEOF

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_ct_socket_c,v 1.1 2010/07/01 10:45:57 djm Exp $
--- src/ct/socket.c.orig Thu Jul 1 11:51:42 2010
+++ src/ct/socket.c Thu Jul 1 11:52:26 2010
@@ -295,7 +295,7 @@ ct_socket_t *ct_socket_accept(ct_socket_t * sock)
static int ct_socket_getcreds(ct_socket_t * sock)
{
#ifdef SO_PEERCRED
- struct ucred creds;
+ struct sockpeercred creds;
socklen_t len;
len = sizeof(creds);