summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--openbsd-compat/xcrypt.c8
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 @@
6 - (dtucker) [regress/sftp-batch.sh] Make temporary batch file name more 6 - (dtucker) [regress/sftp-batch.sh] Make temporary batch file name more
7 distinctive, so "rm ${BATCH}.*" doesn't match the script itself. 7 distinctive, so "rm ${BATCH}.*" doesn't match the script itself.
8 - (dtucker) [regress/sftp-cmds.sh] Skip quoted file test on Cygwin. 8 - (dtucker) [regress/sftp-cmds.sh] Skip quoted file test on Cygwin.
9 - (dtucker) openbsd-compat/xcrypt.c] #elsif -> #elif
9 10
1020030906 1120030906
11 - (dtucker) [acconfig.h configure.ac uidswap.c] Prefer setuid/setgid on AIX. 12 - (dtucker) [acconfig.h configure.ac uidswap.c] Prefer setuid/setgid on AIX.
@@ -1033,4 +1034,4 @@
1033 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1034 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1034 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1035 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1035 1036
1036$Id: ChangeLog,v 1.2966 2003/09/06 23:32:58 dtucker Exp $ 1037$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)
65 crypted = md5_crypt(password, salt); 65 crypted = md5_crypt(password, salt);
66 else 66 else
67 crypted = crypt(password, salt); 67 crypted = crypt(password, salt);
68# elsif defined(__hpux) && !defined(HAVE_SECUREWARE) 68# elif defined(__hpux) && !defined(HAVE_SECUREWARE)
69 if (iscomsec()) 69 if (iscomsec())
70 crypted = bigcrypt(password, salt); 70 crypted = bigcrypt(password, salt);
71 else 71 else
72 crypted = crypt(password, salt); 72 crypted = crypt(password, salt);
73# elsif defined(HAVE_SECUREWARE) 73# elif defined(HAVE_SECUREWARE)
74 crypted = bigcrypt(password, salt); 74 crypted = bigcrypt(password, salt);
75# else 75# else
76 crypted = crypt(password, salt); 76 crypted = crypt(password, salt);
@@ -99,12 +99,12 @@ shadow_pw(struct passwd *pw)
99 struct passwd_adjunct *spw; 99 struct passwd_adjunct *spw;
100 if (issecure() && (spw = getpwanam(pw->pw_name)) != NULL) 100 if (issecure() && (spw = getpwanam(pw->pw_name)) != NULL)
101 pw_password = spw->pwa_passwd; 101 pw_password = spw->pwa_passwd;
102# elsif defined(HAVE_SECUREWARE) 102# elif defined(HAVE_SECUREWARE)
103 struct pr_passwd *spw = getprpwnam(pw->pw_name); 103 struct pr_passwd *spw = getprpwnam(pw->pw_name);
104 104
105 if (spw != NULL) 105 if (spw != NULL)
106 pw_password = spw->ufld.fd_encrypt; 106 pw_password = spw->ufld.fd_encrypt;
107# elsif defined(__hpux) && !defined(HAVE_SECUREWARE) 107# elif defined(__hpux) && !defined(HAVE_SECUREWARE)
108 struct pr_passwd *spw; 108 struct pr_passwd *spw;
109 if (iscomsec() && (spw = getprpwnam(pw->pw_name)) != NULL) 109 if (iscomsec() && (spw = getprpwnam(pw->pw_name)) != NULL)
110 pw_password = spw->ufld.fd_encrypt; 110 pw_password = spw->ufld.fd_encrypt;