Rename "CloakModeHost" option to "CloakHostModeX"

diff --git a/src/ngircd/client.c b/src/ngircd/client.c
index 9861a0dbb61962e5f6814377d1db21e79ad6f4e4..e203cdd0e79df243089066d09a80eedec5355a46 100644 (file)
--- 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,
 
        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 */
 
        return Mask_Buffer;
 } /* Client_MaskCloaked */
 

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index 2a259eb43440d1c453190392ef890be49dfa9349..5f7b24fcfdced17a4681d260f6546f4980c7481f 100644 (file)
--- 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("  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));
        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, "");
 #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
        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;
        }
                        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;
        }
                        Config_Error_TooLong(Line, Var);
                return;
        }

diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h
index 171a838a4c2d9d951e1182e0c56c5cbea0308220..86f00fe429b03a5ed99e68724f8b35b471bd83d0 100644 (file)
--- 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_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;
 
 /** Use nick name as user name? */
 GLOBAL bool Conf_CloakUserToNick;