diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:32:03 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:32:03 +0000 |
commit | 04942aa41fa94ec6f2c3ce1d348f600f31bb7c78 (patch) | |
tree | af8e928bd79d3f2d0219bb5b2c78b573ec31d94c /openbsd-compat/port-aix.h | |
parent | 9ad7b718d42e43f3a285fcbc8f91193931fce324 (diff) | |
parent | 16704d57999d987fb8d9ba53379841a79f016d67 (diff) |
import openssh-4.2p1-gsskex-20050926-2.patch
Diffstat (limited to 'openbsd-compat/port-aix.h')
-rw-r--r-- | openbsd-compat/port-aix.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h index a05ce9703..37b2c12b0 100644 --- a/openbsd-compat/port-aix.h +++ b/openbsd-compat/port-aix.h | |||
@@ -1,8 +1,9 @@ | |||
1 | /* $Id: port-aix.h,v 1.24 2005/02/16 11:49:31 dtucker Exp $ */ | 1 | /* $Id: port-aix.h,v 1.26 2005/05/28 10:28:40 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * | 4 | * |
5 | * Copyright (c) 2001 Gert Doering. All rights reserved. | 5 | * Copyright (c) 2001 Gert Doering. All rights reserved. |
6 | * Copyright (c) 2004, 2005 Darren Tucker. All rights reserved. | ||
6 | * | 7 | * |
7 | * Redistribution and use in source and binary forms, with or without | 8 | * Redistribution and use in source and binary forms, with or without |
8 | * modification, are permitted provided that the following conditions | 9 | * modification, are permitted provided that the following conditions |
@@ -47,21 +48,23 @@ | |||
47 | 48 | ||
48 | /* These should be in the system headers but are not. */ | 49 | /* These should be in the system headers but are not. */ |
49 | int usrinfo(int, char *, int); | 50 | int usrinfo(int, char *, int); |
51 | #if defined(HAVE_DECL_SETAUTHDB) && (HAVE_DECL_SETAUTHDB == 0) | ||
50 | int setauthdb(const char *, char *); | 52 | int setauthdb(const char *, char *); |
53 | #endif | ||
51 | /* these may or may not be in the headers depending on the version */ | 54 | /* these may or may not be in the headers depending on the version */ |
52 | #if (HAVE_DECL_AUTHENTICATE == 0) | 55 | #if defined(HAVE_DECL_AUTHENTICATE) && (HAVE_DECL_AUTHENTICATE == 0) |
53 | int authenticate(char *, char *, int *, char **); | 56 | int authenticate(char *, char *, int *, char **); |
54 | #endif | 57 | #endif |
55 | #if (HAVE_DECL_LOGINFAILED == 0) | 58 | #if defined(HAVE_DECL_LOGINFAILED) && (HAVE_DECL_LOGINFAILED == 0) |
56 | int loginfailed(char *, char *, char *); | 59 | int loginfailed(char *, char *, char *); |
57 | #endif | 60 | #endif |
58 | #if (HAVE_DECL_LOGINRESTRICTIONS == 0) | 61 | #if defined(HAVE_DECL_LOGINRESTRICTIONS) && (HAVE_DECL_LOGINRESTRICTIONS == 0) |
59 | int loginrestrictions(char *, int, char *, char **); | 62 | int loginrestrictions(char *, int, char *, char **); |
60 | #endif | 63 | #endif |
61 | #if (HAVE_DECL_LOGINSUCCESS == 0) | 64 | #if defined(HAVE_DECL_LOGINSUCCESS) && (HAVE_DECL_LOGINSUCCESS == 0) |
62 | int loginsuccess(char *, char *, char *, char **); | 65 | int loginsuccess(char *, char *, char *, char **); |
63 | #endif | 66 | #endif |
64 | #if (HAVE_DECL_PASSWDEXPIRED == 0) | 67 | #if defined(HAVE_DECL_PASSWDEXPIRED) && (HAVE_DECL_PASSWDEXPIRED == 0) |
65 | int passwdexpired(char *, char **); | 68 | int passwdexpired(char *, char **); |
66 | #endif | 69 | #endif |
67 | 70 | ||