Skip to content

Commit

Permalink
* nscd/connections.c (restart): Try to preserve the process name
Browse files Browse the repository at this point in the history
	by reading the /proc/self/exe symlink and using the return name.
	Patch by Jeff Bastian <jbastian@redhat.com>.
  • Loading branch information
Ulrich Drepper committed Mar 16, 2009
1 parent 2ca285b commit d9822db
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
6 changes: 6 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2009-03-16 Ulrich Drepper <drepper@redhat.com>

* nscd/connections.c (restart): Try to preserve the process name
by reading the /proc/self/exe symlink and using the return name.
Patch by Jeff Bastian <jbastian@redhat.com>.

2009-03-15 Ulrich Drepper <drepper@redhat.com>

[BZ #9733]
Expand Down
17 changes: 16 additions & 1 deletion nscd/connections.c
Original file line number Diff line number Diff line change
Expand Up @@ -1418,7 +1418,22 @@ cannot change to old working directory: %s; disabling paranoia mode"),
}

/* The preparations are done. */
execv ("/proc/self/exe", argv);
#ifdef PATH_MAX
char pathbuf[PATH_MAX];
#else
char pathbuf[256];
#endif
/* Try to exec the real nscd program so the process name (as reported
in /proc/PID/status) will be 'nscd', but fall back to /proc/self/exe
if readlink fails */
ssize_t n = readlink ("/proc/self/exe", pathbuf, sizeof (pathbuf) - 1);
if (n == -1)
execv ("/proc/self/exe", argv);
else
{
pathbuf[n] = '\0';
execv (pathbuf, argv);
}

/* If we come here, we will never be able to re-exec. */
dbg_log (_("re-exec failed: %s; disabling paranoia mode"),
Expand Down

0 comments on commit d9822db

Please sign in to comment.