1
0
mirror of https://github.com/osmarks/ngircd.git synced 2025-07-19 17:32:52 +00:00

Rename Conf_IsService() to Conf_NickIsService()

This commit is contained in:
Alexander Barton 2012-08-26 12:27:51 +02:00
parent 037b4b76df
commit 9d8974d509
3 changed files with 10 additions and 5 deletions

View File

@ -1,6 +1,6 @@
/* /*
* ngIRCd -- The Next Generation IRC Daemon * ngIRCd -- The Next Generation IRC Daemon
* Copyright (c)2001-2010 Alexander Barton (alex@barton.de) * Copyright (c)2001-2012 Alexander Barton (alex@barton.de)
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -1175,7 +1175,7 @@ Client_Introduce(CLIENT *From, CLIENT *Client, int Type)
Client_SetType(Client, Type); Client_SetType(Client, Type);
if (From) { if (From) {
if (Conf_IsService(Conf_GetServer(Client_Conn(From)), if (Conf_NickIsService(Conf_GetServer(Client_Conn(From)),
Client_ID(Client))) Client_ID(Client)))
Client_SetType(Client, CLIENT_SERVICE); Client_SetType(Client, CLIENT_SERVICE);
LogDebug("%s \"%s\" (+%s) registered (via %s, on %s, %d hop%s).", LogDebug("%s \"%s\" (+%s) registered (via %s, on %s, %d hop%s).",

View File

@ -636,13 +636,18 @@ Conf_AddServer(const char *Name, UINT16 Port, const char *Host,
} }
/** /**
* Check if the given nick name is an service. * Check if the given nick name is reserved for services on a particular server.
* *
* @param ConfServer The server index to check.
* @param Nick The nick name to check.
* @returns true if the given nick name belongs to an "IRC service". * @returns true if the given nick name belongs to an "IRC service".
*/ */
GLOBAL bool GLOBAL bool
Conf_IsService(int ConfServer, const char *Nick) Conf_NickIsService(int ConfServer, const char *Nick)
{ {
assert (ConfServer >= 0);
assert (ConfServer < MAX_SERVERS);
return MatchCaseInsensitive(Conf_Server[ConfServer].svs_mask, Nick); return MatchCaseInsensitive(Conf_Server[ConfServer].svs_mask, Nick);
} }

View File

@ -244,7 +244,7 @@ GLOBAL bool Conf_EnablePassiveServer PARAMS((const char *Name));
GLOBAL bool Conf_DisableServer PARAMS(( const char *Name )); GLOBAL bool Conf_DisableServer PARAMS(( const char *Name ));
GLOBAL bool Conf_AddServer PARAMS(( const char *Name, UINT16 Port, const char *Host, const char *MyPwd, const char *PeerPwd )); GLOBAL bool Conf_AddServer PARAMS(( const char *Name, UINT16 Port, const char *Host, const char *MyPwd, const char *PeerPwd ));
GLOBAL bool Conf_IsService PARAMS((int ConfServer, const char *Nick)); GLOBAL bool Conf_NickIsService PARAMS((int ConfServer, const char *Nick));
/* Password required by WEBIRC command */ /* Password required by WEBIRC command */
GLOBAL char Conf_WebircPwd[CLIENT_PASS_LEN]; GLOBAL char Conf_WebircPwd[CLIENT_PASS_LEN];