Revert "Workaround for _PATH_UTMP and _PATH_WTMP defines on musl libc"

This reverts commit 8a71f2d323 because
if no other application has a working utmp then there's no poit for
Finit to have one.  Instead we'll be disabling all utmp support when
running on a musl based system.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

src/initctl.c

@@ -31,6 +31,7 @@
 #include <signal.h>
 #include <stdio.h>
 #include <time.h>
+#include <utmp.h>
 #include <arpa/inet.h>
 #include <lite/lite.h>
 
@@ -39,7 +40,6 @@
 #include "serv.h"
 #include "service.h"
 #include "util.h"
-#include "utmp-api.h"
 
 #define _PATH_COND _PATH_VARRUN "finit/cond/"
 

src/utmp-api.c

@@ -25,12 +25,16 @@
 
 #include <paths.h>
 #include <time.h>
+#include <utmp.h>
 #include <arpa/inet.h>
 #include <sys/utsname.h>
 #include <lite/lite.h>
 
 #include "helpers.h"
-#include "utmp-api.h"
+
+#ifndef _PATH_BTMP
+#define _PATH_BTMP "/var/log/btmp"
+#endif
 
 #define MAX_NO 5
 #define MAX_SZ 100 * 1024

src/utmp-api.h

@@ -24,24 +24,6 @@
 #ifndef FINIT_UTMP_API_H_
 #define FINIT_UTMP_API_H_
 
-#include <utmp.h>
-
-/*
- * musl libc default to /dev/null/utmp and /dev/null/wtmp, respectively.
- * See https://www.openwall.com/lists/musl/2012/03/04/4 for reasoning.
- *
- * Also, there's no __MUSL__, so we cannot make a libc-specific check
- * here to work around this, that's why everyone pays.
- */
-#undef _PATH_UTMP
-#undef _PATH_WTMP
-#undef _PATH_BTMP
-
-#define _PATH_UTMP "/var/run/wtmp"
-#define _PATH_WTMP "/var/log/wtmp"
-#define _PATH_BTMP "/var/log/btmp"
-
-
 int utmp_set         (int type, int pid, char *line, char *id, char *user);
 int utmp_set_boot    (void);
 int utmp_set_halt    (void);