diff options
Diffstat (limited to 'openbsd-compat')
-rw-r--r-- | openbsd-compat/bsd-cray.c | 4 | ||||
-rw-r--r-- | openbsd-compat/bsd-cray.h | 6 | ||||
-rw-r--r-- | openbsd-compat/port-aix.c | 7 | ||||
-rw-r--r-- | openbsd-compat/port-aix.h | 3 |
4 files changed, 7 insertions, 13 deletions
diff --git a/openbsd-compat/bsd-cray.c b/openbsd-compat/bsd-cray.c index f630366be..d1f1c059c 100644 --- a/openbsd-compat/bsd-cray.c +++ b/openbsd-compat/bsd-cray.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * $Id: bsd-cray.c,v 1.13 2004/01/30 03:34:22 dtucker Exp $ | 2 | * $Id: bsd-cray.c,v 1.14 2005/02/02 06:10:11 dtucker Exp $ |
3 | * | 3 | * |
4 | * bsd-cray.c | 4 | * bsd-cray.c |
5 | * | 5 | * |
@@ -171,7 +171,7 @@ cray_access_denied(char *username) | |||
171 | * record_failed_login: generic "login failed" interface function | 171 | * record_failed_login: generic "login failed" interface function |
172 | */ | 172 | */ |
173 | void | 173 | void |
174 | record_failed_login(const char *user, const char *ttyname) | 174 | record_failed_login(const char *user, const char *hostname, const char *ttyname) |
175 | { | 175 | { |
176 | cray_login_failure((char *)user, IA_UDBERR); | 176 | cray_login_failure((char *)user, IA_UDBERR); |
177 | } | 177 | } |
diff --git a/openbsd-compat/bsd-cray.h b/openbsd-compat/bsd-cray.h index de6ba1a8d..774eceb5a 100644 --- a/openbsd-compat/bsd-cray.h +++ b/openbsd-compat/bsd-cray.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: bsd-cray.h,v 1.11 2004/01/30 03:34:22 dtucker Exp $ */ | 1 | /* $Id: bsd-cray.h,v 1.12 2005/02/02 06:10:11 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2002, Cray Inc. (Wendy Palm <wendyp@cray.com>) | 4 | * Copyright (c) 2002, Cray Inc. (Wendy Palm <wendyp@cray.com>) |
@@ -42,10 +42,10 @@ void cray_init_job(struct passwd *); | |||
42 | void cray_job_termination_handler(int); | 42 | void cray_job_termination_handler(int); |
43 | void cray_login_failure(char *, int ); | 43 | void cray_login_failure(char *, int ); |
44 | int cray_access_denied(char *); | 44 | int cray_access_denied(char *); |
45 | #define CUSTOM_FAILED_LOGIN 1 | ||
46 | void record_failed_login(const char *, const char *); | ||
47 | extern char cray_tmpdir[]; | 45 | extern char cray_tmpdir[]; |
48 | 46 | ||
47 | #define CUSTOM_FAILED_LOGIN 1 | ||
48 | |||
49 | #ifndef IA_SSHD | 49 | #ifndef IA_SSHD |
50 | # define IA_SSHD IA_LOGIN | 50 | # define IA_SSHD IA_LOGIN |
51 | #endif | 51 | #endif |
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c index e7eb179ec..79d180211 100644 --- a/openbsd-compat/port-aix.c +++ b/openbsd-compat/port-aix.c | |||
@@ -28,8 +28,6 @@ | |||
28 | #include "auth.h" | 28 | #include "auth.h" |
29 | #include "ssh.h" | 29 | #include "ssh.h" |
30 | #include "log.h" | 30 | #include "log.h" |
31 | #include "servconf.h" | ||
32 | #include "canohost.h" | ||
33 | #include "xmalloc.h" | 31 | #include "xmalloc.h" |
34 | #include "buffer.h" | 32 | #include "buffer.h" |
35 | 33 | ||
@@ -38,7 +36,6 @@ | |||
38 | #include <uinfo.h> | 36 | #include <uinfo.h> |
39 | #include "port-aix.h" | 37 | #include "port-aix.h" |
40 | 38 | ||
41 | extern ServerOptions options; | ||
42 | extern Buffer loginmsg; | 39 | extern Buffer loginmsg; |
43 | 40 | ||
44 | # ifdef HAVE_SETAUTHDB | 41 | # ifdef HAVE_SETAUTHDB |
@@ -280,10 +277,8 @@ sys_auth_record_login(const char *user, const char *host, const char *ttynm) | |||
280 | * record_failed_login: generic "login failed" interface function | 277 | * record_failed_login: generic "login failed" interface function |
281 | */ | 278 | */ |
282 | void | 279 | void |
283 | record_failed_login(const char *user, const char *ttyname) | 280 | record_failed_login(const char *user, const char *hostname, const char *ttyname) |
284 | { | 281 | { |
285 | char *hostname = (char *)get_canonical_hostname(options.use_dns); | ||
286 | |||
287 | if (geteuid() != 0) | 282 | if (geteuid() != 0) |
288 | return; | 283 | return; |
289 | 284 | ||
diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h index 29e9751ce..751139004 100644 --- a/openbsd-compat/port-aix.h +++ b/openbsd-compat/port-aix.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: port-aix.h,v 1.21 2004/08/14 14:09:12 dtucker Exp $ */ | 1 | /* $Id: port-aix.h,v 1.22 2005/02/02 06:10:11 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * | 4 | * |
@@ -68,7 +68,6 @@ int sys_auth_allowed_user(struct passwd *); | |||
68 | # define CUSTOM_SYS_AUTH_RECORD_LOGIN 1 | 68 | # define CUSTOM_SYS_AUTH_RECORD_LOGIN 1 |
69 | int sys_auth_record_login(const char *, const char *, const char *); | 69 | int sys_auth_record_login(const char *, const char *, const char *); |
70 | # define CUSTOM_FAILED_LOGIN 1 | 70 | # define CUSTOM_FAILED_LOGIN 1 |
71 | void record_failed_login(const char *, const char *); | ||
72 | #endif | 71 | #endif |
73 | 72 | ||
74 | void aix_setauthdb(const char *); | 73 | void aix_setauthdb(const char *); |