Update copyright notices of recently changed files

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

diff --git a/src/ngircd/op.c b/src/ngircd/op.c
index c93133c432021f3e1c540f2e5de3e6bc8c8719aa..7b7befbb0d5b7f58f9f557af90cc0547cb6ece11 100644 (file)
--- a/src/ngircd/op.c
+++ b/src/ngircd/op.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2008 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2014 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
@@ -16,9 +16,7 @@
  * IRC operator functions
  */
 
-#include "imp.h"
 #include <assert.h>
-#include <string.h>
 
 #include "conn.h"
 #include "channel.h"
@@ -28,10 +26,6 @@
 #include "messages.h"
 #include "irc-write.h"
 
-#include <exp.h>
-#include "op.h"
-
-
 /**
  * Return and log a "no privileges" message.
  */
@@ -44,19 +38,18 @@ 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_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\"",
+               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 originator of a request is an IRC operator and allowed
  * to administer this server.
@@ -81,9 +74,12 @@ Op_Check(CLIENT * Client, REQUEST * Req)
 
        if (!c)
                return NULL;
+       if (Client_Type(Client) == CLIENT_SERVER
+           && Client_Type(c) == CLIENT_SERVER)
+               return c;
        if (!Client_HasMode(c, 'o'))
                return NULL;
-       if (!Client_OperByMe(c) && !Conf_AllowRemoteOper)
+       if (Client_Conn(c) <= NONE && !Conf_AllowRemoteOper)
                return NULL;
 
        /* The client is an local IRC operator, or this server is configured
@@ -91,5 +87,4 @@ Op_Check(CLIENT * Client, REQUEST * Req)
        return c;
 } /* Op_Check */
 
-
 /* -eof- */