crash fix

diff --git a/ChangeLog b/ChangeLog
index cb9a2a0f507d3b3cd38b7f809654fd53f3e61e1b..5389160efdefb903d8facf4a5a90f64db3da4845 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 /***********************************************************************
  X3 ChangeLog
 
+2006-09-10  Neil Spierling  <sirvulcan@gmail.com>
+
+       * src/mod-memoserv.c: Fixed crash bug.
+
+       * src/spamserv.c: Ignore opers.
+
 2006-08-28  Neil Spierling  <sirvulcan@gmail.com>
 
        * README: tweaks.

diff --git a/src/mod-memoserv.c b/src/mod-memoserv.c
index 4c9011f4a38f2e3024c5af7d9d4ae3e8ae931d9b..2ede913e5765f027ee1a2d30293c35fce9844100 100644 (file)
--- a/src/mod-memoserv.c
+++ b/src/mod-memoserv.c
@@ -1324,6 +1324,9 @@ memoserv_finalize(void) {
     str = database_get_data(conf_node, "bot", RECDB_QSTRING);
     if (str) {
         memoserv = memoserv_conf.bot;
+        const char *modes = conf_get_data("modules/memoserv/modes", RECDB_QSTRING);
+        memoserv = AddService(str, modes ? modes : NULL, "User-User Memorandum Services", NULL);
+
     } else {
         log_module(MS_LOG, LOG_ERROR, "database_get_data for memoserv_conf.bot failed!");
         exit(1);

diff --git a/src/spamserv.c b/src/spamserv.c
index 0b7b59ae7dee5b9a565eb4c0e82a369aa184bf6a..fdca15f32be70d22850be2d9143ef4491db9b597 100644 (file)
--- a/src/spamserv.c
+++ b/src/spamserv.c
@@ -1811,7 +1811,7 @@ spamserv_channel_message(struct chanNode *channel, struct userNode *user, char *
        char reason[MAXLEN];
 
        /* make sure: spamserv is not disabled; x3 is running; spamserv is in the chan; chan is regged, user does exist */
-       if(!spamserv || quit_services || !GetUserMode(channel, spamserv) || IsService(user) || !(cInfo = get_chanInfo(channel->name)) || !(uInfo = get_userInfo(user->nick)))
+       if(!spamserv || quit_services || !GetUserMode(channel, spamserv) || IsOper(user) || !(cInfo = get_chanInfo(channel->name)) || !(uInfo = get_userInfo(user->nick)))
                return;
 
        

diff --git a/x3.conf.example b/x3.conf.example
index a31fb47be751d4d8a0768286207d0fc7d007a1e3..e9e7abee35f24a48ca4ab51a91d9dec29fb169e5 100644 (file)
--- a/x3.conf.example
+++ b/x3.conf.example
@@ -592,6 +592,7 @@
      */
     "memoserv" {
         "bot" "MemoServ";
+       "modes" "+k";
         "message_expiry" "30d"; // age when messages are deleted; set
                                 // to 0 to disable message expiration
         "limit" "30"; // Max amount of messages a person can get.