Attachment 63956 Details for Bug 95253 – mrtg.diff

[patch] mrtg.diff

mrtg.diff (text/plain), 1.72 KB, created by Oliver Lehmann on 2006-04-03 10:40:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oliver Lehmann

Created: 2006-04-03 10:40:16 UTC

Size: 1.72 KB

patch

obsolete

>diff -ruN mrtg.old/files/mrtg_daemon.sh.in mrtg/files/mrtg_daemon.sh.in
>--- mrtg.old/files/mrtg_daemon.sh.in	Mon Apr  3 11:32:27 2006
>+++ mrtg/files/mrtg_daemon.sh.in	Mon Apr  3 11:34:48 2006
>@@ -17,9 +17,10 @@
> : ${mrtg_daemon_enable="NO"}
> : ${mrtg_daemon_pidfile="/var/run/mrtg/mrtg.pid"}
> : ${mrtg_daemon_user="mrtg"}
>+: ${mrtg_daemon_group="mrtg"}
> : ${mrtg_daemon_config="%%PREFIX%%/etc/mrtg/mrtg.cfg"}
> 
>-: ${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"}
>+: ${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"}
> 
> start_precmd="mrtg_daemon_precmd"
> 
>diff -ruN mrtg.old/files/patch-bin_mrtg mrtg/files/patch-bin_mrtg
>--- mrtg.old/files/patch-bin_mrtg	Thu Jan  1 01:00:00 1970
>+++ mrtg/files/patch-bin_mrtg	Mon Apr  3 11:33:48 2006
>@@ -0,0 +1,22 @@
>+--- mrtg.old	Fri Feb  3 07:33:33 2006
>++++ mrtg	Mon Apr  3 11:30:45 2006
>+@@ -172,11 +172,17 @@
>+     my $gid = $(;
>+ 
>+     if (defined $opts{group}) {
>+-        $gid = getgrnam($opts{group}) or die "ERROR: Unknown Group: $opts{group})\n";
>++	$gid = getgrnam($opts{group});
>++	if( $gid =~ /^$/ ) {
>++		die "ERROR: Unknown Group: $opts{group}\n";
>++	}
>+     }
>+ 
>+     if (defined $opts{user}) {
>+-        $uid = getpwnam($opts{user}) or die "ERROR: Unknown User: $opts{user})\n";
>++	$uid = getpwnam($opts{user});
>++	if( $uid =~ /^$/ ) {
>++		die "ERROR: Unknown User: $opts{user}\n";
>++	}
>+     }
>+ 
>+     # If we've specified using FHS (http://www.pathname.com/fhs/) on the command line,

Actions: View | Diff

Attachments on bug 95253: 63956