summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-05-29 10:28:18 +1000
committerDarren Tucker <dtucker@zip.com.au>2005-05-29 10:28:18 +1000
commit475a13e7b22374f9a76daf63673580ce0b4b32c1 (patch)
tree3b192d4105cc2198daf42b27c283a3b2f665f3ea
parentfe9489f7e522f780f3fa5c2f28208124d193398c (diff)
downloadopenssh-git-475a13e7b22374f9a76daf63673580ce0b4b32c1.tar.gz
20050529
- (dtucker) [openbsd-compat/port-aix.c] Bug #1046: AIX 5.3 expects the argument to passwdexpired to be initialized to NULL. Suggested by tim@ While at it, initialize the other arguments to auth functions in case they ever acquire this behaviour.
-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 15ce35ce..42a87c5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20050529
+ - (dtucker) [openbsd-compat/port-aix.c] Bug #1046: AIX 5.3 expects the
+ argument to passwdexpired to be initialized to NULL. Suggested by tim@
+ While at it, initialize the other arguments to auth functions in case they
+ ever acquire this behaviour.
+
20050524
- (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
[contrib/suse/openssh.spec] Update spec file versions to 4.1p1
@@ -2496,4 +2502,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3758.2.2 2005/05/25 12:24:56 djm Exp $
+$Id: ChangeLog,v 1.3758.2.3 2005/05/29 00:28:18 dtucker Exp $
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c
index cf5d4b9a..c711283d 100644
--- a/openbsd-compat/port-aix.c
+++ b/openbsd-compat/port-aix.c
@@ -1,7 +1,7 @@
/*
*
* Copyright (c) 2001 Gert Doering. All rights reserved.
- * Copyright (c) 2003,2004 Darren Tucker. All rights reserved.
+ * Copyright (c) 2003,2004,2005 Darren Tucker. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -153,7 +153,7 @@ aix_valid_authentications(const char *user)
int
sys_auth_passwd(Authctxt *ctxt, const char *password)
{
- char *authmsg = NULL, *msg, *name = ctxt->pw->pw_name;
+ char *authmsg = NULL, *msg = NULL, *name = ctxt->pw->pw_name;
int authsuccess = 0, expired, reenter, result;
do {
@@ -257,7 +257,7 @@ int
sys_auth_record_login(const char *user, const char *host, const char *ttynm,
Buffer *loginmsg)
{
- char *msg;
+ char *msg = NULL;
int success = 0;
aix_setauthdb(user);