src/usr.bin/ssh/auth-passwd.c - diff

Return to auth-passwd.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/auth-passwd.c between version 1.15 and 1.15.2.4

-version 1.15, 2000/04/14 10:30:29
+version 1.15.2.4, 2001/03/21 18:52:33
 Line 2
 Line 2
 Line 2
   * Author: Tatu Ylonen <ylo@cs.hut.fi>
   * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
   *                    All rights reserved
-  * Created: Sat Mar 18 05:11:38 1995 ylo
   * Password authentication.  This file contains the functions to check whether
   * the password is valid for the user.
+  *
+  * As far as I am concerned, the code I have written for this software
+  * can be used freely for any purpose.  Any derived versions of this
+  * software must be clearly marked as such, and if the derived work is
+  * incompatible with the protocol description in the RFC file, it must be
+  * called by a name other than "ssh" or "Secure Shell".
+  *
+  * Copyright (c) 1999 Dug Song.  All rights reserved.
+  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
+  *
+  * 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.
+  *
+  * 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.
   */
  #include "includes.h"
- RCSID("$Id$");
+ RCSID("$OpenBSD$");
  #include "packet.h"
- #include "ssh.h"
- #include "servconf.h"
  #include "xmalloc.h"
+ #include "log.h"
+ #include "servconf.h"
+ #include "auth.h"
  /*
   * Tries to authenticate the user using password.  Returns true if
-Line 28
+Line 57
 Line 28
 Line 57
          /* deny if no user. */
          if (pw == NULL)
                  return 0;
-         if (pw->pw_uid == 0 && options.permit_root_login == 2)
+         if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES)
                  return 0;
          if (*password == '\0' && options.permit_empty_passwd == 0)
                  return 0;
- #ifdef SKEY
-         if (options.skey_authentication == 1) {
-                 int ret = auth_skey_password(pw, password);
-                 if (ret == 1 || ret == 0)
-                         return ret;
-                 /* Fall back to ordinary passwd authentication. */
-         }
- #endif
  #ifdef KRB4
          if (options.kerberos_authentication == 1) {
                  int ret = auth_krb4_password(pw, password);