From 48e80ff2df41d4374d1238d50ec75e880e938040 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Mon, 14 Apr 2008 17:25:29 +0000 Subject: [PATCH] Take precedence of -i, generated path for pidfile under non-root only as default. --- org.glite.lb.server/src/bkserverd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/org.glite.lb.server/src/bkserverd.c b/org.glite.lb.server/src/bkserverd.c index 2b59d98..b861495 100644 --- a/org.glite.lb.server/src/bkserverd.c +++ b/org.glite.lb.server/src/bkserverd.c @@ -368,7 +368,7 @@ int main(int argc, char *argv[]) { int i; struct sockaddr_in a; - int opt; + int opt, pidfile_forced = 0; char pidfile[PATH_MAX] = EDG_BKSERVERD_PIDFILE, *name; #ifdef GLITE_LB_SERVER_WITH_WS @@ -446,7 +446,7 @@ int main(int argc, char *argv[]) } break; case 'X': notif_ilog_socket_path = strdup(optarg); break; case 'Y': notif_ilog_file_prefix = strdup(optarg); break; - case 'i': strcpy(pidfile,optarg); break; + case 'i': strcpy(pidfile,optarg); pidfile_forced = 1; break; case 'R': add_root(optarg); break; case 'F': if (read_roots(optarg)) return 1; break; @@ -498,7 +498,8 @@ int main(int argc, char *argv[]) slaves = 2; } - if (geteuid()) snprintf(pidfile,sizeof pidfile, "%s/edg-bkserverd.pid", getenv("HOME")); + if (!pidfile_forced && geteuid()) + snprintf(pidfile,sizeof pidfile, "%s/edg-bkserverd.pid", getenv("HOME")); fpid = fopen(pidfile,"r"); if ( fpid ) -- 1.8.2.3