- (dtucker) [auth-passwd.c auth1.c auth2-kbdint.c auth2-none.c auth2-passwd.c

   auth2-pubkey.c session.c openbsd-compat/bsd-cygwin_util.{c,h}
   openbsd-compat/daemon.c] Remove support for Windows 95/98/ME and very old
   version of Cygwin.  Patch from vinschen at redhat com.

1 files changed, 0 insertions, 124 deletions

diff --git a/openbsd-compat/bsd-cygwin_util.c b/openbsd-compat/bsd-cygwin_util.c
index 38be7e350..e90c1597f 100644
--- a/openbsd-compat/bsd-cygwin_util.c
+++ b/openbsd-compat/bsd-cygwin_util.c
@@ -39,9 +39,6 @@
 #endif
 
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/utsname.h>
-#include <sys/vfs.h>
 
 #include <fcntl.h>
 #include <stdlib.h>
@@ -49,11 +46,6 @@
 #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"))
 
 int 
 binary_open(const char *filename, int flags, ...)
@@ -79,128 +71,12 @@ binary_pipe(int fd[2])
         return (ret);
 }
 
-#define HAS_CREATE_TOKEN 1
-#define HAS_NTSEC_BY_DEFAULT 2
-#define HAS_CREATE_TOKEN_WO_NTSEC 3
-
-static int 
-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
-         * specific capabilities of Cygwin can be evaluated from that.
-         * This simplifies the calling functions which only have to ask
-         * for a capability using has_capability() instead of having
-         * to figure that out by themselves.
-         */
-        if (!inited) {
-                struct utsname uts;
-                
-                if (!uname(&uts)) {
-                        int major_high = 0, major_low = 0, minor = 0;
-                        int api_major_version = 0, api_minor_version = 0;
-                        char *c;
-
-                        sscanf(uts.release, "%d.%d.%d", &major_high,
-                            &major_low, &minor);
-                        if ((c = strchr(uts.release, '(')) != NULL) {
-                                sscanf(c + 1, "%d.%d", &api_major_version,
-                                    &api_minor_version);
-                        }
-                        if (major_high > 1 ||
-                            (major_high == 1 && (major_low > 3 ||
-                            (major_low == 3 && minor >= 2))))
-                                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;
-                }
-        }
-        switch (what) {
-        case HAS_CREATE_TOKEN:
-                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);
-}
-
-int
-check_nt_auth(int pwd_authenticated, struct passwd *pw)
-{
-        /*
-        * The only authentication which is able to change the user
-        * context on NT systems is the password authentication. So
-        * we deny all requsts for changing the user context if another
-        * authentication method is used.
-        *
-        * This doesn't apply to Cygwin versions >= 1.3.2 anymore which
-        * uses the undocumented NtCreateToken() call to create a user
-        * token if the process has the appropriate privileges and if
-        * CYGWIN ntsec setting is on.
-        */
-        static int has_create_token = -1;
-
-        if (pw == NULL)
-                return 0;
-        if (is_winnt) {
-                if (has_create_token < 0) {
-                        char *cygwin = getenv("CYGWIN");
-
-                        has_create_token = 0;
-                        if (has_capability(HAS_CREATE_TOKEN) &&
-                            (ntsec_on(cygwin) ||
-                            (has_capability(HAS_NTSEC_BY_DEFAULT) &&
-                             !ntsec_off(cygwin)) ||
-                             has_capability(HAS_CREATE_TOKEN_WO_NTSEC)))
-                                has_create_token = 1;
-                }
-                if (has_create_token < 1 &&
-                    !pwd_authenticated && geteuid() != pw->pw_uid)
-                        return (0);
-        }
-        return (1);
-}
-
 int
 check_ntsec(const char *filename)
 {
         return (pathconf(filename, _PC_POSIX_PERMISSIONS));
 }
 
-void
-register_9x_service(void)
-{
-        HINSTANCE kerneldll;
-        DWORD (*RegisterServiceProcess)(DWORD, DWORD);
-
-        /* The service register mechanism in 9x/Me is pretty different from
-         * NT/2K/XP.  In NT/2K/XP we're using a special service starter
-         * application to register and control sshd as service.  This method
-         * doesn't play nicely with 9x/Me.  For that reason we register here
-         * as service when running under 9x/Me.  This function is only called
-         * by the child sshd when it's going to daemonize.
-         */
-        if (is_winnt)
-                return;
-        if (!(kerneldll = LoadLibrary("KERNEL32.DLL")))
-                return;
-        if (!(RegisterServiceProcess = (DWORD (*)(DWORD, DWORD))
-                GetProcAddress(kerneldll, "RegisterServiceProcess")))
-                return;
-        RegisterServiceProcess(0, 1);
-}
-
 #define NL(x) x, (sizeof (x) - 1)
 #define WENV_SIZ (sizeof (wenv_arr) / sizeof (wenv_arr[0]))