From 3393c5c36eec663fcd3aa867f84fd050233342c8 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sun, 7 Sep 2003 09:43:42 +1000 Subject: - (dtucker) openbsd-compat/xcrypt.c] #elsif -> #elif --- ChangeLog | 3 ++- openbsd-compat/xcrypt.c | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef5b1715f..56a1c4b06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ - (dtucker) [regress/sftp-batch.sh] Make temporary batch file name more distinctive, so "rm ${BATCH}.*" doesn't match the script itself. - (dtucker) [regress/sftp-cmds.sh] Skip quoted file test on Cygwin. + - (dtucker) openbsd-compat/xcrypt.c] #elsif -> #elif 20030906 - (dtucker) [acconfig.h configure.ac uidswap.c] Prefer setuid/setgid on AIX. @@ -1033,4 +1034,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.2966 2003/09/06 23:32:58 dtucker Exp $ +$Id: ChangeLog,v 1.2967 2003/09/06 23:43:42 dtucker Exp $ diff --git a/openbsd-compat/xcrypt.c b/openbsd-compat/xcrypt.c index 882185718..5b5d69c72 100644 --- a/openbsd-compat/xcrypt.c +++ b/openbsd-compat/xcrypt.c @@ -65,12 +65,12 @@ xcrypt(const char *password, const char *salt) crypted = md5_crypt(password, salt); else crypted = crypt(password, salt); -# elsif defined(__hpux) && !defined(HAVE_SECUREWARE) +# elif defined(__hpux) && !defined(HAVE_SECUREWARE) if (iscomsec()) crypted = bigcrypt(password, salt); else crypted = crypt(password, salt); -# elsif defined(HAVE_SECUREWARE) +# elif defined(HAVE_SECUREWARE) crypted = bigcrypt(password, salt); # else crypted = crypt(password, salt); @@ -99,12 +99,12 @@ shadow_pw(struct passwd *pw) struct passwd_adjunct *spw; if (issecure() && (spw = getpwanam(pw->pw_name)) != NULL) pw_password = spw->pwa_passwd; -# elsif defined(HAVE_SECUREWARE) +# elif defined(HAVE_SECUREWARE) struct pr_passwd *spw = getprpwnam(pw->pw_name); if (spw != NULL) pw_password = spw->ufld.fd_encrypt; -# elsif defined(__hpux) && !defined(HAVE_SECUREWARE) +# elif defined(__hpux) && !defined(HAVE_SECUREWARE) struct pr_passwd *spw; if (iscomsec() && (spw = getprpwnam(pw->pw_name)) != NULL) pw_password = spw->ufld.fd_encrypt; -- cgit v1.2.3