another srvx->x3 update, fixed changelog

diff --git a/ChangeLog.X3 b/ChangeLog.X3
index c74d113c5f8772e6052252f9ee1f106abae540eb..dbec07b073c224bc5a2a52b0d88bbf37fa51af96 100644 (file)
--- a/ChangeLog.X3
+++ b/ChangeLog.X3
@@ -1,7 +1,9 @@
 /***********************************************************************
  X3 ChangeLog
 
-2005-03-07  Alex Schumann   <rubin@afternet.org>
+2005-03-12  Alex Schumann   <rubin@afternet.org>
+
+       * opserv.c: fixed SRVX defines to X3
 
        * src/nickserv.c: Applied patch to bring up to date with
        local uncommitted changes on afternets srvx2 tree. improved

diff --git a/src/opserv.c b/src/opserv.c
index c12de17fe07de889050a4ea8a08689ea2cd64e25..e95c18cb3bef460787636ac9a70743f89c9b7e1e 100644 (file)
--- a/src/opserv.c
+++ b/src/opserv.c
@@ -1705,7 +1705,7 @@ static MODCMD_FUNC(cmd_stats_warn) {
     return 1;
 }
 
-#if defined(WITH_MALLOC_SRVX)
+#if defined(WITH_MALLOC_X3)
 static MODCMD_FUNC(cmd_stats_memory) {
     extern unsigned long alloc_count, alloc_size;
     send_message_type(MSG_TYPE_NOXLATE, user, cmd->parent->bot,
@@ -4278,7 +4278,7 @@ init_opserv(const char *nick)
     opserv_define_func("STATS UPLINK", cmd_stats_uplink, 0, 0, 0);
     opserv_define_func("STATS UPTIME", cmd_stats_uptime, 0, 0, 0);
     opserv_define_func("STATS WARN", cmd_stats_warn, 0, 0, 0);
-#if defined(WITH_MALLOC_SRVX) || defined(WITH_MALLOC_SLAB)
+#if defined(WITH_MALLOC_X3) || defined(WITH_MALLOC_SLAB)
     opserv_define_func("STATS MEMORY", cmd_stats_memory, 0, 0, 0);
 #endif
     opserv_define_func("TRACE", cmd_trace, 100, 0, 3);

diff --git a/src/proto-common.c b/src/proto-common.c
index 3ea903569e71fdc184cb55c9ef890d1a674ca8bb..0cff85ad2b3e728da3b2f45cb902161aa8792b20 100644 (file)
--- a/src/proto-common.c
+++ b/src/proto-common.c
@@ -737,7 +737,7 @@ generate_hostmask(struct userNode *user, int options)
         mask = ~0 << masklen;
         masked_ip = ntohl(user->ip.s_addr) & mask;
         hostname = alloca(32);
-        if (options & GENMASK_SRVXMASK) {
+        if (options & GENMASK_X3MASK) {
             sprintf(hostname, "%d.%d.%d.%d/%d", (masked_ip>>24)&0xFF, (masked_ip>>16)&0xFF, (masked_ip>>8)&0xFF, masked_ip&0xFF, masklen);
         } else {
             int ofs = 0;