albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename "CloakModeHost" option to "CloakHostModeX"

This commit is contained in:
Alexander Barton 2012-06-09 01:57:17 +02:00
parent aa7db2c0e9
commit 7b6b492bdd
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ngircd/client.c
View File

@ -826,7 +826,8 @@ Client_MaskCloaked(CLIENT *Client)
snprintf(Mask_Buffer, GETID_LEN, "%s!%s@%s", snprintf(Mask_Buffer, GETID_LEN, "%s!%s@%s",
Client->id, Client->user, Client->id, Client->user,
*Conf_CloakModeHost ? Conf_CloakModeHost : Client_ID(Client->introducer)); *Conf_CloakHostModeX ? Conf_CloakHostModeX
: Client_ID(Client->introducer));
return Mask_Buffer; return Mask_Buffer;
} /* Client_MaskCloaked */ } /* Client_MaskCloaked */

10
src/ngircd/conf.c
View File

@ -358,7 +358,7 @@ Conf_Test( void )
printf(" AllowRemoteOper = %s\n", yesno_to_str(Conf_AllowRemoteOper)); printf(" AllowRemoteOper = %s\n", yesno_to_str(Conf_AllowRemoteOper));
printf(" ChrootDir = %s\n", Conf_Chroot); printf(" ChrootDir = %s\n", Conf_Chroot);
printf(" CloakHost = %s\n", Conf_CloakHost); printf(" CloakHost = %s\n", Conf_CloakHost);
printf(" CloakModeHost = %s\n", Conf_CloakModeHost); printf(" CloakHostModeX = %s\n", Conf_CloakHostModeX);
printf(" CloakUserToNick = %s\n", yesno_to_str(Conf_CloakUserToNick)); printf(" CloakUserToNick = %s\n", yesno_to_str(Conf_CloakUserToNick));
#ifdef WANT_IPV6 #ifdef WANT_IPV6
printf(" ConnectIPv4 = %s\n", yesno_to_str(Conf_ConnectIPv6)); printf(" ConnectIPv4 = %s\n", yesno_to_str(Conf_ConnectIPv6));
@ -685,7 +685,7 @@ Set_Defaults(bool InitServers)
#endif #endif
strlcpy(Conf_Chroot, CHROOT_DIR, sizeof(Conf_Chroot)); strlcpy(Conf_Chroot, CHROOT_DIR, sizeof(Conf_Chroot));
strcpy(Conf_CloakHost, ""); strcpy(Conf_CloakHost, "");
strcpy(Conf_CloakModeHost, ""); strcpy(Conf_CloakHostModeX, "");
Conf_CloakUserToNick = false; Conf_CloakUserToNick = false;
Conf_ConnectIPv4 = true; Conf_ConnectIPv4 = true;
#ifdef WANT_IPV6 #ifdef WANT_IPV6
@ -1479,9 +1479,9 @@ Handle_OPTIONS(int Line, char *Var, char *Arg)
Config_Error_TooLong(Line, Var); Config_Error_TooLong(Line, Var);
return; return;
} }
if (strcasecmp(Var, "CloakModeHost") == 0) { if (strcasecmp(Var, "CloakHostModeX") == 0) {
len = strlcpy(Conf_CloakModeHost, Arg, sizeof(Conf_CloakModeHost)); len = strlcpy(Conf_CloakHostModeX, Arg, sizeof(Conf_CloakHostModeX));
if (len >= sizeof(Conf_CloakModeHost)) if (len >= sizeof(Conf_CloakHostModeX))
Config_Error_TooLong(Line, Var); Config_Error_TooLong(Line, Var);
return; return;
} }

2
src/ngircd/conf.h
View File

@ -167,7 +167,7 @@ GLOBAL bool Conf_AllowRemoteOper;
GLOBAL char Conf_CloakHost[CLIENT_ID_LEN]; GLOBAL char Conf_CloakHost[CLIENT_ID_LEN];
/** Cloaked hostname for clients that did +x */ /** Cloaked hostname for clients that did +x */
GLOBAL char Conf_CloakModeHost[CLIENT_ID_LEN]; GLOBAL char Conf_CloakHostModeX[CLIENT_ID_LEN];
/** Use nick name as user name? */ /** Use nick name as user name? */
GLOBAL bool Conf_CloakUserToNick; GLOBAL bool Conf_CloakUserToNick;