Log G-/K-Line changes only when not initiated by a server

[ngircd-alex.git] / src / ngircd / op.c

diff --git a/src/ngircd/op.c b/src/ngircd/op.c
index 031bc2819bb96f6da347a392b5e73a4aec473901..79d01860fc1ec5fa2b315e980c64c475d2e3363b 100644 (file)
--- a/src/ngircd/op.c
+++ b/src/ngircd/op.c
@@ -1,25 +1,24 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2008 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2018 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"
 
-#include "imp.h"
+/**
+ * @file
+ * IRC operator functions
+ */
+
 #include <assert.h>
-#include <string.h>
 
 #include "conn.h"
-#include "client.h"
 #include "channel.h"
 #include "conf.h"
 #include "log.h"
@@ -27,7 +26,6 @@
 #include "messages.h"
 #include "irc-write.h"
 
-#include <exp.h>
 #include "op.h"
 
 /**
@@ -42,23 +40,30 @@ Op_NoPrivileges(CLIENT * Client, REQUEST * Req)
                from = Client_Search(Req->prefix);
 
        if (from) {
-               Log(LOG_NOTICE, "No privileges: client \"%s\" (%s), command \"%s\"",
+               Log(LOG_ERR|LOG_snotice,
+                   "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\"",
+               Log(LOG_ERR|LOG_snotice,
+                   "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;
@@ -70,13 +75,20 @@ 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- */