diff options
| author | Tim Rice <tim@multitalents.net> | 2009-01-07 10:04:12 -0800 |
|---|---|---|
| committer | Tim Rice <tim@multitalents.net> | 2009-01-07 10:04:12 -0800 |
| commit | 351529ce3089bbfdc65488961016153c4e8fee03 (patch) | |
| tree | 7ea60bd373f712aebdac76fe3d8ca00c55b7a166 /openbsd-compat | |
| parent | 7ebfad789f4e739cf5269860722cd44aab2929fb (diff) | |
| download | openssh-git-351529ce3089bbfdc65488961016153c4e8fee03.tar.gz | |
- (tim) [configure.ac defines.h openbsd-compat/port-uw.c
openbsd-compat/xcrypt.c] Add SECUREWARE support to OpenServer 6 SVR5 ABI.
OK djm@ dtucker@
Diffstat (limited to 'openbsd-compat')
| -rw-r--r-- | openbsd-compat/port-uw.c | 4 | ||||
| -rw-r--r-- | openbsd-compat/xcrypt.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/openbsd-compat/port-uw.c b/openbsd-compat/port-uw.c index ebc229a6..be9905a6 100644 --- a/openbsd-compat/port-uw.c +++ b/openbsd-compat/port-uw.c @@ -25,7 +25,7 @@ #include "includes.h" -#ifdef HAVE_LIBIAF +#if defined(HAVE_LIBIAF) && !defined(HAVE_SECUREWARE) #include <sys/types.h> #ifdef HAVE_CRYPT_H # include <crypt.h> @@ -145,5 +145,5 @@ get_iaf_password(struct passwd *pw) fatal("ia_openinfo: Unable to open the shadow passwd file"); } #endif /* USE_LIBIAF */ -#endif /* HAVE_LIBIAF */ +#endif /* HAVE_LIBIAF and not HAVE_SECUREWARE */ diff --git a/openbsd-compat/xcrypt.c b/openbsd-compat/xcrypt.c index d8636bb3..6291e288 100644 --- a/openbsd-compat/xcrypt.c +++ b/openbsd-compat/xcrypt.c @@ -28,7 +28,7 @@ #include <unistd.h> #include <pwd.h> -# ifdef HAVE_CRYPT_H +# if defined(HAVE_CRYPT_H) && !defined(HAVE_SECUREWARE) # include <crypt.h> # endif |