Windows: afskfw remove TRUE conditional
authorJeffrey Altman <jaltman@your-file-system.com>
Tue, 26 Jul 2011 21:36:25 +0000 (17:36 -0400)
committerJeffrey Altman <jaltman@openafs.org>
Sun, 31 Jul 2011 17:18:24 +0000 (10:18 -0700)
Simply the code by removing an if(1) conditional.

Change-Id: I2cb3f861b99686a7d14aa7f567adc5a083a08a5b
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>

src/WINNT/afsd/afskfw.c

index 781da61..5037026 100644 (file)
@@ -3257,13 +3257,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)