Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/libbb/create_icmp6_socket.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/libbb/create_icmp6_socket.c (modified) (2 diffs)

branches/2.2.5/mindi-busybox/libbb/create_icmp6_socket.c

@@ -8 +8 @@
  */
 
-#include <sys/types.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#include <errno.h>
-#include <unistd.h>
+//#include <sys/types.h>
+//#include <netdb.h>
+//#include <sys/socket.h>
 #include "libbb.h"
 
-#ifdef CONFIG_FEATURE_IPV6
+#if ENABLE_FEATURE_IPV6
 int create_icmp6_socket(void)
 {
@@ -24 +22 @@
     /* if getprotobyname failed, just silently force
      * proto->p_proto to have the correct value for "ipv6-icmp" */
-    if ((sock = socket(AF_INET6, SOCK_RAW,
-            (proto ? proto->p_proto : IPPROTO_ICMPV6))) < 0) {
+    sock = socket(AF_INET6, SOCK_RAW,
+            (proto ? proto->p_proto : IPPROTO_ICMPV6));
+    if (sock < 0) {
         if (errno == EPERM)
             bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
-        else
-            bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
+        bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
     }
 
     /* drop root privs if running setuid */
-    setuid(getuid());
+    xsetuid(getuid());
 
     return sock;