- Cleanup of auth.c, login.c and fake-*
- Cleanup of auth-pam.c, save and print "account expired" error messages
diff --git a/login.c b/login.c
index 6749a15..6fdc71e 100644
--- a/login.c
+++ b/login.c
@@ -18,7 +18,7 @@
*/
#include "includes.h"
-RCSID("$Id: login.c,v 1.28 2000/05/30 03:12:46 damien Exp $");
+RCSID("$Id: login.c,v 1.29 2000/05/31 01:20:12 damien Exp $");
#if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
# include <utmpx.h>
@@ -38,6 +38,11 @@
# include <login.h>
#endif
+#ifdef WITH_AIXAUTHENTICATE
+/* This is done in do_authentication */
+# define DISABLE_LASTLOG
+#endif /* WITH_AIXAUTHENTICATE */
+
/*
* Returns the time when the user last logged in. Returns 0 if the
* information is not available. This must be called before record_login.
@@ -53,58 +58,50 @@
get_last_login_time(uid_t uid, const char *logname,
char *buf, unsigned int bufsize)
{
-#if defined(WITH_AIXAUTHENTICATE)
- /* This is done in do_authentication */
- return (unsigned long) 0;
-#else
#if defined(_PATH_LASTLOG) && !defined(DISABLE_LASTLOG)
struct lastlog ll;
- char *lastlog;
int fd;
-#ifdef LASTLOG_IS_DIR
+# ifdef LASTLOG_IS_DIR
char lbuf[1024];
-#endif /* LASTLOG_IS_DIR */
- lastlog = _PATH_LASTLOG;
+ snprintf(lbuf, sizeof(buf), "%s/%s", _PATH_LASTLOG, logname);
+ if ((fd = open(lbuf, O_RDONLY)) < 0)
+ return 0;
+# else /* LASTLOG_IS_DIR */
buf[0] = '\0';
-#ifndef LASTLOG_IS_DIR
- fd = open(lastlog, O_RDONLY);
- if (fd < 0)
+ if ((fd = open(_PATH_LASTLOG, O_RDONLY)) < 0)
return 0;
+
lseek(fd, (off_t) ((long) uid * sizeof(ll)), SEEK_SET);
-#else /* LASTLOG_IS_DIR */
- snprintf(lbuf, sizeof(buf), "%s/%s", lastlog, logname);
- fd = open(lbuf, O_RDONLY);
- if (fd < 0)
- return 0;
-#endif /* LASTLOG_IS_DIR */
+# endif /* LASTLOG_IS_DIR */
if (read(fd, &ll, sizeof(ll)) != sizeof(ll)) {
close(fd);
return 0;
}
+
close(fd);
+
if (bufsize > sizeof(ll.ll_host) + 1)
bufsize = sizeof(ll.ll_host) + 1;
strncpy(buf, ll.ll_host, bufsize - 1);
buf[bufsize - 1] = 0;
- return ll.ll_time;
+ return ll.ll_time;
#else /* defined(_PATH_LASTLOG) && !defined(DISABLE_LASTLOG) */
# ifdef HAVE_TYPE_IN_UTMP
/* Look in wtmp for the last login */
struct utmp wt;
- char *wt_file = _PATH_WTMP;
- int fd1;
+ int fd1;
unsigned long t = 0;
- if ( (fd1 = open(wt_file, O_RDONLY)) < 0 ) {
- error("Couldn't open %.100s to find last login time.", wt_file);
+ if ((fd1 = open(_PATH_WTMP, O_RDONLY)) < 0) {
+ error("Couldn't open %.100s to find last login time.", _PATH_WTMP);
return 0;
}
/* seek to last record of file */
- lseek(fd1, (off_t)(0-sizeof(struct utmp)), SEEK_END);
+ lseek(fd1, (off_t)(0 - sizeof(struct utmp)), SEEK_END);
/* loop through wtmp for our last user login record */
do {
@@ -113,47 +110,44 @@
return 0;
}
- if ( wt.ut_type == USER_PROCESS) {
- if ( !strncmp(logname, wt.ut_user, 8) ) {
- t = (unsigned long) wt.ut_time;
-# ifdef HAVE_HOST_IN_UTMP
+ if (wt.ut_type == USER_PROCESS) {
+ if (!strncmp(logname, wt.ut_user, 8)) {
+ t = (unsigned long)wt.ut_time;
+# ifdef HAVE_HOST_IN_UTMP
if (bufsize > sizeof(wt.ut_host) + 1)
- bufsize = sizeof(wt.ut_host) + 1;
+ bufsize = sizeof(wt.ut_host) + 1;
strncpy(buf, wt.ut_host, bufsize - 1);
buf[bufsize - 1] = 0;
-# else /* HAVE_HOST_IN_UTMP */
+# else /* HAVE_HOST_IN_UTMP */
buf[0] = 0;
-# endif /* HAVE_HOST_IN_UTMP */
+# endif /* HAVE_HOST_IN_UTMP */
}
}
- if (lseek(fd1, (off_t)(0-2*sizeof(struct utmp)), SEEK_CUR) == -1)
+ if (lseek(fd1, (off_t)(0 - (2 * sizeof(struct utmp))), SEEK_CUR) < 0)
break;
} while (t == 0);
return t;
-# else
+# else /* HAVE_TYPE_IN_UTMP */
return 0;
# endif /* HAVE_TYPE_IN_UTMP */
#endif /* defined(_PATH_LASTLOG) && !defined(DISABLE_LASTLOG) */
-#endif /* defined(WITH_AIXAUTHENTICATE) */
}
/*
- * Records that the user has logged in. I these parts of operating systems
- * were more standardized.
+ * Records that the user has logged in. I wish these parts of operating
+ * systems were more standardized.
*/
-
void
record_login(pid_t pid, const char *ttyname, const char *user, uid_t uid,
const char *host, struct sockaddr * addr)
{
#if defined(_PATH_LASTLOG) && !defined(DISABLE_LASTLOG)
struct lastlog ll;
- char *lastlog;
-#ifdef LASTLOG_IS_DIR
+# ifdef LASTLOG_IS_DIR
char buf[1024];
-#endif /* LASTLOG_IS_DIR */
+# endif /* LASTLOG_IS_DIR */
#endif /* defined(_PATH_LASTLOG) && !defined(DISABLE_LASTLOG) */
struct utmp u;
#if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
@@ -163,28 +157,35 @@
/* Construct an utmp/wtmp entry. */
memset(&u, 0, sizeof(u));
strncpy(u.ut_line, ttyname + 5, sizeof(u.ut_line));
+
#if defined(HAVE_ID_IN_UTMP)
-#ifdef _AIX
+# ifdef _AIX
strncpy(u.ut_id, ttyname + 5, sizeof(u.ut_id));
-#else /* !AIX */
+# else /* !AIX */
strncpy(u.ut_id, ttyname + 8, sizeof(u.ut_id));
-#endif
+# endif
#endif /* defined(HAVE_ID_IN_UTMP) */
+
strncpy(u.ut_name, user, sizeof(u.ut_name));
+
#if defined(HAVE_TV_IN_UTMP)
(void)gettimeofday(&u.ut_tv, NULL);
#else /* defined(HAVE_TV_IN_UTMP) */
u.ut_time = time(NULL);
#endif /* defined(HAVE_TV_IN_UTMP) */
+
#if defined(HAVE_PID_IN_UTMP)
u.ut_pid = (pid_t)pid;
#endif /* HAVE_PID_IN_UTMP */
+
#if defined(HAVE_TYPE_IN_UTMP)
u.ut_type = (uid == -1)?DEAD_PROCESS:USER_PROCESS;
#endif /* HAVE_TYPE_IN_UTMP */
+
#if defined(HAVE_HOST_IN_UTMP)
strncpy(u.ut_host, host, sizeof(u.ut_host));
#endif
+
#if defined(HAVE_ADDR_IN_UTMP)
if (addr) {
switch (addr->sa_family) {
@@ -193,26 +194,29 @@
memcpy(&(u.ut_addr), &(in->sin_addr), sizeof(&(in->sin_addr)));
break;
}
-#if defined(HAVE_ADDR_V6_IN_UTMP)
+# if defined(HAVE_ADDR_V6_IN_UTMP)
case AF_INET6: {
struct sockaddr_in6 *in6 = (struct sockaddr_in6*)addr;
memcpy(u.ut_addr_v6, &(in6->sin6_addr), sizeof(&(in6->sin6_addr)));
break;
}
-#endif
+# endif /* defined(HAVE_ADDR_V6_IN_UTMP) */
default:
break;
}
}
-#endif
+#endif /* defined(HAVE_ADDR_IN_UTMP) */
#if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
memset(&utx, 0, sizeof(utx));
+
strncpy(utx.ut_user, user, sizeof(utx.ut_name));
strncpy(utx.ut_line, ttyname + 5, sizeof(utx.ut_line));
strncpy(utx.ut_id, ttyname + 8, sizeof(utx.ut_id));
+
utx.ut_pid = (pid_t)pid;
(void)gettimeofday(&utx.ut_tv, NULL);
+
utx.ut_type = (uid == -1)?DEAD_PROCESS:USER_PROCESS;
# ifdef HAVE_HOST_IN_UTMPX
# ifdef HAVE_SYSLEN_IN_UTMPX
@@ -225,7 +229,8 @@
# endif /* HAVE_SYSLEN_IN_UTMPX */
utx.ut_host[sizeof(utx.ut_host)-1] = '\0';
# endif
-#if defined(HAVE_ADDR_IN_UTMPX)
+
+# if defined(HAVE_ADDR_IN_UTMPX)
if (addr) {
switch (addr->sa_family) {
case AF_INET: {
@@ -233,31 +238,27 @@
memcpy(&(utx.ut_addr), &(in->sin_addr), sizeof(&(in->sin_addr)));
break;
}
-#if defined(HAVE_ADDR_V6_IN_UTMPX)
+# if defined(HAVE_ADDR_V6_IN_UTMPX)
case AF_INET6: {
struct sockaddr_in6 *in6 = (struct sockaddr_in6*)addr;
memcpy(utx.ut_addr_v6, &(in6->sin6_addr), sizeof(&(in6->sin6_addr)));
break;
}
-#endif
+# endif /* defined(HAVE_ADDR_V6_IN_UTMPX) */
default:
break;
}
}
-#endif
+# endif /* defined(HAVE_ADDR_IN_UTMPX) */
#endif /* defined(HAVE_UTMPX_H) && defined(USE_UTMPX) */
-/*#if defined(HAVE_UTMPX_H) && defined(USE_UTMPX) && !defined(HAVE_LOGIN)*/
#if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
login(&u, &utx);
#else /* defined(HAVE_UTMPX_H) && defined(USE_UTMPX) */
login(&u);
#endif /* defined(HAVE_UTMPX_H) && defined(USE_UTMPX) */
-#if defined(_PATH_LASTLOG) && !defined(DISABLE_LASTLOG) && !defined(WITH_AIXAUTHENTICATE)
- /* AIX does this in do_authentication */
- lastlog = _PATH_LASTLOG;
-
+#if defined(_PATH_LASTLOG) && !defined(DISABLE_LASTLOG)
/* Update lastlog unless actually recording a logout. */
if (strcmp(user, "") != 0) {
int fd;
@@ -271,21 +272,25 @@
ll.ll_time = time(NULL);
strncpy(ll.ll_line, ttyname + 5, sizeof(ll.ll_line));
strncpy(ll.ll_host, host, sizeof(ll.ll_host));
-#ifdef LASTLOG_IS_DIR
- snprintf(buf, sizeof(buf), "%s/%s", lastlog, user);
- fd = open(buf, O_RDWR);
- if (fd >= 0) {
-#else /* LASTLOG_IS_DIR */
- fd = open(lastlog, O_RDWR);
- if (fd >= 0) {
- lseek(fd, (off_t) ((long) uid * sizeof(ll)), SEEK_SET);
-#endif /* LASTLOG_IS_DIR */
+# ifdef LASTLOG_IS_DIR
+ snprintf(buf, sizeof(buf), "%s/%s", _PATH_LASTLOG, user);
+ if ((fd = open(buf, O_RDWR)) >= 0) {
if (write(fd, &ll, sizeof(ll)) != sizeof(ll))
- log("Could not write %.100s: %.100s", lastlog, strerror(errno));
+ log("Could not write %.100s: %.100s", buf, strerror(errno));
close(fd);
}
+# else /* LASTLOG_IS_DIR */
+ if ((fd = open(_PATH_LASTLOG, O_RDWR)) >= 0) {
+ lseek(fd, (off_t) ((long) uid * sizeof(ll)), SEEK_SET);
+ if (write(fd, &ll, sizeof(ll)) != sizeof(ll)) {
+ log("Could not write %.100s: %.100s", _PATH_LASTLOG,
+ strerror(errno));
+ }
+ close(fd);
+ }
+# endif /* LASTLOG_IS_DIR */
}
-#endif /* defined(_PATH_LASTLOG) && !defined(DISABLE_LASTLOG) && !defined(WITH_AIXAUTHENTICATE) */
+#endif /* defined(_PATH_LASTLOG) && !defined(DISABLE_LASTLOG) */
}
/* Records that the user has logged out. */