summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-07-26 19:38:30 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-07-26 19:38:30 +1000
commitfbba5a0501e5bdb03a412f099e45c2760a380d55 (patch)
tree9b5bdef5a9d0934c21433e9aa17c0334669e59bb
parent0410e32f47c0dcfc3385a1db2ee44f8bb35c10c4 (diff)
- (dtucker) [openbsd-compat/xcrypt.c] Fix typo: DISABLED_SHADOW ->
DISABLE_SHADOW. Fixes HP-UX compile error.
-rw-r--r--ChangeLog6
-rw-r--r--openbsd-compat/xcrypt.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5676dafcb..e796763a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120030726
2 - (dtucker) [openbsd-compat/xcrypt.c] Fix typo: DISABLED_SHADOW ->
3 DISABLE_SHADOW. Fixes HP-UX compile error.
4
120030724 520030724
2 - (bal) [auth-passwd.c openbsd-compat/Makefile.in openbsd-compat/xcrypt.c 6 - (bal) [auth-passwd.c openbsd-compat/Makefile.in openbsd-compat/xcrypt.c
3 openbsd-compat/xcrypt.h] Split off encryption into xcrypt() interface, 7 openbsd-compat/xcrypt.h] Split off encryption into xcrypt() interface,
@@ -728,4 +732,4 @@
728 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 732 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
729 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 733 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
730 734
731$Id: ChangeLog,v 1.2865 2003/07/24 06:52:13 mouring Exp $ 735$Id: ChangeLog,v 1.2866 2003/07/26 09:38:30 dtucker Exp $
diff --git a/openbsd-compat/xcrypt.c b/openbsd-compat/xcrypt.c
index 167a23513..ec28b7ccb 100644
--- a/openbsd-compat/xcrypt.c
+++ b/openbsd-compat/xcrypt.c
@@ -96,7 +96,7 @@ shadow_pw(struct passwd *pw)
96{ 96{
97 char *pw_password = pw->pw_passwd; 97 char *pw_password = pw->pw_passwd;
98 98
99# if defined(HAVE_SHADOW_H) && !defined(DISABLED_SHADOW) 99# if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW)
100 struct spwd *spw = getspnam(pw->pw_name); 100 struct spwd *spw = getspnam(pw->pw_name);
101 101
102 if (spw != NULL) 102 if (spw != NULL)