PLEASE TEST snapshots

[Gert Doering]

Hi,

On Wed, Apr 10, 2002 at 11:31:13AM -0700, Kevin Steves wrote:
> :Is this something that should happen "by magic" in the current code?  Or
> :is this more "thinking aloud" about necessary changes to monitor.c?
> 
> it doesn't appear to be a 5 minute job to plug-in half-duplex pipes there,
> but i may be missing something obvious.
> 
> for now i guess we can just die if no socketpair().

Okay, here we go...

===================================================================
RCS file: /cvs/openssh_cvs/monitor.c,v
retrieving revision 1.8
diff -u -r1.8 monitor.c
--- monitor.c   2 Apr 2002 20:48:20 -0000       1.8
+++ monitor.c   10 Apr 2002 21:14:37 -0000
@@ -1406,10 +1406,15 @@
 static void
 monitor_socketpair(int *pair)
 {
+#ifdef USE_PIPES
+       fatal( "%s: can't use PrivSep on this platform, no socketpair()",
+               __FUNCTION__ );
+#else
        if (socketpair(AF_UNIX, SOCK_STREAM, 0, pair) == -1)
                fatal("%s: socketpair", __FUNCTION__);
        FD_CLOSEONEXEC(pair[0]);
        FD_CLOSEONEXEC(pair[1]);
+#endif
 }


--> with that patch, plus "bugzilla #208", -current compiles fine 
on SCO 3.2v4.2 with skey and openssl 0.9.6c.

Limited testing of ssh+sshd with -1/-2 and passwort/rhostssrsa (-1 only
of course) suggests that everything is working nicely.  

With "useprivlegeseparation yes", it bombs when trying to create the 
socketpair() - as is to be expected:

  debug1: Local version string SSH-1.99-OpenSSH_3.1p1
  monitor_socketpair: can't use PrivSep on this platform, no socketpair()


Markus/Damien: has anything been achieved on getting the regression tests
into -portable?  That way my changes for AIX could be incorporated 
there... (I sent them already to the list, some weeks ago).

gert

-- 
USENET is *not* the non-clickable part of WWW!
                                                           //www.muc.de/~gert/
Gert Doering - Munich, Germany                             gert at greenie.muc.de
fax: +49-89-35655025                        gert.doering at physik.tu-muenchen.de