From: Alexander Barton <alex@barton.de>
Date: Fri, 8 Jun 2012 23:57:17 +0000 (+0200)
Subject: Rename "CloakModeHost" option to "CloakHostModeX"
X-Git-Tag: rel-19.2-rc1~1^2~1
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=7b6b492bdd259c25c4477e33392510872107ca6a

Rename "CloakModeHost" option to "CloakHostModeX"
---

diff --git a/src/ngircd/client.c b/src/ngircd/client.c
index 9861a0db..e203cdd0 100644
--- a/src/ngircd/client.c
+++ b/src/ngircd/client.c
@@ -826,7 +826,8 @@ Client_MaskCloaked(CLIENT *Client)
 
 	snprintf(Mask_Buffer, GETID_LEN, "%s!%s@%s",
 		 Client->id, Client->user,
-		 *Conf_CloakModeHost ? Conf_CloakModeHost : Client_ID(Client->introducer));
+		 *Conf_CloakHostModeX ? Conf_CloakHostModeX
+				      : Client_ID(Client->introducer));
 	return Mask_Buffer;
 } /* Client_MaskCloaked */
 
diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index 2a259eb4..5f7b24fc 100644
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@ -358,7 +358,7 @@ Conf_Test( void )
 	printf("  AllowRemoteOper = %s\n", yesno_to_str(Conf_AllowRemoteOper));
 	printf("  ChrootDir = %s\n", Conf_Chroot);
 	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));
 #ifdef WANT_IPV6
 	printf("  ConnectIPv4 = %s\n", yesno_to_str(Conf_ConnectIPv6));
@@ -685,7 +685,7 @@ Set_Defaults(bool InitServers)
 #endif
 	strlcpy(Conf_Chroot, CHROOT_DIR, sizeof(Conf_Chroot));
 	strcpy(Conf_CloakHost, "");
-	strcpy(Conf_CloakModeHost, "");
+	strcpy(Conf_CloakHostModeX, "");
 	Conf_CloakUserToNick = false;
 	Conf_ConnectIPv4 = true;
 #ifdef WANT_IPV6
@@ -1479,9 +1479,9 @@ Handle_OPTIONS(int Line, char *Var, char *Arg)
 			Config_Error_TooLong(Line, Var);
 		return;
 	}
-	if (strcasecmp(Var, "CloakModeHost") == 0) {
-		len = strlcpy(Conf_CloakModeHost, Arg, sizeof(Conf_CloakModeHost));
-		if (len >= sizeof(Conf_CloakModeHost))
+	if (strcasecmp(Var, "CloakHostModeX") == 0) {
+		len = strlcpy(Conf_CloakHostModeX, Arg, sizeof(Conf_CloakHostModeX));
+		if (len >= sizeof(Conf_CloakHostModeX))
 			Config_Error_TooLong(Line, Var);
 		return;
 	}
diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h
index 171a838a..86f00fe4 100644
--- a/src/ngircd/conf.h
+++ b/src/ngircd/conf.h
@@ -167,7 +167,7 @@ GLOBAL bool Conf_AllowRemoteOper;
 GLOBAL char Conf_CloakHost[CLIENT_ID_LEN];
 
 /** 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? */
 GLOBAL bool Conf_CloakUserToNick;