Clarify access denied messages caused by NSSecureAdmins

6 files changed, 8 insertions, 8 deletions

diff --git a/modules/commands/ns_access.cpp b/modules/commands/ns_access.cpp
index 48a06d088..598de4d5a 100644
--- a/modules/commands/ns_access.cpp
+++ b/modules/commands/ns_access.cpp
@@ -122,7 +122,7 @@ class CommandNSAccess : public Command
 			}
 			else if (Config->NSSecureAdmins && u->Account() != na->nc && na->nc->IsServicesOper())
 			{
-				source.Reply(ACCESS_DENIED);
+				source.Reply(_("You may view or modify the access list of other services operators."));
 				return;
 			}
 
diff --git a/modules/commands/ns_drop.cpp b/modules/commands/ns_drop.cpp
index 3f3a5dd46..442655c0f 100644
--- a/modules/commands/ns_drop.cpp
+++ b/modules/commands/ns_drop.cpp
@@ -54,7 +54,7 @@ class CommandNSDrop : public Command
 		if (!is_mine && !u->HasPriv("nickserv/drop"))
 			source.Reply(ACCESS_DENIED);
 		else if (Config->NSSecureAdmins && !is_mine && na->nc->IsServicesOper())
-			source.Reply(ACCESS_DENIED);
+			source.Reply(_("You may not drop other services operators nicknames."));
 		else
 		{
 			if (readonly)
diff --git a/modules/commands/ns_getpass.cpp b/modules/commands/ns_getpass.cpp
index f8c044119..e5cf4a7ac 100644
--- a/modules/commands/ns_getpass.cpp
+++ b/modules/commands/ns_getpass.cpp
@@ -32,7 +32,7 @@ class CommandNSGetPass : public Command
 		if (!(na = findnick(nick)))
 			source.Reply(NICK_X_NOT_REGISTERED, nick.c_str());
 		else if (Config->NSSecureAdmins && na->nc->IsServicesOper())
-			source.Reply(ACCESS_DENIED);
+			source.Reply(_("You may not get the password of other services operators."));
 		else
 		{
 			if (enc_decrypt(na->nc->pass, tmp_pass) == 1)
diff --git a/modules/commands/ns_saset.cpp b/modules/commands/ns_saset.cpp
index 3721dcda3..240ef0e07 100644
--- a/modules/commands/ns_saset.cpp
+++ b/modules/commands/ns_saset.cpp
@@ -79,7 +79,7 @@ class CommandNSSASetPassword : public Command
 
 		if (Config->NSSecureAdmins && u->Account() != nc && nc->IsServicesOper())
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(_("You may not change the password of other services operators."));
 			return;
 		}
 		else if (nc->display.equals_ci(params[1]) || (Config->StrictPasswords && len < 5))
diff --git a/modules/commands/ns_set_email.cpp b/modules/commands/ns_set_email.cpp
index e8b2778e5..16a622db1 100644
--- a/modules/commands/ns_set_email.cpp
+++ b/modules/commands/ns_set_email.cpp
@@ -75,7 +75,7 @@ class CommandNSSetEmail : public Command
 		}
 		else if (Config->NSSecureAdmins && u->Account() != nc && nc->IsServicesOper())
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(_("You may not change the email of other services operators."));
 			return;
 		}
 		else if (!param.empty() && !MailValidate(param))
diff --git a/modules/commands/ns_suspend.cpp b/modules/commands/ns_suspend.cpp
index f965be321..4fcbe6c38 100644
--- a/modules/commands/ns_suspend.cpp
+++ b/modules/commands/ns_suspend.cpp
@@ -101,7 +101,7 @@ class CommandNSSuspend : public Command
 
 		if (Config->NSSecureAdmins && na->nc->IsServicesOper())
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(_("You may not suspend other services operators nicknames."));
 			return;
 		}
 
@@ -186,9 +186,9 @@ class CommandNSUnSuspend : public Command
 			return;
 		}
 
-		if (Config->NSSecureAdmins && na->nc->IsServicesOper())
+		if (!na->nc->HasFlag(NI_SUSPENDED))
 		{
-			source.Reply(ACCESS_DENIED);
+			source.Reply(_("Nick %s is not suspended."), na->nick.c_str());
 			return;
 		}