summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--monitor.c5
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ec082169..d22a84d64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
120020410 120020410
2 - (stevesk) [configure.ac monitor.c] HAVE_SOCKETPAIR
2 - (stevesk) [auth-sia.c] compile fix Chris Adams <cmadams@hiwaay.net> 3 - (stevesk) [auth-sia.c] compile fix Chris Adams <cmadams@hiwaay.net>
3 - (bal) OpenBSD CVS Sync 4 - (bal) OpenBSD CVS Sync
4 - markus@cvs.openbsd.org 2002/04/10 08:21:47 5 - markus@cvs.openbsd.org 2002/04/10 08:21:47
@@ -8214,4 +8215,4 @@
8214 - Wrote replacements for strlcpy and mkdtemp 8215 - Wrote replacements for strlcpy and mkdtemp
8215 - Released 1.0pre1 8216 - Released 1.0pre1
8216 8217
8217$Id: ChangeLog,v 1.2043 2002/04/10 16:26:20 mouring Exp $ 8218$Id: ChangeLog,v 1.2044 2002/04/10 22:04:54 stevesk Exp $
diff --git a/monitor.c b/monitor.c
index 03f8dc74a..b66dc2a16 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1406,8 +1406,13 @@ mm_init_compression(struct mm_master *mm)
1406static void 1406static void
1407monitor_socketpair(int *pair) 1407monitor_socketpair(int *pair)
1408{ 1408{
1409#ifdef HAVE_SOCKETPAIR
1409 if (socketpair(AF_UNIX, SOCK_STREAM, 0, pair) == -1) 1410 if (socketpair(AF_UNIX, SOCK_STREAM, 0, pair) == -1)
1410 fatal("%s: socketpair", __FUNCTION__); 1411 fatal("%s: socketpair", __FUNCTION__);
1412#else
1413 fatal("%s: UsePrivilegeSeparation=yes not supported",
1414 __FUNCTION__);
1415#endif
1411 FD_CLOSEONEXEC(pair[0]); 1416 FD_CLOSEONEXEC(pair[0]);
1412 FD_CLOSEONEXEC(pair[1]); 1417 FD_CLOSEONEXEC(pair[1]);
1413} 1418}