Don't send nick name as default PART reason

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

diff --git a/src/ngircd/op.c b/src/ngircd/op.c
index 2d36cd559196c3e7639367370bf6960896f6e451..4a1135502ab17e8546af32a875b8747c2fe0d766 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-2013 Alexander Barton (alex@barton.de) and Contributors.
+ * 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,8 @@
 #include "messages.h"
 #include "irc-write.h"
 
-#include <exp.h>
 #include "op.h"
 
-
 /**
  * Return and log a "no privileges" message.
  */
@@ -44,19 +40,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_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_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.
@@ -86,7 +81,7 @@ Op_Check(CLIENT * Client, REQUEST * Req)
                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
@@ -94,5 +89,4 @@ Op_Check(CLIENT * Client, REQUEST * Req)
        return c;
 } /* Op_Check */
 
-
 /* -eof- */