summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-02-08 21:06:55 +1100
committerDarren Tucker <dtucker@zip.com.au>2005-02-08 21:06:55 +1100
commitb4d3012d2e9a0eb53c56565108c8278e45cefc77 (patch)
treefa4803a321a92632ec0db847e14d8a640ccf5ecd
parentfeb6f7f24424105e649dbb2b3433352eb29b6764 (diff)
- (dtucker) [openbsd-compat/port-aix.c] Silence compiler warnings.
-rw-r--r--ChangeLog3
-rw-r--r--openbsd-compat/port-aix.c15
2 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 841c7bd3..89424da0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
- (dtucker) [regress/test-exec.sh] Bug #912: Set _POSIX2_VERSION for the
regress tests so newer versions of GNU head(1) behave themselves. Patch
by djm, so ok me.
+ - (dtucker) [openbsd-compat/port-aix.c] Silence compiler warnings.
20050204
- (dtucker) [monitor.c] Permit INVALID_USER audit events from slave too.
@@ -2081,4 +2082,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.3637 2005/02/08 09:17:17 dtucker Exp $
+$Id: ChangeLog,v 1.3638 2005/02/08 10:06:55 dtucker Exp $
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c
index 79d18021..27ab0615 100644
--- a/openbsd-compat/port-aix.c
+++ b/openbsd-compat/port-aix.c
@@ -36,6 +36,10 @@
#include <uinfo.h>
#include "port-aix.h"
+/* These should be in the system headers but are not. */
+int usrinfo(int, char *, int);
+int setauthdb(const char *, char *);
+
extern Buffer loginmsg;
# ifdef HAVE_SETAUTHDB
@@ -49,6 +53,8 @@ static char old_registry[REGISTRY_SIZE] = "";
* NOTE: TTY= should be set, but since no one uses it and it's hard to
* acquire due to privsep code. We will just drop support.
*/
+
+
void
aix_usrinfo(struct passwd *pw)
{
@@ -260,10 +266,10 @@ sys_auth_record_login(const char *user, const char *host, const char *ttynm)
int success = 0;
aix_setauthdb(user);
- if (loginsuccess((char *)user, host, ttynm, &msg) == 0) {
+ if (loginsuccess((char *)user, (char *)host, (char *)ttynm, &msg) == 0) {
success = 1;
if (msg != NULL) {
- debug("AIX/loginsuccess: msg %s", __func__, msg);
+ debug("AIX/loginsuccess: msg %s", msg);
buffer_append(&loginmsg, msg, strlen(msg));
xfree(msg);
}
@@ -284,9 +290,10 @@ record_failed_login(const char *user, const char *hostname, const char *ttyname)
aix_setauthdb(user);
# ifdef AIX_LOGINFAILED_4ARG
- loginfailed((char *)user, hostname, (char *)ttyname, AUDIT_FAIL_AUTH);
+ loginfailed((char *)user, (char *)hostname, (char *)ttyname,
+ AUDIT_FAIL_AUTH);
# else
- loginfailed((char *)user, hostname, (char *)ttyname);
+ loginfailed((char *)user, (char *)hostname, (char *)ttyname);
# endif
aix_restoreauthdb();
}