summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/cs_identify.c6
-rw-r--r--src/core/ms_del.c5
-rw-r--r--src/core/ms_info.c7
-rw-r--r--src/core/ms_list.c5
-rw-r--r--src/core/ms_read.c5
-rw-r--r--src/core/ms_set.c2
-rw-r--r--src/core/ns_drop.c4
-rw-r--r--src/core/ns_group.c5
-rw-r--r--src/core/ns_logout.c2
-rw-r--r--src/memoserv.c6
10 files changed, 5 insertions, 42 deletions
diff --git a/src/core/cs_identify.c b/src/core/cs_identify.c
index ab251eefc..aa8f3ac32 100644
--- a/src/core/cs_identify.c
+++ b/src/core/cs_identify.c
@@ -36,12 +36,6 @@ class CommandCSIdentify : public Command
return MOD_CONT;
}
- if (!nick_identified(u))
- {
- notice_lang(s_ChanServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
- return MOD_CONT;
- }
-
if (is_founder(u, ci))
{
notice_lang(s_ChanServ, u, NICK_ALREADY_IDENTIFIED);
diff --git a/src/core/ms_del.c b/src/core/ms_del.c
index a8c5bccd1..e73404f46 100644
--- a/src/core/ms_del.c
+++ b/src/core/ms_del.c
@@ -56,11 +56,6 @@ class CommandMSDel : public Command
}
else
{
- if (!nick_identified(u))
- {
- notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
- return MOD_CONT;
- }
mi = &u->nc->memos;
}
if (!numstr || (!isdigit(*numstr) && stricmp(numstr, "ALL") && stricmp(numstr, "LAST")))
diff --git a/src/core/ms_info.c b/src/core/ms_info.c
index 9d87b019f..ba78954e7 100644
--- a/src/core/ms_info.c
+++ b/src/core/ms_info.c
@@ -67,13 +67,8 @@ class CommandMSInfo : public Command
notice_lang(s_MemoServ, u, ACCESS_DENIED);
return MOD_CONT;
}
- else /* !name */
+ else
{
- if (!nick_identified(u))
- {
- notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
- return MOD_CONT;
- }
mi = &u->nc->memos;
hardmax = u->nc->flags & NI_MEMO_HARDMAX ? 1 : 0;
}
diff --git a/src/core/ms_list.c b/src/core/ms_list.c
index 4ade2fd5e..5c2aab3d2 100644
--- a/src/core/ms_list.c
+++ b/src/core/ms_list.c
@@ -51,11 +51,6 @@ class CommandMSList : public Command
}
else
{
- if (!nick_identified(u))
- {
- notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
- return MOD_CONT;
- }
mi = &u->nc->memos;
}
if (param && !isdigit(*param) && stricmp(param, "NEW"))
diff --git a/src/core/ms_read.c b/src/core/ms_read.c
index fe5a959eb..e47a674e6 100644
--- a/src/core/ms_read.c
+++ b/src/core/ms_read.c
@@ -51,11 +51,6 @@ class CommandMSRead : public Command
}
else
{
- if (!nick_identified(u))
- {
- notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
- return MOD_CONT;
- }
mi = &u->nc->memos;
}
num = numstr ? atoi(numstr) : -1;
diff --git a/src/core/ms_set.c b/src/core/ms_set.c
index 2368a7ce2..510930c15 100644
--- a/src/core/ms_set.c
+++ b/src/core/ms_set.c
@@ -214,8 +214,6 @@ class CommandMSSet : public Command
notice_lang(s_MemoServ, u, MEMO_SET_DISABLED);
return MOD_CONT;
}
- if (!nick_identified(u))
- notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
else if (!stricmp(cmd, "NOTIFY"))
return this->DoNotify(u, params, mi);
else if (!stricmp(cmd, "LIMIT")) {
diff --git a/src/core/ns_drop.c b/src/core/ns_drop.c
index 43f66ece5..d3454548c 100644
--- a/src/core/ns_drop.c
+++ b/src/core/ns_drop.c
@@ -60,9 +60,7 @@ class CommandNSDrop : public Command
if (is_mine && !nick)
my_nick = sstrdup(na->nick);
- if (is_mine && !nick_identified(u))
- notice_lang(s_NickServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
- else if (!is_mine && !u->nc->IsServicesOper())
+ if (!is_mine && !u->nc->IsServicesOper())
notice_lang(s_NickServ, u, ACCESS_DENIED);
else if (NSSecureAdmins && !is_mine && na->nc->IsServicesOper())
notice_lang(s_NickServ, u, ACCESS_DENIED);
diff --git a/src/core/ns_group.c b/src/core/ns_group.c
index 47b67960c..eb069bd9f 100644
--- a/src/core/ns_group.c
+++ b/src/core/ns_group.c
@@ -206,11 +206,10 @@ class CommandNSGList : public Command
const char *nick = params.size() ? params[0].c_str() : NULL;
NickCore *nc = u->nc;
- int nick_ided = nick_identified(u);
int i;
- if (nick ? (stricmp(nick, u->nick) ? !u->nc->IsServicesOper() : !nick_ided) : !nick_ided)
- notice_lang(s_NickServ, u, nick_ided ? ACCESS_DENIED : NICK_IDENTIFY_REQUIRED, s_NickServ);
+ if (nick && (stricmp(nick, u->nick) && !u->nc->IsServicesOper()))
+ notice_lang(s_NickServ, u, ACCESS_DENIED, s_NickServ);
else if (nick && (!findnick(nick) || !(nc = findnick(nick)->nc)))
notice_lang(s_NickServ, u, !nick ? NICK_NOT_REGISTERED : NICK_X_NOT_REGISTERED, nick);
/* else if (na->status & NS_FORBIDDEN)
diff --git a/src/core/ns_logout.c b/src/core/ns_logout.c
index 0d68beae3..0b7345f55 100644
--- a/src/core/ns_logout.c
+++ b/src/core/ns_logout.c
@@ -43,8 +43,6 @@ class CommandNSLogout : public Command
else
notice_lang(s_NickServ, u, NICK_NOT_REGISTERED);
}
- else if (!nick && !nick_identified(u))
- notice_lang(s_NickServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
else if (nick && !u2->nc->IsServicesOper())
notice_lang(s_NickServ, u, NICK_LOGOUT_SERVICESADMIN, nick);
else
diff --git a/src/memoserv.c b/src/memoserv.c
index b8b394bdb..7af1b0c18 100644
--- a/src/memoserv.c
+++ b/src/memoserv.c
@@ -65,11 +65,7 @@ void memoserv(User * u, char *buf)
}
ircdproto->SendCTCP(findbot(s_MemoServ), u->nick, "PING %s", s);
} else {
- if (!u->nc && stricmp(cmd, "HELP") != 0)
- notice_lang(s_MemoServ, u, NICK_NOT_REGISTERED_HELP,
- s_NickServ);
- else
- mod_run_cmd(s_MemoServ, u, MEMOSERV, cmd);
+ mod_run_cmd(s_MemoServ, u, MEMOSERV, cmd);
}
}
generated by cgit (git 2.34.1) at 2025-06-19 21:50:58 +0000