From: Jeffrey Altman Date: Tue, 26 Jul 2011 21:36:25 +0000 (-0400) Subject: Windows: afskfw remove TRUE conditional X-Git-Tag: upstream/1.6.0^2~67 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=ad854ce900ad34e7ab686ed2ab47e33cdc422f5e;p=packages%2Fo%2Fopenafs.git Windows: afskfw remove TRUE conditional Simply the code by removing an if(1) conditional. Reviewed-on: http://gerrit.openafs.org/5111 Tested-by: BuildBot Tested-by: Jeffrey Altman Reviewed-by: Jeffrey Altman (cherry picked from 7c59ec8f816120c738b1da83f7db9349d912f573) Change-Id: I332b82b24c97810074e87521c8727b5827d7b54b Reviewed-on: http://gerrit.openafs.org/5139 Tested-by: BuildBot Tested-by: Jeffrey Altman Reviewed-by: Jeffrey Altman --- diff --git a/src/WINNT/afsd/afskfw.c b/src/WINNT/afsd/afskfw.c index 7eed20da2..661dd5315 100644 --- 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)