cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adapt to the new SO_PEERCRED.

Browse Source 
OK sthen@, landry@
This commit is contained in:
sebastia 2010-07-07 13:58:11 +00:00
parent a704bdc2a8
commit 71a7f5a4db
2 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/heartbeat/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2010/06/18 22:20:03 sebastia Exp $
# $OpenBSD: Makefile,v 1.12 2010/07/07 13:58:11 sebastia Exp $
SHARED_ONLY= Yes
@ -9,7 +9,7 @@ COMMENT-snmp= snmp agent for heartbeat
DISTNAME= obs-2.1.2-15
VERSION= 2.1.2.15
PKGNAME= heartbeat-${VERSION}
PKGNAME-main= heartbeat-${VERSION}p1
PKGNAME-main= heartbeat-${VERSION}p2
PKGNAME-gui= heartbeat-gui-${VERSION}p1
PKGNAME-snmp= heartbeat-snmp-${VERSION}p1

38
sysutils/heartbeat/patches/patch-lib_clplumbing_ipcsocket_c Normal file
View File

@ -0,0 +1,38 @@
$OpenBSD: patch-lib_clplumbing_ipcsocket_c,v 1.1 2010/07/07 13:58:11 sebastia Exp $
Fix new SO_PEERCRED fallout.
--- lib/clplumbing/ipcsocket.c.orig Wed Jul 7 09:19:19 2010
+++ lib/clplumbing/ipcsocket.c Wed Jul 7 09:20:50 2010
@@ -2259,7 +2259,11 @@ socket_verify_auth(struct IPC_CHANNEL* ch, struct IPC_
{
struct SOCKET_CH_PRIVATE * conn_info;
int ret = IPC_FAIL;
+#ifndef __OpenBSD__
struct ucred cred;
+#else
+ struct sockpeercred cred;
+#endif
socklen_t n = sizeof(cred);
if (ch == NULL || ch->ch_private == NULL) {
@@ -2308,12 +2312,21 @@ socket_get_farside_pid(int sockfd)
{
socklen_t n;
+#ifndef __OpenBSD__
struct ucred *cred;
+#else
+ struct sockpeercred *cred;
+#endif
pid_t f_pid;
/* Get the credential information from peer */
+#ifndef __OpenBSD__
n = sizeof(struct ucred);
cred = g_new(struct ucred, 1);
+#else
+ n = sizeof(struct sockpeercred);
+ cred = g_new(struct sockpeercred, 1);
+#endif
if (getsockopt(sockfd, SOL_SOCKET, SO_PEERCRED, cred, &n) != 0) {
g_free(cred);
return -1;