diff options
| author | Colin Watson <cjwatson@debian.org> | 2004-05-01 11:41:25 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2004-05-01 11:41:25 +0000 |
| commit | 915bfea2af69a3bb352a9b4e98e3434b8425124d (patch) | |
| tree | ef732498a75f2e13a7a9827edc833dc58bc2a2af /openbsd-compat/xcrypt.c | |
| parent | 89e7a2dfe6044f3980098911a7470d401ff70eb1 (diff) | |
| parent | 16f1d21ea191deaaeeba719d01c0ad82aa044653 (diff) | |
Merge 3.8.1p1 to the trunk, minus RFC.nroff (#211640).
Diffstat (limited to 'openbsd-compat/xcrypt.c')
| -rw-r--r-- | openbsd-compat/xcrypt.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/openbsd-compat/xcrypt.c b/openbsd-compat/xcrypt.c index a0fe6c620..c3cea3c86 100644 --- a/openbsd-compat/xcrypt.c +++ b/openbsd-compat/xcrypt.c | |||
| @@ -24,8 +24,6 @@ | |||
| 24 | 24 | ||
| 25 | #include "includes.h" | 25 | #include "includes.h" |
| 26 | 26 | ||
| 27 | #if !defined(HAVE_OSF_SIA) | ||
| 28 | |||
| 29 | # ifdef HAVE_CRYPT_H | 27 | # ifdef HAVE_CRYPT_H |
| 30 | # include <crypt.h> | 28 | # include <crypt.h> |
| 31 | # endif | 29 | # endif |
| @@ -108,5 +106,3 @@ shadow_pw(struct passwd *pw) | |||
| 108 | 106 | ||
| 109 | return pw_password; | 107 | return pw_password; |
| 110 | } | 108 | } |
| 111 | |||
| 112 | #endif /* !defined(HAVE_OSF_SIA) */ | ||