Fix fallout of SO_PEERCRED changes. while here, bring in string.h for

declarations of strcpy() and strlen().
This commit is contained in:
landry 2010-07-09 08:17:50 +00:00
parent 3609865967
commit 50f1483d91
4 changed files with 38 additions and 1 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.8 2007/09/15 22:37:00 merdely Exp $
# $OpenBSD: Makefile,v 1.9 2010/07/09 08:17:50 landry Exp $
COMMENT= tools for building unix domain socket client/servers
DISTNAME= ucspi-unix-0.34
PKGNAME= ${DISTNAME}p0
CATEGORIES= net
HOMEPAGE= http://em.ca/~bruceg/ucspi-unix/

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-env_c,v 1.1 2010/07/09 08:17:50 landry Exp $
--- env.c.orig Fri Jul 9 10:10:54 2010
+++ env.c Fri Jul 9 10:11:30 2010
@@ -9,7 +9,11 @@ extern const char* utoa(unsigned long);
void setup_env(int fd, const char* socket)
{
#ifdef SO_PEERCRED
- struct ucred peer;
+#ifndef __OpenBSD__
+ struct ucred peer;
+#else
+ struct sockpeercred peer;
+#endif
int optlen = sizeof(peer);
if(getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &peer, &optlen) != -1) {
setenv("UNIXREMOTEEGID", utoa(peer.gid), 1);

View File

@ -0,0 +1,10 @@
$OpenBSD: patch-unixclient_c,v 1.1 2010/07/09 08:17:50 landry Exp $
--- unixclient.c.orig Fri Jul 9 10:12:16 2010
+++ unixclient.c Fri Jul 9 10:12:34 2010
@@ -1,5 +1,6 @@
#include <signal.h>
#include <stdio.h>
+#include <string.h>
#include <stdlib.h>
#include <sys/socket.h>
#include <sys/stat.h>

View File

@ -0,0 +1,10 @@
$OpenBSD: patch-unixserver_c,v 1.1 2010/07/09 08:17:50 landry Exp $
--- unixserver.c.orig Fri Jul 9 10:15:13 2010
+++ unixserver.c Fri Jul 9 10:15:23 2010
@@ -1,5 +1,6 @@
#include <signal.h>
#include <stdio.h>
+#include <string.h>
#include <stdlib.h>
#include <sys/socket.h>
#include <sys/stat.h>