From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Tue, 26 Jul 2011 21:34:52 +0000 (-0400)
Subject: Windows: KFW_AFS_get_cred userrealm
X-Git-Tag: upstream/1.6.0^2~68
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c4afc3f125e6df05220da59dbc26a74e9c82aa5e;p=packages%2Fo%2Fopenafs.git

Windows: KFW_AFS_get_cred userrealm

The userrealm string in KFW_AFS_get_cred() should not include
the '@' symbol from the user principal.  Including the '@' produces
an invalid realm name.

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

Change-Id: I24007935b35ac2a603486fc40a79f94b9b90fa8e
Reviewed-on: http://gerrit.openafs.org/5138
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 67548c747..7eed20da2 100644
--- a/src/WINNT/afsd/afskfw.c
+++ b/src/WINNT/afsd/afskfw.c
@@ -1398,8 +1398,9 @@ KFW_AFS_get_cred( char * username,
             while ( dot = strchr(pname,'.') ) {
                 *dot = '/';
             }
-            *userrealm++ = '@';
+            *userrealm = '@';
         }
+        userrealm++;
     } else {
         size_t len = strlen(username) + strlen(realm) + 2;
         pname = malloc(len);
@@ -1423,7 +1424,7 @@ KFW_AFS_get_cred( char * username,
         OutputDebugString(realm);
         OutputDebugString("\n");
         OutputDebugString("Realm of User: ");
-        OutputDebugString(userrealm);
+        OutputDebugString(userrealm?userrealm:"<NULL>");
         OutputDebugString("\n");
     }