/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2015 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
* IRC operator commands
*/
-#include "imp.h"
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <signal.h>
+#include <time.h>
#include "ngircd.h"
#include "conn-func.h"
#include "messages.h"
#include "op.h"
-#include <exp.h>
#include "irc-oper.h"
/**
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);
from = Client;
break;
case CLIENT_SERVER:
+ _IRC_REQUIRE_PREFIX_OR_RETURN_(Client, Req)
from = Client_Search(Req->prefix);
break;
default:
CLIENT *from, *c, *c_next;
char reason[COMMAND_LEN], class_c;
struct list_head *list;
+ time_t timeout;
int class;
assert(Client != NULL);
return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
Client_ID(Client), Req->command);
- from = Op_Check(Client, Req);
+ if (!Conf_AllowRemoteOper && Client_Type(Client) == CLIENT_SERVER) {
+ /* Explicitely 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
+ * handshake in this case (what wouldn't be possible during
+ * regular runtime when a remote IRC Op sends the command). */
+ from = NULL;
+ } else
+ from = Op_Check(Client, Req);
if (!from)
return Op_NoPrivileges(Client, Req);
}
} else {
/* Add new mask to list */
+ timeout = atol(Req->argv[1]);
+ if (timeout > 0)
+ timeout += time(NULL);
if (Class_AddMask(class, Req->argv[0],
- time(NULL) + atol(Req->argv[1]),
+ timeout,
Req->argv[2])) {
Log(LOG_NOTICE|LOG_snotice,
"\"%s\" added \"%s\" to %c-Line list: \"%s\" (%ld seconds).",