make regex case sensitive, and old memoserv fix

diff --git a/src/mod-memoserv.c b/src/mod-memoserv.c
index ce3542b155b38c393e484464e77e5d53649ab827..86964fdbdab3c723407f6b00c21991349326d412 100644 (file)
--- a/src/mod-memoserv.c
+++ b/src/mod-memoserv.c
@@ -548,11 +548,6 @@ static MODCMD_FUNC(cmd_read)
     char posted[24];
     struct tm tm;
 
-    if (!(ma = memoserv_get_account(user->handle_info)))
-        return 0;
-    if (!(memo = find_memo(user, cmd, ma, argv[1], &memoid)))
-        return 0;
-
     if (argc > 2) {
         char *argtwo = argv[2];
         while (*argtwo) {
@@ -579,6 +574,12 @@ static MODCMD_FUNC(cmd_read)
         }
     }
 
+    if (!(ma = memoserv_get_account(user->handle_info)))
+        return 0;
+    
+    if (!(memo = find_memo(user, cmd, ma, argv[1], &memoid)))
+        return 0;
+
     localtime_r(&memo->sent, &tm);
     strftime(posted, sizeof(posted), "%I:%M %p, %m/%d/%Y", &tm);
 

diff --git a/src/opserv.c b/src/opserv.c
index b3f3b97b33f8e0e1b533855a8156f63daadacc09..fa97cec85013debfb33e010eb5847010e7c07f5b 100644 (file)
--- a/src/opserv.c
+++ b/src/opserv.c
@@ -5503,7 +5503,7 @@ opserv_discrim_create(struct userNode *user, struct userNode *bot, unsigned int
     {
         if(discrim->mask_nick)
         {
-            int err = regcomp(&discrim->regex_nick, discrim->mask_nick, REG_EXTENDED|REG_ICASE|REG_NOSUB);
+            int err = regcomp(&discrim->regex_nick, discrim->mask_nick, REG_EXTENDED|REG_NOSUB);
             discrim->has_regex_nick = !err;
             if(err)
             {
@@ -5517,7 +5517,7 @@ opserv_discrim_create(struct userNode *user, struct userNode *bot, unsigned int
 
         if(discrim->mask_ident)
         {
-            int err = regcomp(&discrim->regex_ident, discrim->mask_ident, REG_EXTENDED|REG_ICASE|REG_NOSUB);
+            int err = regcomp(&discrim->regex_ident, discrim->mask_ident, REG_EXTENDED|REG_NOSUB);
             discrim->has_regex_ident = !err;
             if(err)
             {
@@ -5531,7 +5531,7 @@ opserv_discrim_create(struct userNode *user, struct userNode *bot, unsigned int
 
         if(discrim->mask_host)
         {
-            int err = regcomp(&discrim->regex_host, discrim->mask_host, REG_EXTENDED|REG_ICASE|REG_NOSUB);
+            int err = regcomp(&discrim->regex_host, discrim->mask_host, REG_EXTENDED|REG_NOSUB);
             discrim->has_regex_host = !err;
             if(err)
             {
@@ -5545,7 +5545,7 @@ opserv_discrim_create(struct userNode *user, struct userNode *bot, unsigned int
 
         if(discrim->mask_info)
         {
-            int err = regcomp(&discrim->regex_info, discrim->mask_info, REG_EXTENDED|REG_ICASE|REG_NOSUB);
+            int err = regcomp(&discrim->regex_info, discrim->mask_info, REG_EXTENDED|REG_NOSUB);
             discrim->has_regex_info = !err;
             if(err)
             {
@@ -5559,7 +5559,7 @@ opserv_discrim_create(struct userNode *user, struct userNode *bot, unsigned int
 
         if(discrim->mask_version)
         {
-            int err = regcomp(&discrim->regex_version, discrim->mask_version, REG_EXTENDED|REG_ICASE|REG_NOSUB);
+            int err = regcomp(&discrim->regex_version, discrim->mask_version, REG_EXTENDED|REG_NOSUB);
             discrim->has_regex_version = !err;
             if(err)
             {