summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrob rob@31f1291d-b8d6-0310-a050-a5561fc1590b <rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2006-06-25 22:05:00 +0000
committerrob rob@31f1291d-b8d6-0310-a050-a5561fc1590b <rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2006-06-25 22:05:00 +0000
commit5dd84294b7a0239b9721822f34394ad26c291ad6 (patch)
tree46bdb1f0ad49036aeaed0785cad17f20dead5fe7
parent90252bbeccbfde0e28a13b58edb463d3b6463b8f (diff)
BUILD : 1.7.14 (1074) BUGS : N/A NOTES : Small patch by ThaPrince for ircds with modes on id
git-svn-id: svn://svn.anope.org/anope/trunk@1074 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@798 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r--Changes1
-rw-r--r--src/core/ns_group.c6
-rw-r--r--src/core/ns_identify.c6
-rw-r--r--src/core/ns_register.c6
-rw-r--r--version.log6
5 files changed, 15 insertions, 10 deletions
diff --git a/Changes b/Changes
index 972420f6a..80c0da238 100644
--- a/Changes
+++ b/Changes
@@ -42,6 +42,7 @@ Provided by Anope Dev. <dev@anope.org> - 2006
Provided by ThaPrince <jon@vile.com> - 2006
05/19 A Plexus 3 support. [ #00]
+06/25 F root/admin/oper mode now honours secure. [ #00]
Provided by Trystan <trystan@nomadirc.net> - 2006
06/15 F NS Resend delay. [ #00]
diff --git a/src/core/ns_group.c b/src/core/ns_group.c
index b50085c69..e29a225da 100644
--- a/src/core/ns_group.c
+++ b/src/core/ns_group.c
@@ -233,11 +233,11 @@ int do_group(User * u)
if (ircd->modeonreg) {
len = strlen(ircd->modeonreg);
strncpy(modes,ircd->modeonreg,512);
- if(ircd->rootmodeonid && (u->na->nc->flags & NI_SERVICES_ROOT)) {
+ if(ircd->rootmodeonid && is_services_root(u)) {
strncat(modes,ircd->rootmodeonid,512-len);
- } else if(ircd->adminmodeonid && (u->na->nc->flags & NI_SERVICES_ADMIN)) {
+ } else if(ircd->adminmodeonid && is_services_admin(u)) {
strncat(modes,ircd->adminmodeonid,512-len);
- } else if(ircd->opermodeonid && (u->na->nc->flags & NI_SERVICES_OPER)) {
+ } else if(ircd->opermodeonid && is_services_oper(u)) {
strncat(modes,ircd->opermodeonid,512-len);
}
if (ircd->tsonmode) {
diff --git a/src/core/ns_identify.c b/src/core/ns_identify.c
index d69405484..ae7b70aa9 100644
--- a/src/core/ns_identify.c
+++ b/src/core/ns_identify.c
@@ -125,11 +125,11 @@ int do_identify(User * u)
if (ircd->modeonreg) {
len = strlen(ircd->modeonreg);
strncpy(modes,ircd->modeonreg,512);
- if(ircd->rootmodeonid && (u->na->nc->flags & NI_SERVICES_ROOT)) {
+ if(ircd->rootmodeonid && is_services_root(u)) {
strncat(modes,ircd->rootmodeonid,512-len);
- } else if(ircd->adminmodeonid && (u->na->nc->flags & NI_SERVICES_ADMIN)) {
+ } else if(ircd->adminmodeonid && is_services_admin(u)) {
strncat(modes,ircd->adminmodeonid,512-len);
- } else if(ircd->opermodeonid && (u->na->nc->flags & NI_SERVICES_OPER)) {
+ } else if(ircd->opermodeonid && is_services_oper(u)) {
strncat(modes,ircd->opermodeonid,512-len);
}
if (ircd->tsonmode) {
diff --git a/src/core/ns_register.c b/src/core/ns_register.c
index 7f9cb0350..ec37a867f 100644
--- a/src/core/ns_register.c
+++ b/src/core/ns_register.c
@@ -385,11 +385,11 @@ int do_confirm(User * u)
if (ircd->modeonreg) {
len = strlen(ircd->modeonreg);
strncpy(modes,ircd->modeonreg,512);
- if(ircd->rootmodeonid && (u->na->nc->flags & NI_SERVICES_ROOT)) {
+ if(ircd->rootmodeonid && is_services_root(u)) {
strncat(modes,ircd->rootmodeonid,512-len);
- } else if(ircd->adminmodeonid && (u->na->nc->flags & NI_SERVICES_ADMIN)) {
+ } else if(ircd->adminmodeonid && is_services_admin(u)) {
strncat(modes,ircd->adminmodeonid,512-len);
- } else if(ircd->opermodeonid && (u->na->nc->flags & NI_SERVICES_OPER)) {
+ } else if(ircd->opermodeonid && is_services_oper(u)) {
strncat(modes,ircd->opermodeonid,512-len);
}
diff --git a/version.log b/version.log
index 8b29aab59..f6b2dfd4d 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="14"
VERSION_EXTRA=""
-VERSION_BUILD="1073"
+VERSION_BUILD="1074"
# $Log$
#
+# BUILD : 1.7.14 (1074)
+# BUGS : N/A
+# NOTES : Small patch by ThaPrince for ircds with modes on id
+#
# BUILD : 1.7.14 (1073)
# BUGS : N/A
# NOTES : Added a string privmsg option, which can force services to only accept /msg nick@host