Merge branch 'master' of github.com:evilnet/x3

[irc/evilnet/x3.git] / src / tools.c

diff --git a/src/tools.c b/src/tools.c
index f982272123b6409406273a8c0df20072ad46a1e2..357c1c7c3f6eb35a6c66d4957988947115c932f6 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -367,6 +367,10 @@ irc_strtolower(char *str) {
 
 int
 irccasecmp(const char *stra, const char *strb) {
+    if (!stra)
+      return -1;
+    if (!strb)
+      return 1;
     while (*stra && (tolower(*stra) == tolower(*strb)))
         stra++, strb++;
     return tolower(*stra) - tolower(*strb);
@@ -732,6 +736,8 @@ user_matches_glob(struct userNode *user, const char *orig_glob, int flags, int s
                 return match_ircglob(user->hostname, glob);
             case 't': /* this is handled ircd side */
                 return match_ircglob(user->hostname, glob);
+            case 'R': /* this is handled ircd side */
+                return match_ircglob(user->hostname, glob);
             default:
                 return -1;
         }