- (djm) [openbsd-compat/rresvport.c] Add unistd.h for missing close()

[openssh.git] / openbsd-compat / bsd-cygwin_util.c

diff --git a/openbsd-compat/bsd-cygwin_util.c b/openbsd-compat/bsd-cygwin_util.c
index 34eef3740d9e02c4188d432a5362d24008fc1b78..dbf8176b6225f12beb576f1c6feeebd72137447c 100644 (file)
--- a/openbsd-compat/bsd-cygwin_util.c
+++ b/openbsd-compat/bsd-cygwin_util.c
@@ -1,6 +1,4 @@
 /*
- * cygwin_util.c
- *
  * Copyright (c) 2000, 2001, Corinna Vinschen <vinschen@cygnus.com>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,28 +29,32 @@
 
 #include "includes.h"
 
-RCSID("$Id$");
-
 #ifdef HAVE_CYGWIN
 
-#include <fcntl.h>
-#include <stdlib.h>
+#if defined(open) && open == binary_open
+# undef open
+#endif
+#if defined(pipe) && open == binary_pipe
+# undef pipe
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/utsname.h>
 #include <sys/vfs.h>
+
+#include <fcntl.h>
+#include <stdlib.h>
+#include <unistd.h>
 #include <windows.h>
+
+#include "xmalloc.h"
 #define is_winnt       (GetVersion() < 0x80000000)
 
 #define ntsec_on(c)    ((c) && strstr((c),"ntsec") && !strstr((c),"nontsec"))
 #define ntsec_off(c)   ((c) && strstr((c),"nontsec"))
 #define ntea_on(c)     ((c) && strstr((c),"ntea") && !strstr((c),"nontea"))
 
-#if defined(open) && open == binary_open
-# undef open
-#endif
-#if defined(pipe) && open == binary_pipe
-# undef pipe
-#endif
-
 int 
 binary_open(const char *filename, int flags, ...)
 {
@@ -79,6 +81,7 @@ binary_pipe(int fd[2])
 
 #define HAS_CREATE_TOKEN 1
 #define HAS_NTSEC_BY_DEFAULT 2
+#define HAS_CREATE_TOKEN_WO_NTSEC 3
 
 static int 
 has_capability(int what)
@@ -86,6 +89,7 @@ has_capability(int what)
        static int inited;
        static int has_create_token;
        static int has_ntsec_by_default;
+       static int has_create_token_wo_ntsec;
 
        /* 
         * has_capability() basically calls uname() and checks if
@@ -96,7 +100,6 @@ has_capability(int what)
         */
        if (!inited) {
                struct utsname uts;
-               char *c;
                
                if (!uname(&uts)) {
                        int major_high = 0, major_low = 0, minor = 0;
@@ -115,6 +118,9 @@ has_capability(int what)
                                has_create_token = 1;
                        if (api_major_version > 0 || api_minor_version >= 56)
                                has_ntsec_by_default = 1;
+                       if (major_high > 1 ||
+                           (major_high == 1 && major_low >= 5))
+                               has_create_token_wo_ntsec = 1;
                        inited = 1;
                }
        }
@@ -123,6 +129,8 @@ has_capability(int what)
                return (has_create_token);
        case HAS_NTSEC_BY_DEFAULT:
                return (has_ntsec_by_default);
+       case HAS_CREATE_TOKEN_WO_NTSEC:
+               return (has_create_token_wo_ntsec);
        }
        return (0);
 }
@@ -153,7 +161,8 @@ check_nt_auth(int pwd_authenticated, struct passwd *pw)
                        if (has_capability(HAS_CREATE_TOKEN) &&
                            (ntsec_on(cygwin) ||
                            (has_capability(HAS_NTSEC_BY_DEFAULT) &&
-                           !ntsec_off(cygwin))))
+                            !ntsec_off(cygwin)) ||
+                            has_capability(HAS_CREATE_TOKEN_WO_NTSEC)))
                                has_create_token = 1;
                }
                if (has_create_token < 1 &&
@@ -230,4 +239,55 @@ register_9x_service(void)
        RegisterServiceProcess(0, 1);
 }
 
+#define NL(x) x, (sizeof (x) - 1)
+#define WENV_SIZ (sizeof (wenv_arr) / sizeof (wenv_arr[0]))
+
+static struct wenv {
+       const char *name;
+       size_t namelen;
+} wenv_arr[] = {
+       { NL("ALLUSERSPROFILE=") },
+       { NL("COMMONPROGRAMFILES=") },
+       { NL("COMPUTERNAME=") },
+       { NL("COMSPEC=") },
+       { NL("CYGWIN=") },
+       { NL("NUMBER_OF_PROCESSORS=") },
+       { NL("OS=") },
+       { NL("PATH=") },
+       { NL("PATHEXT=") },
+       { NL("PROCESSOR_ARCHITECTURE=") },
+       { NL("PROCESSOR_IDENTIFIER=") },
+       { NL("PROCESSOR_LEVEL=") },
+       { NL("PROCESSOR_REVISION=") },
+       { NL("PROGRAMFILES=") },
+       { NL("SYSTEMDRIVE=") },
+       { NL("SYSTEMROOT=") },
+       { NL("TMP=") },
+       { NL("TEMP=") },
+       { NL("WINDIR=") }
+};
+
+char **
+fetch_windows_environment(void)
+{
+       char **e, **p;
+       unsigned int i, idx = 0;
+
+       p = xcalloc(WENV_SIZ + 1, sizeof(char *));
+       for (e = environ; *e != NULL; ++e) {
+               for (i = 0; i < WENV_SIZ; ++i) {
+                       if (!strncmp(*e, wenv_arr[i].name, wenv_arr[i].namelen))
+                               p[idx++] = *e;
+               }
+       }
+       p[idx] = NULL;
+       return p;
+}
+
+void
+free_windows_environment(char **p)
+{
+       xfree(p);
+}
+
 #endif /* HAVE_CYGWIN */