tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) openbsd-compat/xcrypt.c] #elsif -> #elif

This commit is contained in:
Darren Tucker 2003-09-07 09:43:42 +10:00
parent e7f7580cab
commit 3393c5c36e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -6,6 +6,7 @@
- (dtucker) [regress/sftp-batch.sh] Make temporary batch file name more - (dtucker) [regress/sftp-batch.sh] Make temporary batch file name more
distinctive, so "rm ${BATCH}.*" doesn't match the script itself. distinctive, so "rm ${BATCH}.*" doesn't match the script itself.
- (dtucker) [regress/sftp-cmds.sh] Skip quoted file test on Cygwin. - (dtucker) [regress/sftp-cmds.sh] Skip quoted file test on Cygwin.
- (dtucker) openbsd-compat/xcrypt.c] #elsif -> #elif
20030906 20030906
- (dtucker) [acconfig.h configure.ac uidswap.c] Prefer setuid/setgid on AIX. - (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. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au 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 $

8
openbsd-compat/xcrypt.c
View File

@ -65,12 +65,12 @@ xcrypt(const char *password, const char *salt)
crypted = md5_crypt(password, salt); crypted = md5_crypt(password, salt);
else else
crypted = crypt(password, salt); crypted = crypt(password, salt);
# elsif defined(__hpux) && !defined(HAVE_SECUREWARE) # elif defined(__hpux) && !defined(HAVE_SECUREWARE)
if (iscomsec()) if (iscomsec())
crypted = bigcrypt(password, salt); crypted = bigcrypt(password, salt);
else else
crypted = crypt(password, salt); crypted = crypt(password, salt);
# elsif defined(HAVE_SECUREWARE) # elif defined(HAVE_SECUREWARE)
crypted = bigcrypt(password, salt); crypted = bigcrypt(password, salt);
# else # else
crypted = crypt(password, salt); crypted = crypt(password, salt);
@ -99,12 +99,12 @@ shadow_pw(struct passwd *pw)
struct passwd_adjunct *spw; struct passwd_adjunct *spw;
if (issecure() && (spw = getpwanam(pw->pw_name)) != NULL) if (issecure() && (spw = getpwanam(pw->pw_name)) != NULL)
pw_password = spw->pwa_passwd; pw_password = spw->pwa_passwd;
# elsif defined(HAVE_SECUREWARE) # elif defined(HAVE_SECUREWARE)
struct pr_passwd *spw = getprpwnam(pw->pw_name); struct pr_passwd *spw = getprpwnam(pw->pw_name);
if (spw != NULL) if (spw != NULL)
pw_password = spw->ufld.fd_encrypt; pw_password = spw->ufld.fd_encrypt;
# elsif defined(__hpux) && !defined(HAVE_SECUREWARE) # elif defined(__hpux) && !defined(HAVE_SECUREWARE)
struct pr_passwd *spw; struct pr_passwd *spw;
if (iscomsec() && (spw = getprpwnam(pw->pw_name)) != NULL) if (iscomsec() && (spw = getprpwnam(pw->pw_name)) != NULL)
pw_password = spw->ufld.fd_encrypt; pw_password = spw->ufld.fd_encrypt;