Merge remote-tracking branch 'upstream/master'refs/pull/1257/head

Conflicts:
	plugins/netutils.c

2 files changed, 1 insertions, 7 deletions

diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
index 1ec5c39..b874c55 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();
 
@@ -837,7 +834,7 @@ int add_dhcp_offer(struct in_addr source,dhcp_packet *offer_packet){
                 return ERROR;
 
         /* process all DHCP options present in the packet */
-        for(x=4;x<MAX_DHCP_OPTIONS_LENGTH;){
+        for(x=4;x<MAX_DHCP_OPTIONS_LENGTH-1;){
 
                 if((int)offer_packet->options[x]==-1)
                         break;
diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c
index 4b4197d..8b563e4 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;