Windows: afskfw remove TRUE conditional

Simply the code by removing an if(1) conditional.

Reviewed-on: http://gerrit.openafs.org/5111
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
(cherry picked from 7c59ec8f816120c738b1da83f7db9349d912f573)

Change-Id: I332b82b24c97810074e87521c8727b5827d7b54b
Reviewed-on: http://gerrit.openafs.org/5139
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>

diff --git a/src/WINNT/afsd/afskfw.c b/src/WINNT/afsd/afskfw.c
index 7eed20da22b6bc596dcba3839185cb1a0ca0b6d6..661dd531594813f33d13c57bf89ab4adc01f5974 100644 (file)
--- a/src/WINNT/afsd/afskfw.c
+++ b/src/WINNT/afsd/afskfw.c
@@ -3256,13 +3256,10 @@ KFW_AFS_klog(
         StringCbCopyN( aclient.cell, sizeof(aclient.cell),
                        realm_of_cell, sizeof(aclient.cell) - 1);
 
-        len = min(k5creds->client->realm.length,(int)strlen(realm_of_cell));
         /* For Khimaira, always append the realm name */
-        if ( 1 /* strncmp(realm_of_cell, k5creds->client->realm.data, len) */ ) {
-            StringCbCat( aclient.name, sizeof(aclient.name), "@");
-            len = min(k5creds->client->realm.length, (int)(sizeof(aclient.name) - strlen(aclient.name) - 1));
-            StringCbCatN( aclient.name, sizeof(aclient.name), k5creds->client->realm.data, len);
-        }
+        StringCbCat( aclient.name, sizeof(aclient.name), "@");
+        len = min(k5creds->client->realm.length, (int)(sizeof(aclient.name) - strlen(aclient.name) - 1));
+        StringCbCatN( aclient.name, sizeof(aclient.name), k5creds->client->realm.data, len);
 
        GetEnvironmentVariable(DO_NOT_REGISTER_VARNAME, NULL, 0);
        if (GetLastError() == ERROR_ENVVAR_NOT_FOUND)