Skip to content

do not delete pid file unless this current pid matches the daemon pid #3647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jsorg71 merged 1 commit into from
Oct 27, 2025
Merged

do not delete pid file unless this current pid matches the daemon pid #3647

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion xrdp/xrdp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,7 @@ main(int argc, char **argv)
enum logReturns error;
struct xrdp_startup_params startup_params = {0};
int pid;
int daemon_pid = 0;
int daemon;
char text[256];
const char *pid_file = XRDP_PID_PATH "/xrdp.pid";
Expand Down Expand Up @@ -723,6 +724,7 @@ main(int argc, char **argv)
g_exit(0);
}

daemon_pid = g_getpid();
g_sleep(1000);
/* write our pid to file */
g_sprintf(text, "%d", g_getpid());
Expand Down Expand Up @@ -811,7 +813,7 @@ main(int argc, char **argv)
g_delete_wait_obj(g_get_sync_event());
g_set_sync_event(0);

if (daemon)
if (daemon && (daemon_pid == g_getpid()))
{
/* Try to delete the PID file, although if we've dropped
* privileges this won't be successful */
Expand Down