X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fop.c;h=71e7cbcec778ae3e65a266846dfa655e04f73cd9;hp=c70be6e47f1b1dffa6128c88cfd04f2900bd854f;hb=0fc822d8c44be42a62d3c26bbab99d5d0bc88346;hpb=5462c6c50fd01fd516e29a42ee0b15c946c11d27

diff --git a/src/ngircd/op.c b/src/ngircd/op.c
index c70be6e4..71e7cbce 100644
--- a/src/ngircd/op.c
+++ b/src/ngircd/op.c
@@ -1,19 +1,21 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2008 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * 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>
@@ -29,6 +31,7 @@
 #include <exp.h>
 #include "op.h"
 
+
 /**
  * Return and log a "no privileges" message.
  */
@@ -43,21 +46,27 @@ Op_NoPrivileges(CLIENT * Client, REQUEST * Req)
 	if (from) {
 		Log(LOG_NOTICE, "No privileges: client \"%s\" (%s), command \"%s\"",
 		    Req->prefix, Client_Mask(Client), Req->command);
-		return IRC_WriteStrClient(from, ERR_NOPRIVILEGES_MSG,
+		return IRC_WriteErrClient(from, ERR_NOPRIVILEGES_MSG,
 					  Client_ID(from));
 	} else {
 		Log(LOG_NOTICE, "No privileges: client \"%s\", command \"%s\"",
 		    Client_Mask(Client), Req->command);
-		return IRC_WriteStrClient(Client, ERR_NOPRIVILEGES_MSG,
+		return IRC_WriteErrClient(Client, ERR_NOPRIVILEGES_MSG,
 					  Client_ID(Client));
 	}
 } /* Op_NoPrivileges */
 
 
 /**
- * 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;
@@ -69,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;
-	if (!Client_OperByMe(c) && !Conf_AllowRemoteOper)
-		return false;
+		return NULL;
+	if (Client_Conn(c) <= NONE && !Conf_AllowRemoteOper)
+		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- */