- (djm) Remove duplicate headers from loginrec.c

diff --git a/ChangeLog b/ChangeLog
index 0bd2a97940edfdf9704a97ba884df164511700f1..a928c8f28c77800f4958446112e97b1b046b086e 100644 (file)
--- 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 
    <tibbs@math.uh.edu>

diff --git a/loginrec.c b/loginrec.c
index cfa35acc10e3e01ace4c61c862f613b9a8f4bc00..31fa46ebc1815cd9f79dd3961f6c06b619228804 100644 (file)
--- a/loginrec.c
+++ b/loginrec.c
@@ -156,23 +156,6 @@
 
 #include "includes.h"
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#ifdef HAVE_PWD_H
-#  include <pwd.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>
-#else
-#  include <time.h>
-#endif
 #if HAVE_UTMP_H
 # include <utmp.h>
 #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 */