OpenSSH 2.5.0p1

[Corinna Vinschen]

On Fri, Feb 16, 2001 at 03:12:08PM -0600, mouring at etoh.eviladmin.org wrote:
> On Fri, 16 Feb 2001 mouring at etoh.eviladmin.org wrote:
> > Known issues:
> > 
> > 1) Linux 'sleep 20'   -- Unfixable before 2.5.0 (known work around)
> > 2) HP/UX signal issue -- Patched and HP/UX 11 works in v2
> > 3) SCO 2/ Native Compiler -- Unfixable before 2.5.0 (known work around)
> > 4) NeXTStep -- Resynced, MAX_GROUPS vs NGROUPS unresolved (not major)
> > 5) DG/UX regcomp/regexec -- Fixed.
> > 6) Cray signal issues -- ???
> > 7) Solaris '$PATH' issue -- ?? (Unfixable before 2.5.0?)  [I'm getting
> > more reports of this.  I'll present them when they get their facts
> > together]
> > 
> > I guess what needs to be asked... Is what needs to OCCUR in the next 3
> > to 4 days to assure we have a stable project on majority of the platforms?
> > 
> > - Ben
> > 
> > 
> 
> Ermm.. Oops.. forgot two.
> 
> 8) BSDi updates  -- ?? post 2.5.0 ??
> 9) AIX, 'login.h' and -I -- ?? Hmm...

Just got the latest from CVS. Damien has made a change to the
openbsd-compat/bsd-cygwin_util.c file which broke the Cygwin build.
You must not include bsd-cygwin_util.h in bsd-cygwin_util.c
because of the dangerous redefinitions of open and pipe.

Unfortunately bsd-cygwin_util.c now includes includes.h which
in turn includes bsd-cygwin_util.h.

I have changed bsd-cygwin_util.[ch] so that an additional define
is used to control including the affected defines.

By the way I have corrected the definition of `binary_open' to
conform to the declaration in the header.

Patch attached.

However, I have only tested to be able to build and a call to
scp. More testing will follow tomorrow.

Corinna

-- 
Corinna Vinschen
Cygwin Developer
Red Hat, Inc.
mailto:vinschen at redhat.com
-------------- next part --------------
Index: bsd-cygwin_util.c
===================================================================
RCS file: /cvs/openssh_cvs/openbsd-compat/bsd-cygwin_util.c,v
retrieving revision 1.2
diff -u -p -r1.2 bsd-cygwin_util.c
--- bsd-cygwin_util.c	2001/02/09 01:55:36	1.2
+++ bsd-cygwin_util.c	2001/02/16 23:50:21
@@ -13,8 +13,12 @@
  * binary mode on Windows systems.
  */
 
+#define INSIDE_BSD_CYGWIN_UTIL
+
 #include "includes.h"
 
+#undef INSIDE_BSD_CYGWIN_UTIL
+
 RCSID("$Id: bsd-cygwin_util.c,v 1.2 2001/02/09 01:55:36 djm Exp $");
 
 #ifdef HAVE_CYGWIN
@@ -24,10 +28,17 @@ RCSID("$Id: bsd-cygwin_util.c,v 1.2 2001
 #include <stdlib.h>
 #include <sys/vfs.h>
 #include <windows.h>
+#include <stdarg.h>
 #define is_winnt       (GetVersion() < 0x80000000)
 
-int binary_open(const char *filename, int flags, mode_t mode)
+int binary_open(const char *filename, int flags, ...)
 {
+	va_list ap;
+	mode_t mode;
+	
+	va_start(ap, flags);
+	mode = va_arg(ap, mode_t);
+	va_end(ap);
 	return open(filename, flags | O_BINARY, mode);
 }
 
Index: bsd-cygwin_util.h
===================================================================
RCS file: /cvs/openssh_cvs/openbsd-compat/bsd-cygwin_util.h,v
retrieving revision 1.2
diff -u -p -r1.2 bsd-cygwin_util.h
--- bsd-cygwin_util.h	2001/02/09 01:55:36	1.2
+++ bsd-cygwin_util.h	2001/02/16 23:50:21
@@ -24,7 +24,9 @@ int binary_pipe(int fd[2]);
 int check_nt_auth(int pwd_authenticated, uid_t uid);
 int check_ntsec(const char *filename);
 
+#ifndef INSIDE_BSD_CYGWIN_UTIL
 #define open binary_open
 #define pipe binary_pipe
+#endif /* INSIDE_BSD_CYGWIN_UTIL */
 
 #endif /* HAVE_CYGWIN */