diff options
| author | Colin Watson <cjwatson@debian.org> | 2005-09-14 12:45:47 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2005-09-14 12:45:47 +0000 |
| commit | 9b71add4cecf753c45f5fbd6ff0913bc95b3e95d (patch) | |
| tree | d4ea8fdb30c7949c6433f5277c39548ea579d4dc /acconfig.h | |
| parent | ed07bcbea56007ab5b218ddf3aa6a7d4e21966e0 (diff) | |
| parent | 16704d57999d987fb8d9ba53379841a79f016d67 (diff) | |
Merge 4.2p1 to the trunk.
Diffstat (limited to 'acconfig.h')
| -rw-r--r-- | acconfig.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/acconfig.h b/acconfig.h index 5721f65fb..79b5e8191 100644 --- a/acconfig.h +++ b/acconfig.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: acconfig.h,v 1.181 2005/02/25 23:07:38 dtucker Exp $ */ | 1 | /* $Id: acconfig.h,v 1.183 2005/07/07 10:33:36 dtucker Exp $ */ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. | 4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. |
| @@ -119,9 +119,6 @@ | |||
| 119 | /* Define if you are on NeXT */ | 119 | /* Define if you are on NeXT */ |
| 120 | #undef HAVE_NEXT | 120 | #undef HAVE_NEXT |
| 121 | 121 | ||
| 122 | /* Define if you are on NEWS-OS */ | ||
| 123 | #undef HAVE_NEWS4 | ||
| 124 | |||
| 125 | /* Define if you want to enable PAM support */ | 122 | /* Define if you want to enable PAM support */ |
| 126 | #undef USE_PAM | 123 | #undef USE_PAM |
| 127 | 124 | ||
| @@ -205,9 +202,6 @@ | |||
| 205 | /* Define if you don't want to use lastlog in session.c */ | 202 | /* Define if you don't want to use lastlog in session.c */ |
| 206 | #undef NO_SSH_LASTLOG | 203 | #undef NO_SSH_LASTLOG |
| 207 | 204 | ||
| 208 | /* Define if have krb5_init_ets */ | ||
| 209 | #undef KRB5_INIT_ETS | ||
| 210 | |||
| 211 | /* Define if you don't want to use utmp */ | 205 | /* Define if you don't want to use utmp */ |
| 212 | #undef DISABLE_UTMP | 206 | #undef DISABLE_UTMP |
| 213 | 207 | ||