summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-05-29 10:32:47 +1000
committerDarren Tucker <dtucker@zip.com.au>2005-05-29 10:32:47 +1000
commit6b2fe31def24b50c4cc705f2a3b861348b1be8e2 (patch)
treeba2279e91e47553bab07d0910e1b134726556bdf
parent782727ac611b159973a5dd05f8d8cfa82cd734d0 (diff)
- (dtucker) [openbsd-compat/port-aix.c] Whitespace cleanups while there.
-rw-r--r--ChangeLog3
-rw-r--r--openbsd-compat/port-aix.c8
2 files changed, 5 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 4919e3ead..f6ace4314 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
3 argument to passwdexpired to be initialized to NULL. Suggested by tim@ 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 4 While at it, initialize the other arguments to auth functions in case they
5 ever acquire this behaviour. 5 ever acquire this behaviour.
6 - (dtucker) [openbsd-compat/port-aix.c] Whitespace cleanups while there.
6 7
720050528 820050528
8 - (dtucker) [configure.ac] For AC_CHECK_HEADERS() and AC_CHECK_FUNCS() have 9 - (dtucker) [configure.ac] For AC_CHECK_HEADERS() and AC_CHECK_FUNCS() have
@@ -2634,4 +2635,4 @@
2634 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2635 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2635 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2636 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2636 2637
2637$Id: ChangeLog,v 1.3798 2005/05/29 00:28:48 dtucker Exp $ 2638$Id: ChangeLog,v 1.3799 2005/05/29 00:32:47 dtucker Exp $
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c
index c711283dd..8267c8ef1 100644
--- a/openbsd-compat/port-aix.c
+++ b/openbsd-compat/port-aix.c
@@ -42,14 +42,12 @@ static char old_registry[REGISTRY_SIZE] = "";
42# endif 42# endif
43 43
44/* 44/*
45 * AIX has a "usrinfo" area where logname and other stuff is stored - 45 * AIX has a "usrinfo" area where logname and other stuff is stored -
46 * a few applications actually use this and die if it's not set 46 * a few applications actually use this and die if it's not set
47 * 47 *
48 * NOTE: TTY= should be set, but since no one uses it and it's hard to 48 * NOTE: TTY= should be set, but since no one uses it and it's hard to
49 * acquire due to privsep code. We will just drop support. 49 * acquire due to privsep code. We will just drop support.
50 */ 50 */
51
52
53void 51void
54aix_usrinfo(struct passwd *pw) 52aix_usrinfo(struct passwd *pw)
55{ 53{
@@ -60,7 +58,7 @@ aix_usrinfo(struct passwd *pw)
60 len = sizeof("LOGNAME= NAME= ") + (2 * strlen(pw->pw_name)); 58 len = sizeof("LOGNAME= NAME= ") + (2 * strlen(pw->pw_name));
61 cp = xmalloc(len); 59 cp = xmalloc(len);
62 60
63 i = snprintf(cp, len, "LOGNAME=%s%cNAME=%s%c", pw->pw_name, '\0', 61 i = snprintf(cp, len, "LOGNAME=%s%cNAME=%s%c", pw->pw_name, '\0',
64 pw->pw_name, '\0'); 62 pw->pw_name, '\0');
65 if (usrinfo(SETUINFO, cp, i) == -1) 63 if (usrinfo(SETUINFO, cp, i) == -1)
66 fatal("Couldn't set usrinfo: %s", strerror(errno)); 64 fatal("Couldn't set usrinfo: %s", strerror(errno));
@@ -170,7 +168,7 @@ sys_auth_passwd(Authctxt *ctxt, const char *password)
170 if (result == 0) { 168 if (result == 0) {
171 authsuccess = 1; 169 authsuccess = 1;
172 170
173 /* 171 /*
174 * Record successful login. We don't have a pty yet, so just 172 * Record successful login. We don't have a pty yet, so just
175 * label the line as "ssh" 173 * label the line as "ssh"
176 */ 174 */