From f988dce5acab8c6f254cc61ccf77d0330b81f027 Mon Sep 17 00:00:00 2001 From: djm Date: Wed, 7 Jun 2000 11:32:13 +0000 Subject: [PATCH] - (djm) Remove duplicate headers from loginrec.c --- ChangeLog | 1 + loginrec.c | 32 +++++--------------------------- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0bd2a979..a928c8f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ 20000606 + - (djm) Remove duplicate headers from loginrec.c - (djm) Don't add /usr/local/lib to library search path on Irix - (djm) Fix rsh path in RPMs. Report from Jason L Tibbitts III diff --git a/loginrec.c b/loginrec.c index cfa35acc..31fa46eb 100644 --- a/loginrec.c +++ b/loginrec.c @@ -156,23 +156,6 @@ #include "includes.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef HAVE_PWD_H -# include -#endif -#ifdef HAVE_SYS_TIME_H -# include -#else -# include -#endif #if HAVE_UTMP_H # include #endif @@ -189,7 +172,6 @@ RCSID("$Id$"); - /** ** prototypes for helper functions in this file **/ @@ -1117,9 +1099,7 @@ wtmpx_get_entry(struct logininfo *li) } -#endif -/* USE_WTMPX */ - +#endif /* USE_WTMPX */ /** @@ -1154,11 +1134,11 @@ syslogin_perform_logout(struct logininfo *li) if (!logout(line)) { log("syslogin_perform_logout: logout() returned an error"); -# ifdef HAVE_LOGWTMP +# ifdef HAVE_LOGWTMP } else { logwtmp(line, "", ""); } -# endif +# endif /* TODO: what to do if we have login, but no logout? * what if logout but no logwtmp? All routines are in libutil * so they should all be there, but... */ @@ -1182,8 +1162,7 @@ syslogin_write_entry(struct logininfo *li) } -#endif -/* USE_LOGIN */ +#endif /* USE_LOGIN */ /* end of file log-syslogin.c */ @@ -1336,5 +1315,4 @@ lastlog_get_entry(struct logininfo *li) } -#endif -/* USE_LASTLOG */ +#endif /* USE_LASTLOG */ -- 2.45.2