5 files changed, 71 insertions, 120 deletions
diff --git a/FAQ b/FAQ
index 370ac997..5ba948f1 100644
--- a/FAQ
+++ b/FAQ
@@ -1,87 +1,93 @@
 Frequently Asked Questions
 **************************
-1.  Q: Where can I find documentation for <insert name> plugin?
+Q: Where can I find documentation for <insert name> plugin?
-    A: All plugins that comply with minimal development guideline for
+A: All plugins that comply with minimal development guideline for
-    this project include internal documentation.  The documentation
+   this project include internal documentation.  The documentation
-    can be read executing plugin with the '-h' option ('--help' if
+   can be read executing plugin with the -h or --help option. If 
-    long options are enabled).  If the '-h' option does not work, that
+   the '-h' option does not work, that is a bug.
-    is a bug.
-2.  Q: What version of <insert name> plugin am I running?
-    A: All plugins that comply with minimal development guideline for
+Q: What version of <insert name> plugin am I running?
-    this project include detailed version information.  When executed
-    with the '-V' option, a version string will be printed:
-    check_radius (nagios-plugins 1.3.0-alpha1) 1.11
+A: All plugins that comply with minimal development guideline for
+   this project include detailed version information.  When executed
+   with the '-V' option, a version string will be printed:
-    Note that this string include both the assigned package release
+   check_radius (nagios-plugins 1.3.0-alpha1) 1.11
-    name and the CVS-generated revision for the individual plugin.
-    Authors should strictly adhere to this format.  All bug reports
-    and help requests should reference this information.
-3.  Q: What information do I need to include when asking for help or
+   Note that this string include both the assigned package release
-    submitting a bug report?
+   name and the CVS-generated revision for the individual plugin.
+   Authors should strictly adhere to this format.  All bug reports
+   and help requests should reference this information.
-    A: At a minimum, the output from 'uname -a' and the version string
-    from '<plugin_name> -V' and, of course, a description of the
-    problem and any solution/patch.
-4.  Q: I'm using Redhat Linux (or some other RPM-based distribution).
+Q: What information do I need to include when asking for help or
-    Which packages should I install?
+   submitting a bug report?
-    A: The package nagios-plugins-<version>.<arch>.rpm contains only
+A: At a minimum, the output from 'uname -a' and the version string
-    those plugins that should work on any POSIX compliant system.  In
+   from '<plugin_name> -V' and, of course, a description of the
-    other words, you should be able to install this package on your
+   problem and any solution/patch.
-    system, no matter what else is or in not installed.
-    However, most of us have more complex systems than barebones
-    POSIX.  We tried creating a variety of separate packages so
-    each dependency could be installed cleanly, but many people
-    found that this resulted in too many packages.  So in the end,
-    all the non-POSIX plugins were folded into one RPM 
-    (nagios-plugins-<version>.<arch>.rpm).  Most people will need to
-    use RPM's '--nodeps' option to install this package.
-5.  Q: My system uses the .deb package format. What packages should I
+Q: I'm using Redhat Linux (or some other RPM-based distribution).
-    install?
+   Which packages should I install?
-    A: We strive for cooperation between all packagers and developers.
+A: The package nagios-plugins-<version>.<arch>.rpm contains only
-    The answers for .deb are the same as for RPM, after changing the
+   those plugins that should work on any POSIX compliant system.  In
-    package name suffixes accordingly.
+   other words, you should be able to install this package on your
+   system, no matter what else is or in not installed.
-6.  Q: I prefer to build my own RPMs. Do I need to install all of the
+   However, most of us have more complex systems than barebones
-    various dependencies?
+   POSIX.  We tried creating a variety of separate packages so
+   each dependency could be installed cleanly, but many people
+   found that this resulted in too many packages.  So in the end,
+   all the non-POSIX plugins were folded into one RPM 
+   (nagios-plugins-<version>.<arch>.rpm).  Most people will need to
+   use RPM's '--nodeps' option to install this package.
-    A: Beginning with the 1.2.9-1 release, you may run
-      rpm --define 'custom 1' -ta nagios-plugins-<release>.tar.gz
+Q: My system uses the .deb package format. What packages should I
+   install?
-    In prior releases, you must unpack the tarball and build the
+A: We strive for cooperation between all packagers and developers.
-    RPM using nagios-custom.spec with 'rpm -ba'.
+   The answers for .deb are the same as for RPM, after changing the
+   package name suffixes accordingly.
-7.  Q: I get an error like
-      Warning: Return code of 127 for check of service 'PING' on host 'anyhost' was out of bounds.
+Q: I prefer to build my own RPMs. Do I need to install all of the
+   various dependencies?
-    when I run Nagios. (Often check_ping runs just fine on the
+A: Beginning with the 1.2.9-1 release, you may run
-    command line).
-    A: Commonly, system administrators will make security as tight as
+   rpm --define 'custom 1' -ta nagios-plugins-<release>.tar.gz
-    possible on the monitoring system. Sometimes this includes OS
-    options or hardening scripts that prevent unprivileged users from
-    running the ping command. Nagios runs with no more privileges
-    than 'nobody' -- check to be sure that the nagios user can
-    actually run check ping.  (This can also happen with other binaries
-    executed by nagios, but ping seems to be far and away the biggest
-    offender.)
-8.  Q: I have a plugin to offer. What do I do to get it accepted?
+   In prior releases, you must unpack the tarball and build the
+   RPM using nagios-custom.spec with 'rpm -ba'.
-    A: Send it to nagiosplug-devel@lists.sourceforge.net. Usually, we
-    just drop it into contrib until we have a chance to check if the
-    standard options are used, etc.
-    You can also get feedback on improving the plugin via the mailing list.
+Q: I get an error like
+   Warning: Return code of 127 for check of service 'PING' on host 'anyhost' was out of bounds.
+   when I run Nagios. (Often check_ping runs just fine on the
+   command line).
+A: Commonly, system administrators will make security as tight as
+   possible on the monitoring system. Sometimes this includes OS
+   options or hardening scripts that prevent unprivileged users from
+   running the ping command. Nagios runs with no more privileges
+   than 'nobody' -- check to be sure that the nagios user can
+   actually run check ping.  (This can also happen with other binaries
+   executed by nagios, but ping seems to be far and away the biggest
+   offender.)
+Q: I have a plugin to offer. What can I do?
+A: You can make it available on NagiosExchange (http://nagiosexchange.org)
+   where other people can find it for use.
+   You can also get feedback on improving the plugin via the 
+   nagiosplug-devel@lists.sourceforge.net mailing list.
diff --git a/INSTALLING b/INSTALLING
deleted file mode 100644
index 019feb4c..00000000
--- a/INSTALLING
+++ /dev/null
@@ -1,52 +0,0 @@
-Nagios Plugins Quick-and-Dirty Installation Instructions
--------------------------------------------------------
-0) If using the CVS tree, you need:
-        gnu make 3.79
-        automake 1.9.2
-        autoconf 2.58
-   To start out, run:
-        tools/setup
-1) Run the configure script to initialize variables and create a Makefile, etc.
-        ./configure --prefix=BASEDIRECTORY --with-cgiurl=SOMEURL
-   a) Replace BASEDIRECTORY with the path of the directory under which Nagios
-      is installed (default is '/usr/local/nagios')
-   b) Replace CGIURL with the path used to access the Nagios CGIs with
-      a web browser (default is '/nagios/cgi-bin')
-2) Compile the plugins with the following command:
-        make all
-3) Test the plugins:
-        make test
-   You will need to answer questions on servers that can be used for testing. If
-   you need to edit any values, edit the file /var/tmp/NPTest.cache
-4) Install the compiled plugins and plugin scripts with the following command:
-        make install
-   NOTE: 
-   The installation procedure will attempt to place the plugins in a 
-   'libexec/' subdirectory in the base directory you specified with
-   the --prefix argument to the configure script.
-5) Verify that your host configuration file (hosts.cfg) for Nagios contains
-   the correct paths to the new plugins.
-That's it.  If you have any problems or questions, feel free send mail
-to nagios-users@lists.sourceforge.net or nagiosplug-help@lists.sourceforge.net
-Please send patches and bugs to nagiosplug-devel@lists.sourceforge.net and
-post them on http://sourceforge.net/projects/nagiosplug.
diff --git a/NEWS b/NEWS
index dafdaeef..67b6877c 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ This file documents the major additions and syntax changes between releases.
 ??    ??
        Fixed MKINSTALLDIRS problem in po/
