Author: Ghostwolf <foxxe@wtfs.net>

Log message:
More bug fixes...

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@657 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ircd/m_server.c b/ircd/m_server.c
index ecee91db2cff207595abf8993b7cc2722b58933b..06833a0729bb5767dd80f6ead5e2d97cc0d57b04 100644 (file)
--- a/ircd/m_server.c
+++ b/ircd/m_server.c
@@ -640,7 +640,9 @@ int mr_server(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   else
     ret = 0;
 
+#ifdef HEAD_IN_SAND_MAP
   map_update(cptr);
+#endif
 
   if (feature_bool(FEAT_RELIABLE_CLOCK) &&
       abs(cli_serv(cptr)->timestamp - recv_time) > 30) {
@@ -1080,7 +1082,9 @@ int ms_server(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   Count_newremoteserver(UserStats);
   add_client_to_list(acptr);
   hAddClient(acptr);
+#ifdef HEAD_IN_SAND_MAP
   map_update(acptr);
+#endif
 
   if (*parv[5] == 'J')
   {

diff --git a/ircd/map.c b/ircd/map.c
index 975da19c33abb47224f02651301a31bb30c45eee..21b0d862cf197c70a4089941670c65182e65e80e 100644 (file)
--- a/ircd/map.c
+++ b/ircd/map.c
@@ -33,6 +33,7 @@
 #include "ircd_reply.h"
 #include "ircd_snprintf.h"
 #include "ircd_string.h"
+#include "ircd_alloc.h"
 #include "hash.h"
 #include "list.h"
 #include "match.h"
@@ -59,7 +60,7 @@ static void map_add(struct Client *server)
   assert(!IsHub(server));
   assert(!IsService(server));
 */
-  struct Map *map = (struct Map *)MyAlloc(sizeof(struct Map));
+  struct Map *map = (struct Map *)MyMalloc(sizeof(struct Map));
 
   map->lasttime = TStime();
   strcpy(map->name, cli_name(server));

diff --git a/ircd/s_misc.c b/ircd/s_misc.c
index dab42bcd4cfb96e10101e6e22465809ff4c0f2f2..021dae6e195ccbab061b2f2d2b8586a298a46af8 100644 (file)
--- a/ircd/s_misc.c
+++ b/ircd/s_misc.c
@@ -270,8 +270,9 @@ static void exit_one_client(struct Client* bcptr, const char* comment)
       Count_serverdisconnects(UserStats);
     else
       Count_remoteserverquits(UserStats);
-    
+#ifdef HEAD_IN_SAND_MAP    
     map_update(bcptr);
+#endif
   }
   else if (IsMe(bcptr))
   {