diff options
| -rw-r--r-- | lib/utils_base.c | 13 | ||||
| -rw-r--r-- | lib/utils_base.h | 3 | ||||
| -rw-r--r-- | plugins-root/check_dhcp.c | 3 | ||||
| -rw-r--r-- | plugins-root/check_icmp.c | 3 |
4 files changed, 0 insertions, 22 deletions
diff --git a/lib/utils_base.c b/lib/utils_base.c index 55d35fdd..addf26bd 100644 --- a/lib/utils_base.c +++ b/lib/utils_base.c @@ -300,19 +300,6 @@ char *np_escaped_string (const char *string) { 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; -} - /* * Extract the value from key/value pairs, or return NULL. The value returned * can be free()ed. diff --git a/lib/utils_base.h b/lib/utils_base.h index d69b0da1..42ae0c09 100644 --- a/lib/utils_base.h +++ b/lib/utils_base.h @@ -75,9 +75,6 @@ void die (int, const char *, ...) __attribute__((noreturn,format(printf, 2, 3))) /* 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); /* mp_suid() returns true if the real and effective uids differs, such as when * running a suid plugin */ diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c index b69a10da..b874c555 100644 --- a/plugins-root/check_dhcp.c +++ b/plugins-root/check_dhcp.c @@ -270,9 +270,6 @@ int main(int argc, char **argv){ usage4 (_("Could not parse arguments")); } - /* this plugin almost certainly needs root permissions. */ - np_warn_if_not_root(); - /* create socket for DHCP communications */ dhcp_socket=create_dhcp_socket(); diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c index 4b4197d8..8b563e40 100644 --- a/plugins-root/check_icmp.c +++ b/plugins-root/check_icmp.c @@ -383,9 +383,6 @@ main(int argc, char **argv) bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); - /* 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; |