summaryrefslogtreecommitdiffstats
path: root/defines.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-08-09 16:34:27 +1000
committerDamien Miller <djm@mindrot.org>2000-08-09 16:34:27 +1000
commit36ccb5c4f306784c9ceacf5ef5014ae06c9545de (patch)
tree5d8a216d8a4e23e0a4930504e6d821d3c792793a /defines.h
parentd17b8d5aee2dfac46514b67b709ebca03b6fec25 (diff)
- (djm) utmp direct write & SunOS 4 patch from Charles Levert
<charles@comm.polymtl.ca>
Diffstat (limited to 'defines.h')
-rw-r--r--defines.h33
1 files changed, 24 insertions, 9 deletions
diff --git a/defines.h b/defines.h
index 23e00d1a..0480006d 100644
--- a/defines.h
+++ b/defines.h
@@ -329,18 +329,33 @@ typedef int mode_t;
#endif
/* FIXME: put default paths back in */
-#if !defined(UTMP_FILE) && defined(_PATH_UTMP)
-# define UTMP_FILE _PATH_UTMP
+#ifndef UTMP_FILE
+# ifdef _PATH_UTMP
+# define UTMP_FILE _PATH_UTMP
+# else
+# ifdef CONF_UTMP_FILE
+# define UTMP_FILE CONF_UTMP_FILE
+# endif
+# endif
#endif
-#if !defined(WTMP_FILE) && defined(_PATH_WTMP)
-# define WTMP_FILE _PATH_WTMP
+#ifndef WTMP_FILE
+# ifdef _PATH_WTMP
+# define WTMP_FILE _PATH_WTMP
+# else
+# ifdef CONF_WTMP_FILE
+# define WTMP_FILE CONF_WTMP_FILE
+# endif
+# endif
#endif
/* pick up the user's location for lastlog if given */
-#if !defined(LASTLOG_FILE) && defined(_PATH_LASTLOG)
-# define LASTLOG_FILE _PATH_LASTLOG
-#endif
-#if !defined(LASTLOG_FILE) && defined(CONF_LASTLOG_FILE)
-# define LASTLOG_FILE CONF_LASTLOG_FILE
+#ifndef LASTLOG_FILE
+# ifdef _PATH_LASTLOG
+# define LASTLOG_FILE _PATH_LASTLOG
+# else
+# ifdef CONF_LASTLOG_FILE
+# define LASTLOG_FILE CONF_LASTLOG_FILE
+# endif
+# endif
#endif