SecBSD/xenocara
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-04-29 00:35:41 +00:00
parent 5d45cd7ee8
commit 155eb8555e
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
5506 changed files with 1786257 additions and 1416034 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/xinit/launchd/privileged_startx/Makefile.am
View file

@ -51,7 +51,7 @@ BUILT_SOURCES = \
privileged_startxServer.h \
privileged_startx.h
$(bundleidprefix).privileged_startx.plist.cpp: privileged_startx.plist.cpp
$(bundleidprefix).privileged_startx.plist.cpp: privileged_startx.plist.cpp
cp $< $@
launchdaemons_PRE = $(bundleidprefix).privileged_startx.plist.cpp

6
app/xinit/launchd/privileged_startx/client.c
View file

@ -45,7 +45,7 @@
int client_main(void) {
kern_return_t kr;
mach_port_t mp;
kr = bootstrap_look_up(bootstrap_port, BOOTSTRAP_NAME, &mp);
if (kr != KERN_SUCCESS) {
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
@ -55,12 +55,12 @@ int client_main(void) {
#endif
exit(EXIT_FAILURE);
}
kr = privileged_startx(mp);
if (kr != KERN_SUCCESS) {
fprintf(stderr, "privileged_startx client: %s\n", mach_error_string(kr));
exit(EXIT_FAILURE);
}
exit(EXIT_SUCCESS);
}

12
app/xinit/launchd/privileged_startx/server.c
View file

@ -51,7 +51,7 @@
union MaxMsgSize {
union __RequestUnion__privileged_startx_subsystem req;
union __ReplyUnion__privileged_startx_subsystem rep;
union __ReplyUnion__privileged_startx_subsystem rep;
};
#ifdef LAUNCH_JOBKEY_MACHSERVICES
@ -81,31 +81,31 @@ const char *script_dir = SCRIPTDIR;
static mach_port_t checkin_or_register(char *bname) {
kern_return_t kr;
mach_port_t mp;
/* If we're started by launchd or the old mach_init */
kr = bootstrap_check_in(bootstrap_port, bname, &mp);
if (kr == KERN_SUCCESS)
return mp;
/* We probably were not started by launchd or the old mach_init */
kr = mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &mp);
if (kr != KERN_SUCCESS) {
asl_log(NULL, NULL, ASL_LEVEL_ERR, "mach_port_allocate(): %s", mach_error_string(kr));
exit(EXIT_FAILURE);
}
kr = mach_port_insert_right(mach_task_self(), mp, mp, MACH_MSG_TYPE_MAKE_SEND);
if (kr != KERN_SUCCESS) {
asl_log(NULL, NULL, ASL_LEVEL_ERR, "mach_port_insert_right(): %s", mach_error_string(kr));
exit(EXIT_FAILURE);
}
kr = bootstrap_register(bootstrap_port, bname, mp);
if (kr != KERN_SUCCESS) {
asl_log(NULL, NULL, ASL_LEVEL_ERR, "bootstrap_register(): %s", mach_error_string(kr));
exit(EXIT_FAILURE);
}
return mp;
}
#endif