implement IAUTH client code to query a separate server before allowing

[ircu2.10.12-pk.git] / ircd / map.c

diff --git a/ircd/map.c b/ircd/map.c
index 77119ff0ef7af64439b657180af586315caa9cf7..52d68388041fe33014172c0d3fe384144c871735 100644 (file)
--- a/ircd/map.c
+++ b/ircd/map.c
@@ -26,10 +26,10 @@
 
 #include "config.h"
 
+#include "map.h"
 #include "client.h"
 #include "ircd.h"
 #include "ircd_defs.h"
-#include "ircd_policy.h"
 #include "ircd_reply.h"
 #include "ircd_snprintf.h"
 #include "ircd_string.h"
@@ -43,14 +43,11 @@
 #include "s_serv.h"
 #include "send.h"
 #include "querycmds.h"
-#include "map.h"
 
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
 
-#if defined(HEAD_IN_SAND_MAP) || defined(HEAD_IN_SAND_LINKS)
-
 static struct Map *MapList = 0;
 
 /* Add a server to the map list. */
@@ -133,7 +130,6 @@ void map_update(struct Client *cptr)
   if(!map)
     map_add(cptr);
 }
-#endif /* HEAD_IN_SAND_MAP || HEAD_IN_SAND_LINKS*/ 
 
 #ifdef HEAD_IN_SAND_MAP
 
@@ -237,15 +233,15 @@ void map_dump(struct Client *cptr, struct Client *server, char *mask, int prompt
   strcpy(p, "|-");
   for (lp = cli_serv(server)->down; lp; lp = lp->next)
     if (match(mask, cli_name(lp->value.cptr)))
-      cli_flags(lp->value.cptr) &= ~FLAGS_MAP;
+      ClrFlag(lp->value.cptr, FLAG_MAP);
     else
     {
-      cli_flags(lp->value.cptr) |= FLAGS_MAP;
+      SetFlag(lp->value.cptr, FLAG_MAP);
       cnt++;
     }
   for (lp = cli_serv(server)->down; lp; lp = lp->next)
   {
-    if ((cli_flags(lp->value.cptr) & FLAGS_MAP) == 0)
+    if (!HasFlag(lp->value.cptr, FLAG_MAP))
       continue;
     if (--cnt == 0)
       *p = '`';