S2S-TLS/OpenSSL: Set the verification flags only once

[ngircd-alex.git] / src / ngircd / irc-oper.c

diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c
index cf3b9d0485436e03e1d1d63d74be85a4d7f901e8..df8e22699bf1ee06d95f370e8e7c39a8206830c0 100644 (file)
--- a/src/ngircd/irc-oper.c
+++ b/src/ngircd/irc-oper.c
@@ -47,7 +47,7 @@
 static bool
 Bad_OperPass(CLIENT *Client, char *errtoken, char *errmsg)
 {
-       Log(LOG_WARNING, "Got invalid OPER from \"%s\": \"%s\" -- %s!",
+       Log(LOG_ERR|LOG_snotice, "Got invalid OPER from \"%s\": \"%s\" -- %s!",
            Client_Mask(Client), errtoken, errmsg);
        /* Increase penalty to slow down possible brute force attacks */
        IRC_SetPenalty(Client, 10);
@@ -399,7 +399,7 @@ IRC_xLINE(CLIENT *Client, REQUEST *Req)
                                          Client_ID(Client), Req->command);
 
        if (!Conf_AllowRemoteOper && Client_Type(Client) == CLIENT_SERVER) {
-               /* Explicitely forbid remote servers to modify "x-lines" when
+               /* Explicitly forbid remote servers to modify "x-lines" when
                 * the "AllowRemoteOper" configuration option isn't set, even
                 * when the command seems to originate from the remote server
                 * itself: this prevents GLINE's to become set during server
@@ -447,10 +447,11 @@ IRC_xLINE(CLIENT *Client, REQUEST *Req)
                if (Class_AddMask(class, Req->argv[0],
                                  timeout,
                                  Req->argv[2])) {
-                       Log(LOG_NOTICE|LOG_snotice,
-                           "\"%s\" added \"%s\" to %c-Line list: \"%s\" (%ld seconds).",
-                           Client_Mask(from), Req->argv[0], class_c,
-                           Req->argv[2], atol(Req->argv[1]));
+                       if (Client_Type(from) != CLIENT_SERVER)
+                               Log(LOG_NOTICE|LOG_snotice,
+                                   "\"%s\" added \"%s\" to %c-Line list: \"%s\" (%ld seconds).",
+                                   Client_Mask(from), Req->argv[0], class_c,
+                                   Req->argv[2], atol(Req->argv[1]));
                        if (class == CLASS_GLINE) {
                                /* Inform other servers */
                                IRC_WriteStrServersPrefix(Client, from,