diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | auth2.c | 3 |
2 files changed, 5 insertions, 3 deletions
@@ -27,6 +27,9 @@ | |||
27 | Also fix a typo. | 27 | Also fix a typo. |
28 | Initial diff from Matthew Dempsky, input from djm. | 28 | Initial diff from Matthew Dempsky, input from djm. |
29 | OK djm, markus. | 29 | OK djm, markus. |
30 | - dtucker@cvs.openbsd.org 2007/09/29 00:25:51 | ||
31 | [auth2.c] | ||
32 | Remove unused prototype. ok djm@ | ||
30 | 33 | ||
31 | 20070927 | 34 | 20070927 |
32 | - (dtucker) [configure.ac atomicio.c] Fall back to including <sys/poll.h> if | 35 | - (dtucker) [configure.ac atomicio.c] Fall back to including <sys/poll.h> if |
@@ -3298,4 +3301,4 @@ | |||
3298 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3301 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3299 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3302 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3300 | 3303 | ||
3301 | $Id: ChangeLog,v 1.4765 2007/10/26 04:25:55 djm Exp $ | 3304 | $Id: ChangeLog,v 1.4766 2007/10/26 04:26:15 djm Exp $ |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2.c,v 1.115 2007/04/14 22:01:58 stevesk Exp $ */ | 1 | /* $OpenBSD: auth2.c,v 1.116 2007/09/29 00:25:51 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -87,7 +87,6 @@ static void input_userauth_request(int, u_int32_t, void *); | |||
87 | /* helper */ | 87 | /* helper */ |
88 | static Authmethod *authmethod_lookup(const char *); | 88 | static Authmethod *authmethod_lookup(const char *); |
89 | static char *authmethods_get(void); | 89 | static char *authmethods_get(void); |
90 | int user_key_allowed(struct passwd *, Key *); | ||
91 | 90 | ||
92 | /* | 91 | /* |
93 | * loop until authctxt->success == TRUE | 92 | * loop until authctxt->success == TRUE |