BUILD : 1.7.5 (404) BUGS : NOTES : Fixed bug 188.

git-svn-id: svn://svn.anope.org/anope/trunk@404 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@268 5417fbe8-f217-4b02-8779-1006273d7864

3 files changed, 31 insertions, 1 deletions

diff --git a/Changes b/Changes
index c0f18add0..6cea8522d 100644
--- a/Changes
+++ b/Changes
@@ -5,6 +5,7 @@ Provided by Anope Dev. <dev@anope.org> - 2004
 09/20 A Added RestrictOperNicks as new feature in services.conf.          [ #00]
 09/08 A Removed rand() and ported bsd's arc4random() to fit our needs.    [ #00]
 08/24 A New -l option for am script to list possible selectors.           [ #00]
+10/16 F Fixed RestrictOperNicks for /ns group command.                    [#188]
 10/13 F Type in comments on all src files - yay.                          [ #00]
 10/12 F Code Tidy, fixed some error checking.                             [ #00]
 10/09 F Bug in LogChannel possibly causing segfaults.                     [#176]
diff --git a/src/nickserv.c b/src/nickserv.c
index 8e3974ef8..784efa341 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -2319,6 +2319,7 @@ static int do_confirm(User * u)
 static int do_group(User * u)
 {
     NickAlias *na, *target;
+    NickCore *nc;
     char *nick = strtok(NULL, " ");
     char *pass = strtok(NULL, " ");
     int i;
@@ -2338,6 +2339,30 @@ static int do_group(User * u)
         return MOD_CONT;
     }
 
+    if (RestrictOperNicks) {
+        for (i = 0; i < RootNumber; i++) {
+            if (strstr(u->nick, ServicesRoots[i]) && !is_oper(u)) {
+                notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED,
+                            u->nick);                  
+                return MOD_CONT;
+            }
+        }
+        for (i = 0; i < servadmins.count && (nc = servadmins.list[i]); i++) {
+            if (strstr(u->nick, nc->display) && !is_oper(u)) {
+                notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED,
+                            u->nick);
+                return MOD_CONT;
+            }
+        }
+        for (i = 0; i < servopers.count && (nc = servopers.list[i]); i++) {
+            if (strstr(u->nick, nc->display) && !is_oper(u)) {
+                notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED,
+                            u->nick);
+                return MOD_CONT;
+            }
+        }         
+    }
+
     if (!nick || !pass) {
         syntax_error(s_NickServ, u, "GROUP", NICK_GROUP_SYNTAX);
     } else if (time(NULL) < u->lastnickreg + NSRegDelay) {
diff --git a/version.log b/version.log
index 74f4d4068..1f98d8370 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="5"
-VERSION_BUILD="403"
+VERSION_BUILD="404"
 
 # $Log$
 #
+# BUILD : 1.7.5 (404)
+# BUGS  : 
+# NOTES : Fixed bug 188.
+#
 # BUILD : 1.7.5 (403)
 # BUGS  : 186
 # NOTES : Fixed anope_cmd_server() in some protocol files it was broken