X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fop.c;h=588513dd43dd87271d64f3b6111d25b68300ddbb;hb=7fce71914287dc962d3c3cfdb7ebda7bfaa7311d;hp=031bc2819bb96f6da347a392b5e73a4aec473901;hpb=e46cf64cc1e3bf21060df1d1125502277d035170;p=ngircd-alex.git

diff --git a/src/ngircd/op.c b/src/ngircd/op.c
index 031bc281..588513dd 100644
--- a/src/ngircd/op.c
+++ b/src/ngircd/op.c
@@ -7,19 +7,20 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
- *
- * IRC operator functions
  */
 
-
 #include "portab.h"
 
+/**
+ * @file
+ * IRC operator functions
+ */
+
 #include "imp.h"
 #include <assert.h>
 #include <string.h>
 
 #include "conn.h"
-#include "client.h"
 #include "channel.h"
 #include "conf.h"
 #include "log.h"
@@ -30,6 +31,7 @@
 #include <exp.h>
 #include "op.h"
 
+
 /**
  * Return and log a "no privileges" message.
  */
@@ -56,9 +58,15 @@ Op_NoPrivileges(CLIENT * Client, REQUEST * Req)
 
 
 /**
- * Check that the client is an IRC operator allowed to administer this server.
+ * Check that the originator of a request is an IRC operator and allowed
+ * to administer this server.
+ *
+ * @param CLient Client from which the command has been received.
+ * @param Req Request structure.
+ * @return CLIENT structure of the client that initiated the command or
+ *	   NULL if client is not allowed to execute operator commands.
  */
-GLOBAL bool
+GLOBAL CLIENT *
 Op_Check(CLIENT * Client, REQUEST * Req)
 {
 	CLIENT *c;
@@ -70,13 +78,21 @@ Op_Check(CLIENT * Client, REQUEST * Req)
 		c = Client_Search(Req->prefix);
 	else
 		c = Client;
+
 	if (!c)
-		return false;
+		return NULL;
+	if (Client_Type(Client) == CLIENT_SERVER
+	    && Client_Type(c) == CLIENT_SERVER)
+		return c;
 	if (!Client_HasMode(c, 'o'))
-		return false;
+		return NULL;
 	if (!Client_OperByMe(c) && !Conf_AllowRemoteOper)
-		return false;
+		return NULL;
+
 	/* The client is an local IRC operator, or this server is configured
 	 * to trust remote operators. */
-	return true;
+	return c;
 } /* Op_Check */
+
+
+/* -eof- */