- fixed ambiguous condition in init script (exit 4)

This commit is contained in:
Jiri Skala 2009-04-28 09:07:53 +00:00
parent 7478213d80
commit 3ca187fe36
3 changed files with 10 additions and 7 deletions

View File

@ -1,6 +1,6 @@
diff -up radvd-1.2/redhat/radvd.init.posix radvd-1.2/redhat/radvd.init diff -up radvd-1.2/redhat/radvd.init.posix radvd-1.2/redhat/radvd.init
--- radvd-1.2/redhat/radvd.init.posix 2009-04-27 21:56:39.000000000 +0200 --- radvd-1.2/redhat/radvd.init.posix 2008-02-27 14:02:59.000000000 +0100
+++ radvd-1.2/redhat/radvd.init 2009-04-27 21:59:22.000000000 +0200 +++ radvd-1.2/redhat/radvd.init 2009-04-28 11:05:07.000000000 +0200
@@ -28,12 +28,6 @@ @@ -28,12 +28,6 @@
[ -f /etc/sysconfig/radvd ] && . /etc/sysconfig/radvd [ -f /etc/sysconfig/radvd ] && . /etc/sysconfig/radvd
@ -25,8 +25,8 @@ diff -up radvd-1.2/redhat/radvd.init.posix radvd-1.2/redhat/radvd.init
+ if [ ! -f /etc/radvd.conf ]; then + if [ ! -f /etc/radvd.conf ]; then
+ echo "Configuration file /etc/radvd.conf missing" 1>&2 + echo "Configuration file /etc/radvd.conf missing" 1>&2
+ exit 6 + exit 6
+ fi + fi
+ if [ ! -x /usr/sbin/radvd ]; then + if [ `id -u` -ne 0 ]; then
+ echo "Insufficient privilege" 1>&2 + echo "Insufficient privilege" 1>&2
+ exit 4 + exit 4
+ fi + fi

View File

@ -39,7 +39,7 @@ case "$1" in
echo "Configuration file /etc/radvd.conf missing" 1>&2 echo "Configuration file /etc/radvd.conf missing" 1>&2
exit 6 exit 6
fi fi
if [ ! -x /usr/sbin/radvd ]; then if [ `id -u` -ne 0 ]; then
echo "Insufficient privilege" 1>&2 echo "Insufficient privilege" 1>&2
exit 4 exit 4
fi fi

View File

@ -5,7 +5,7 @@
Summary: A Router Advertisement daemon Summary: A Router Advertisement daemon
Name: radvd Name: radvd
Version: 1.2 Version: 1.2
Release: 1%{?dist} Release: 2%{?dist}
# The code includes the advertising clause, so it's GPL-incompatible # The code includes the advertising clause, so it's GPL-incompatible
License: BSD with advertising License: BSD with advertising
Group: System Environment/Daemons Group: System Environment/Daemons
@ -95,7 +95,10 @@ fi
%{_sbindir}/radvdump %{_sbindir}/radvdump
%changelog %changelog
* Mon Apr 28 2009 Jiri Skala <jskala@redhat.com> - 1.2-1 * Tue Apr 28 2009 Jiri Skala <jskala@redhat.com> - 1.2-2
- fixed ambiguous condition in init script (exit 4)
* Mon Apr 27 2009 Jiri Skala <jskala@redhat.com> - 1.2-1
- updated to latest upstream version - updated to latest upstream version
* Fri Feb 27 2009 Jiri Skala <jskala@redhat.com> - 1.1-8 * Fri Feb 27 2009 Jiri Skala <jskala@redhat.com> - 1.1-8