* src/main.cpp: Make the capability imports conditional.

* src/nethogs.cpp: Make the capability check conditional. Bug fix in the != test.

src/main.cpp

@@ -173,20 +173,19 @@ int main(int argc, char **argv) {
     init_ui();
   }
 
-  if (NEEDROOT) {
+#if NEEDROOT == 1
   if (geteuid() != 0)
     forceExit(false, "You need to be root to run NetHogs!");
-  }
-  else {
+#else
   unsigned int caps[5] = {0};
 
   getxattr(argv[0], "security.capability", (char *)caps, sizeof(caps));
 
-    if ((caps[1] >> CAP_NET_ADMIN) & 1 != 1)
+  if (((caps[1] >> CAP_NET_ADMIN) & 1) != 1)
     forceExit(false, "You need to enable cap_net_admin (and cap_net_raw) to run NetHogs!");
-    if ((caps[1] >> CAP_NET_RAW) & 1 != 1)
+  if (((caps[1] >> CAP_NET_RAW) & 1) != 1)
     forceExit(false, "You need to enable cap_net_raw to run NetHogs!");
-  }
+#endif
 
   // use the Self-Pipe trick to interrupt the select() in the main loop
   self_pipe = create_self_pipe();

src/nethogs.cpp

@@ -37,9 +37,12 @@
 #include <netinet/ip6.h>
 #include <netinet/tcp.h>
 #include <netinet/udp.h>
+
+#if NEEDROOT == 0
 #include <sys/types.h>
 #include <sys/xattr.h>
 #include <linux/capability.h>
+#endif
 
 #include "cui.h"