View | Details | Raw Unified | Return to bug 95253
Collapse All | Expand All

(-)mrtg/files/mrtg_daemon.sh.in (-1 / +2 lines)
Lines 17-25 Link Here
17
: ${mrtg_daemon_enable="NO"}
17
: ${mrtg_daemon_enable="NO"}
18
: ${mrtg_daemon_pidfile="/var/run/mrtg/mrtg.pid"}
18
: ${mrtg_daemon_pidfile="/var/run/mrtg/mrtg.pid"}
19
: ${mrtg_daemon_user="mrtg"}
19
: ${mrtg_daemon_user="mrtg"}
20
: ${mrtg_daemon_group="mrtg"}
20
: ${mrtg_daemon_config="%%PREFIX%%/etc/mrtg/mrtg.cfg"}
21
: ${mrtg_daemon_config="%%PREFIX%%/etc/mrtg/mrtg.cfg"}
21
22
22
: ${mrtg_daemon_flags="--pid-file $mrtg_daemon_pidfile --lock-file /var/run/mrtg/lockfile --confcache-file /var/run/mrtg/confcache --user $mrtg_daemon_user --group $mrtg_daemon_user --daemon $mrtg_daemon_config"}
23
: ${mrtg_daemon_flags="--pid-file $mrtg_daemon_pidfile --lock-file /var/run/mrtg/lockfile --confcache-file /var/run/mrtg/confcache --user $mrtg_daemon_user --group $mrtg_daemon_group --daemon $mrtg_daemon_config"}
23
24
24
start_precmd="mrtg_daemon_precmd"
25
start_precmd="mrtg_daemon_precmd"
25
26
(-)mrtg/files/patch-bin_mrtg (+22 lines)
Line 0 Link Here
1
--- mrtg.old	Fri Feb  3 07:33:33 2006
2
+++ mrtg	Mon Apr  3 11:30:45 2006
3
@@ -172,11 +172,17 @@
4
     my $gid = $(;
5
 
6
     if (defined $opts{group}) {
7
-        $gid = getgrnam($opts{group}) or die "ERROR: Unknown Group: $opts{group})\n";
8
+	$gid = getgrnam($opts{group});
9
+	if( $gid =~ /^$/ ) {
10
+		die "ERROR: Unknown Group: $opts{group}\n";
11
+	}
12
     }
13
 
14
     if (defined $opts{user}) {
15
-        $uid = getpwnam($opts{user}) or die "ERROR: Unknown User: $opts{user})\n";
16
+	$uid = getpwnam($opts{user});
17
+	if( $uid =~ /^$/ ) {
18
+		die "ERROR: Unknown User: $opts{user}\n";
19
+	}
20
     }
21
 
22
     # If we've specified using FHS (http://www.pathname.com/fhs/) on the command line,

Return to bug 95253