summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--openbsd-compat/port-aix.c6
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c7bc855c6..4919e3ead 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120050529
2 - (dtucker) [openbsd-compat/port-aix.c] Bug #1046: AIX 5.3 expects the
3 argument to passwdexpired to be initialized to NULL. Suggested by tim@
4 While at it, initialize the other arguments to auth functions in case they
5 ever acquire this behaviour.
6
120050528 720050528
2 - (dtucker) [configure.ac] For AC_CHECK_HEADERS() and AC_CHECK_FUNCS() have 8 - (dtucker) [configure.ac] For AC_CHECK_HEADERS() and AC_CHECK_FUNCS() have
3 one entry per line to make it easier to merge changes. ok djm@ 9 one entry per line to make it easier to merge changes. ok djm@
@@ -2628,4 +2634,4 @@
2628 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2634 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2629 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2635 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2630 2636
2631$Id: ChangeLog,v 1.3797 2005/05/28 10:28:39 dtucker Exp $ 2637$Id: ChangeLog,v 1.3798 2005/05/29 00:28:48 dtucker Exp $
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c
index cf5d4b9a3..c711283dd 100644
--- a/openbsd-compat/port-aix.c
+++ b/openbsd-compat/port-aix.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * 2 *
3 * Copyright (c) 2001 Gert Doering. All rights reserved. 3 * Copyright (c) 2001 Gert Doering. All rights reserved.
4 * Copyright (c) 2003,2004 Darren Tucker. All rights reserved. 4 * Copyright (c) 2003,2004,2005 Darren Tucker. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
@@ -153,7 +153,7 @@ aix_valid_authentications(const char *user)
153int 153int
154sys_auth_passwd(Authctxt *ctxt, const char *password) 154sys_auth_passwd(Authctxt *ctxt, const char *password)
155{ 155{
156 char *authmsg = NULL, *msg, *name = ctxt->pw->pw_name; 156 char *authmsg = NULL, *msg = NULL, *name = ctxt->pw->pw_name;
157 int authsuccess = 0, expired, reenter, result; 157 int authsuccess = 0, expired, reenter, result;
158 158
159 do { 159 do {
@@ -257,7 +257,7 @@ int
257sys_auth_record_login(const char *user, const char *host, const char *ttynm, 257sys_auth_record_login(const char *user, const char *host, const char *ttynm,
258 Buffer *loginmsg) 258 Buffer *loginmsg)
259{ 259{
260 char *msg; 260 char *msg = NULL;
261 int success = 0; 261 int success = 0;
262 262
263 aix_setauthdb(user); 263 aix_setauthdb(user);