gssapi_set_implicit_username() is now gssapi_set_username()

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

diff --git a/openssh/openbsd-compat/bsd-cygwin_util.c b/openssh/openbsd-compat/bsd-cygwin_util.c
index 6f4f3169f435454bb94f63e15e9790b835f27f2a..f5133319650c6e85ba264b6dd9d8337509618408 100644 (file)
--- a/openssh/openbsd-compat/bsd-cygwin_util.c
+++ b/openssh/openbsd-compat/bsd-cygwin_util.c
@@ -1,27 +1,11 @@
 /*
- * cygwin_util.c
  *
- * Copyright (c) 2000, 2001, Corinna Vinschen <vinschen@cygnus.com>
+ * cygwin_util.c
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ * Author: Corinna Vinschen <vinschen@cygnus.com>
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) 2000 Corinna Vinschen <vinschen@cygnus.com>, Duisburg, Germany
+ *                    All rights reserved
  *
  * Created: Sat Sep 02 12:17:00 2000 cv
  *
@@ -74,7 +58,7 @@ int binary_pipe(int fd[2])
        return ret;
 }
 
-int check_nt_auth(int pwd_authenticated, struct passwd *pw)
+int check_nt_auth(int pwd_authenticated, uid_t uid)
 {
        /*
        * The only authentication which is able to change the user
@@ -89,8 +73,6 @@ int check_nt_auth(int pwd_authenticated, struct passwd *pw)
        */
        static int has_create_token = -1;
 
-       if (pw == NULL)
-               return 0;
        if (is_winnt) {
                if (has_create_token < 0) {
                        struct utsname uts;
@@ -108,7 +90,7 @@ int check_nt_auth(int pwd_authenticated, struct passwd *pw)
                        }
                }
                if (has_create_token < 1 &&
-                   !pwd_authenticated && geteuid() != pw->pw_uid)
+                   !pwd_authenticated && geteuid() != uid)
                        return 0;
        }
        return 1;
@@ -157,26 +139,4 @@ int check_ntsec(const char *filename)
        return 0;
 }
 
-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);
-}
-
 #endif /* HAVE_CYGWIN */