+        Root plugins installed with world executable
        check_sybase from contrib now maintained in NagiosExchange
 1.4.6 5th February 2007
diff --git a/README b/README
index 13b46a2e..b06d5b5d 100644
--- a/README
+++ b/README
@@ -60,15 +60,11 @@ Nagios Plugins Quick-and-Dirty Installation Instructions
 1) Run the configure script to initialize variables and create a Makefile, etc.
-        ./configure --prefix=BASEDIRECTORY --with-nagios-user=SOMEUSER --with-nagios-group=SOMEGROUP --with-cgiurl=SOMEURL
+        ./configure --prefix=BASEDIRECTORY --with-cgiurl=SOMEURL
   a) Replace BASEDIRECTORY with the path of the directory under which Nagios
      is installed (default is '/usr/local/nagios')
-   b) Replace SOMEUSER with the name of a user on your system that will be
+   b) Replace CGIURL with the path used to access the Nagios CGIs with
-      assigned permissions to the installed plugins (default is 'nagios')
-   c) Replace SOMEGRP with the name of a group on your system that will be
-      assigned permissions to the installed plugins (default is 'nagios')
-   d) Replace CGIURL with the path used to access the Nagios CGIs with
      a web browser (default is '/nagios/cgi-bin')
diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am
index d2e4e8bd..a36e120a 100644
--- a/plugins-root/Makefile.am
+++ b/plugins-root/Makefile.am
@@ -26,7 +26,7 @@ TESTS = @PLUGIN_TEST@
 test:
        perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
-setuid_root_mode = 4550
+setuid_root_mode = a=rx,u+s
 # /* Author Coreutils team - see ACKNOWLEDGEMENTS */