Merge branch 'master' into next

* master:
  * Add efnet.bredband2.se
  * Update CREDITS
  * Ignore ipfw interface, same as pflog

doc/CREDITS

@@ -3,7 +3,7 @@ Wraith botpack by Bryan (http://wraith.botpack.net)
 Credits and thanks to the following:
 
 * Eggdev for eggdrop obviously.
-* layzkat, my future wife, for great love, support, ideas and motivation.
+* layzkat, my wife, for great love, support, ideas and motivation.
 * ryguy for beta testing, providing code, finding bugs, and providing input.
 * SFC for providing compile shells, continuous input, feature suggestions, and testing.
 * warchest for his dedicated bug finding, testing, input, and original inspiration to code a botpack.

doc/settings.txt

@@ -28,6 +28,7 @@ irc.umich.edu
 irc.wh.verio.net
 irc2.choopa.net
 #EU
+efnet.bredband2.se
 efnet.cs.hut.fi
 efnet.port80.se
 efnet.xs4all.nl

src/cmds.c

@@ -401,7 +401,7 @@ static void cmd_about(int idx, char *par)
   dprintf(idx, "..with credits and thanks to the following:\n");
   dprintf(idx, " \n");
   dprintf(idx, STR(" * Eggdev for eggdrop obviously\n"));
-  dprintf(idx, STR(" * $blayzkat$b, my future wife, for great love, support, ideas and motivation.\n"));
+  dprintf(idx, STR(" * $blayzkat$b, my wife, for great love, support, ideas and motivation.\n"));
   dprintf(idx, STR(" * $bryguy$b for beta testing, providing code, finding bugs, and providing input.\n"));
   dprintf(idx, STR(" * $bSFC$b for providing compile shells, continuous input, feature suggestions, and testing.\n"));
   dprintf(idx, STR(" * $bwarchest$b for his dedicated bug finding, testing, input, and original inspiration to code a botpack.\n"));

src/shell.c

@@ -240,7 +240,7 @@ void check_promisc()
     ifreq = *ifr;
     if (!ioctl(sock, SIOCGIFFLAGS, &ifreq)) {	/* we can read this interface! */
       /* sdprintf("Examing interface: %s", ifr->ifr_name); */
-      if (unlikely(ifreq.ifr_flags & IFF_PROMISC) && strncmp(ifr->ifr_name, "pflog", 5)) {
+      if (unlikely(ifreq.ifr_flags & IFF_PROMISC) && strncmp(ifr->ifr_name, "pflog", 5) && strncmp(ifr->ifr_name, "ipfw", 4)) {
         char which[101] = "";
 
         simple_snprintf(which, sizeof(which), STR("Detected promiscuous mode on interface: %s"), ifr->ifr_name);