unconitionally use socketpair?

[Darren Tucker]

Does anyone actually use sshd on a system that doesn't have socketpair?
It's used elsewhere so the don't-have path seems like it'd never be
exercised these days.

Index: monitor.c
===================================================================
RCS file: /usr/local/src/security/openssh/cvs/openssh/monitor.c,v
retrieving revision 1.147
diff -u -p -r1.147 monitor.c
--- monitor.c	29 May 2011 11:39:38 -0000	1.147
+++ monitor.c	3 Jun 2011 01:05:31 -0000
@@ -1853,13 +1853,8 @@ mm_init_compression(struct mm_master *mm
 static void
 monitor_socketpair(int *pair)
 {
-#ifdef HAVE_SOCKETPAIR
 	if (socketpair(AF_UNIX, SOCK_STREAM, 0, pair) == -1)
 		fatal("%s: socketpair", __func__);
-#else
-	fatal("%s: UsePrivilegeSeparation=yes not supported",
-	    __func__);
-#endif
 	FD_CLOSEONEXEC(pair[0]);
 	FD_CLOSEONEXEC(pair[1]);
 }

-- 
Darren Tucker (dtucker at zip.com.au)
GPG key 8FF4FA69 / D9A3 86E9 7EEE AF4B B2D4  37C9 C982 80C7 8FF4 FA69
    Good judgement comes with experience. Unfortunately, the experience
usually comes from bad judgement.