diff options
| author | Matthieu Herrb <matthieu@herrb.eu> | 2021-05-22 18:23:15 +0200 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2021-05-22 18:23:15 +0200 |
| commit | d5a136c4fa562d66efd7d20bf2ba40d1a62439fa (patch) | |
| tree | d681ee32405dbdccc6116dec603d44fb6a2a07a6 /launchd/privileged_startx | |
| parent | 809a2659e31ee637eddefffa5af3738fcd60a79d (diff) | |
| parent | ae77976adaae9948e3e8d7a673dc88df4e31de46 (diff) | |
Merge remote-tracking branch 'origin/master' into obsd
Diffstat (limited to 'launchd/privileged_startx')
| -rw-r--r-- | launchd/privileged_startx/Makefile.am | 5 | ||||
| -rw-r--r-- | launchd/privileged_startx/privileged_startx.plist.cpp | 9 | ||||
| -rw-r--r-- | launchd/privileged_startx/server.c | 6 |
3 files changed, 2 insertions, 18 deletions
diff --git a/launchd/privileged_startx/Makefile.am b/launchd/privileged_startx/Makefile.am index a6ed492..ea99005 100644 --- a/launchd/privileged_startx/Makefile.am +++ b/launchd/privileged_startx/Makefile.am @@ -36,12 +36,7 @@ privstartx_SCRIPTS = 10-tmpdirs 20-font_cache AM_CPPFLAGS = -I$(srcdir)/.. -DXINITDIR=\"$(xinitrcdir)\" -DSCRIPTDIR=\"$(privstartxdir)\" -DBINDIR=\"$(bindir)\" CPP_FILES_FLAGS = -D__libexecdir__="$(libexecdir)" -DXINITDIR="$(xinitrcdir)" -DSCRIPTDIR="$(privstartxdir)" -DBINDIR="$(bindir)" -DBUNDLE_ID_PREFIX="$(bundleidprefix)" -if TIGER_LAUNCHD -CPP_FILES_FLAGS += -DTIGER_LAUNCHD -endif - dist_privileged_startx_SOURCES = \ - $(srcdir)/../console_redirect.c \ server.c \ client.c \ privileged_startx.c diff --git a/launchd/privileged_startx/privileged_startx.plist.cpp b/launchd/privileged_startx/privileged_startx.plist.cpp index e1652b0..370350a 100644 --- a/launchd/privileged_startx/privileged_startx.plist.cpp +++ b/launchd/privileged_startx/privileged_startx.plist.cpp @@ -10,14 +10,6 @@ <string>-d</string> <string>SCRIPTDIR</string> </array> -#ifdef TIGER_LAUNCHD - <key>RunAtLoad</key> - <true/> - <key>KeepAlive</key> - <true/> - <key>ServiceIPC</key> - <true/> -#else <key>MachServices</key> <dict> <key>BUNDLE_ID_PREFIX.privileged_startx</key> @@ -27,6 +19,5 @@ <integer>120</integer> <key>EnableTransactions</key> <true/> -#endif </dict> </plist> diff --git a/launchd/privileged_startx/server.c b/launchd/privileged_startx/server.c index 005758d..f37c9b1 100644 --- a/launchd/privileged_startx/server.c +++ b/launchd/privileged_startx/server.c @@ -46,8 +46,6 @@ #include <asl.h> #include <errno.h> -#include "console_redirect.h" - #include "privileged_startx.h" #include "privileged_startxServer.h" @@ -153,8 +151,8 @@ int server_main(const char *dir) { } aslc = asl_open(labelstr, BUNDLE_ID_PREFIX, ASL_OPT_NO_DELAY); - xi_asl_capture_fd(aslc, NULL, ASL_LEVEL_INFO, STDOUT_FILENO); - xi_asl_capture_fd(aslc, NULL, ASL_LEVEL_NOTICE, STDERR_FILENO); + asl_log_descriptor(aslc, NULL, ASL_LEVEL_INFO, STDOUT_FILENO, ASL_LOG_DESCRIPTOR_WRITE); + asl_log_descriptor(aslc, NULL, ASL_LEVEL_NOTICE, STDERR_FILENO, ASL_LOG_DESCRIPTOR_WRITE); #ifdef LAUNCH_JOBKEY_MACHSERVICES launch_data_t tmv; |