From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Wed, 14 Feb 2007 10:33:03 +0000 (+0000)
Subject: fix bug #23350
X-Git-Tag: glite-lb-server_R_1_3_11_1~1
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=a4efcf5486611c2ae6d0d0805f106b4f05f45de0;p=jra1mw.git

fix bug #23350
---

diff --git a/org.glite.lb.server/config/startup b/org.glite.lb.server/config/startup
index 5122b2b..2c9bd45 100755
--- a/org.glite.lb.server/config/startup
+++ b/org.glite.lb.server/config/startup
@@ -34,6 +34,7 @@ start()
 		fi
 	fi
 
+	super="--super-users-file $GLITE_LOCATION/etc/LB-super-users"
 
 	[ -z "$creds" ] && echo $0: WARNING: No credentials specified. Using default lookup which is dangerous. >&2
 
@@ -43,7 +44,7 @@ start()
 	su - $GLITE_USER -c "$GLITE_LOCATION/bin/glite-lb-bkserverd \
 		--notif-il-sock=/tmp/glite-lb-notif.sock \
 		--notif-il-fprefix=/var/tmp/glite-lb-notif \
-		$creds -i $pidfile $port" && echo " done" || echo " FAILED"
+		$super $creds -i $pidfile $port" && echo " done" || echo " FAILED"
 
 	echo -n Starting glite-lb-notif-interlogd ...
 	su - $GLITE_USER -c "$GLITE_LOCATION/bin/glite-lb-notif-interlogd \
diff --git a/org.glite.lb.server/src/bkserverd.c b/org.glite.lb.server/src/bkserverd.c
index 3ee00ab..0eab69f 100644
--- a/org.glite.lb.server/src/bkserverd.c
+++ b/org.glite.lb.server/src/bkserverd.c
@@ -1376,8 +1376,9 @@ static int read_roots(const char *file)
 	int	cnt = 0;
 
 	if (!roots) {
-		perror(file);
-		return 1;
+		syslog(LOG_WARNING,"%s: %m, continuing without --super-users-file",file);
+		dprintf(("%s: %s, continuing without --super-users-file\n",file,strerror(errno)));
+		return 0;
 	}
 
 	while (!feof(roots)) {