| auth-passwd.c (126277) | auth-passwd.c (128460) |
|---|---|
| 1/* 2 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * All rights reserved 5 * Password authentication. This file contains the functions to check whether 6 * the password is valid for the user. 7 * 8 * As far as I am concerned, the code I have written for this software --- 23 unchanged lines hidden (view full) --- 32 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 33 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 34 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 35 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 36 */ 37 38#include "includes.h" 39RCSID("$OpenBSD: auth-passwd.c,v 1.31 2004/01/30 09:48:57 markus Exp $"); | 1/* 2 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * All rights reserved 5 * Password authentication. This file contains the functions to check whether 6 * the password is valid for the user. 7 * 8 * As far as I am concerned, the code I have written for this software --- 23 unchanged lines hidden (view full) --- 32 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 33 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 34 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 35 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 36 */ 37 38#include "includes.h" 39RCSID("$OpenBSD: auth-passwd.c,v 1.31 2004/01/30 09:48:57 markus Exp $"); |
| 40RCSID("$FreeBSD: head/crypto/openssh/auth-passwd.c 126277 2004-02-26 10:52:33Z des $"); | 40RCSID("$FreeBSD: head/crypto/openssh/auth-passwd.c 128460 2004-04-20 09:46:41Z des $"); |
| 41 42#include "packet.h" 43#include "log.h" 44#include "servconf.h" 45#include "auth.h" 46#include "auth-options.h" 47 48extern ServerOptions options; --- 20 unchanged lines hidden (view full) --- 69 70#ifndef HAVE_CYGWIN 71 if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES) 72 ok = 0; 73#endif 74 if (*password == '\0' && options.permit_empty_passwd == 0) 75 return 0; 76 | 41 42#include "packet.h" 43#include "log.h" 44#include "servconf.h" 45#include "auth.h" 46#include "auth-options.h" 47 48extern ServerOptions options; --- 20 unchanged lines hidden (view full) --- 69 70#ifndef HAVE_CYGWIN 71 if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES) 72 ok = 0; 73#endif 74 if (*password == '\0' && options.permit_empty_passwd == 0) 75 return 0; 76 |
| 77#if defined(HAVE_OSF_SIA) 78 /* 79 * XXX: any reason this is before krb? could be moved to 80 * sys_auth_passwd()? -dt 81 */ 82 return auth_sia_password(authctxt, password) && ok; 83#endif | |
| 84#ifdef KRB5 85 if (options.kerberos_authentication == 1) { 86 int ret = auth_krb5_password(authctxt, password); 87 if (ret == 1 || ret == 0) 88 return ret && ok; 89 /* Fall back to ordinary passwd authentication. */ 90 } 91#endif --- 66 unchanged lines hidden --- | 77#ifdef KRB5 78 if (options.kerberos_authentication == 1) { 79 int ret = auth_krb5_password(authctxt, password); 80 if (ret == 1 || ret == 0) 81 return ret && ok; 82 /* Fall back to ordinary passwd authentication. */ 83 } 84#endif --- 66 unchanged lines hidden --- |