added functions to utils_base:

  np_check_if_root() - returns nonzero if geteuid()==0
  np_warn_if_not_root() - uses the above to print an informative warning
added uses of these functions to check_dhcp and check_icmp.

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1718 f882894a-f735-0410-b71e-b25c423dba1c

diff --git a/lib/utils_base.c b/lib/utils_base.c
index db21ea15b47a746d0762fddca98129a4b1ce589b..da281286d80332624d54bae62f22bf41dd39e7ca 100644 (file)
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -228,3 +228,18 @@ char *np_escaped_string (const char *string) {
        data[j] = '\0';
        return data;
 }
+
+int np_check_if_root(void) { return (geteuid() == 0); }
+
+int np_warn_if_not_root(void) {
+       int status = np_check_if_root();
+       if(!status) {
+               printf(_("Warning: "));
+               printf(_("This plugin must be either run as root or setuid root.\n"));
+               printf(_("To run as root, you can use a tool like sudo.\n"));
+               printf(_("To set the setuid permissions, use the command:\n"));
+               // XXX could we use something like progname?
+               printf("\tchmod u+s yourpluginfile\n");
+       }
+       return status;
+}

diff --git a/lib/utils_base.h b/lib/utils_base.h
index b722d0eccc2dc04903faf8f4c0aef90030011ac4..bda765959ba2f72821665b705424a4b0edf01e24 100644 (file)
--- a/lib/utils_base.h
+++ b/lib/utils_base.h
@@ -43,4 +43,11 @@ void die (int, const char *, ...) __attribute__((noreturn,format(printf, 2, 3)))
 #define NP_RANGE_UNPARSEABLE 1
 #define NP_WARN_WITHIN_CRIT 2
 
+/* a simple check to see if we're running as root.  
+ * returns zero on failure, nonzero on success */
+int np_check_if_root(void);
+/* and a helpful wrapper around that.  it returns the same status
+ * code from the above function, in case it's helpful for testing */
+int np_warn_if_not_root(void);
+
 #endif /* _UTILS_BASE_ */

diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
index 8559d634e62545fce4fde4663f5c1b0a3603b2c4..7cb2d30052d34aeaad82f218869e6f2a2169303e 100644 (file)
--- a/plugins-root/check_dhcp.c
+++ b/plugins-root/check_dhcp.c
@@ -250,10 +250,13 @@ int main(int argc, char **argv){
        int dhcp_socket;
        int result = STATE_UNKNOWN;
 
+       /* this plugin almost certainly needs root permissions. */
+       np_warn_if_not_root();
+       
        setlocale (LC_ALL, "");
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
-       
+
        if(process_arguments(argc,argv)!=OK){
                usage4 (_("Could not parse arguments"));
                }

diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c
index 7e3b00f36a0a2f6b887e0433ef4868f7b453ff74..7f9160c43c7527cfcccc7b8a563401f63218f482 100644 (file)
--- a/plugins-root/check_icmp.c
+++ b/plugins-root/check_icmp.c
@@ -372,6 +372,9 @@ main(int argc, char **argv)
        int result;
        struct rta_host *host;
        
+       /* print a helpful error message if geteuid != 0 */
+       np_warn_if_not_root();
+
        /* we only need to be setsuid when we get the sockets, so do
         * that before pointer magic (esp. on network data) */
        icmp_sockerrno = udp_sockerrno = tcp_sockerrno = sockets = 0;