mirror of
https://github.com/troglobit/finit.git
synced 2026-11-20 19:41:51 +00:00
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>
This commit is contained in:
1 parent
8a71f2d323
commit
87f6769c51
3 files changed
+6
-20
No files matched your search
+1
-1
@@ -31,6 +31,7 @@
|
|||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
#include <utmp.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#include <lite/lite.h>
|
#include <lite/lite.h>
|
||||||
|
|
||||||
@@ -39,7 +40,6 @@
|
|||||||
#include "serv.h"
|
#include "serv.h"
|
||||||
#include "service.h"
|
#include "service.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "utmp-api.h"
|
|
||||||
|
|
||||||
#define _PATH_COND _PATH_VARRUN "finit/cond/"
|
#define _PATH_COND _PATH_VARRUN "finit/cond/"
|
||||||
|
|
||||||
|
|||||||
+5
-1
@@ -25,12 +25,16 @@
|
|||||||
|
|
||||||
#include <paths.h>
|
#include <paths.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
#include <utmp.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#include <sys/utsname.h>
|
#include <sys/utsname.h>
|
||||||
#include <lite/lite.h>
|
#include <lite/lite.h>
|
||||||
|
|
||||||
#include "helpers.h"
|
#include "helpers.h"
|
||||||
#include "utmp-api.h"
|
|
||||||
|
#ifndef _PATH_BTMP
|
||||||
|
#define _PATH_BTMP "/var/log/btmp"
|
||||||
|
#endif
|
||||||
|
|
||||||
#define MAX_NO 5
|
#define MAX_NO 5
|
||||||
#define MAX_SZ 100 * 1024
|
#define MAX_SZ 100 * 1024
|
||||||
|
|||||||
@@ -24,24 +24,6 @@
|
|||||||
#ifndef FINIT_UTMP_API_H_
|
#ifndef FINIT_UTMP_API_H_
|
||||||
#define 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 (int type, int pid, char *line, char *id, char *user);
|
||||||
int utmp_set_boot (void);
|
int utmp_set_boot (void);
|
||||||
int utmp_set_halt (void);
|
int utmp_set_halt (void);
|
||||||
|
|||||||
Reference in new issue
Block a user