summaryrefslogtreecommitdiffstats
path: root/src/kadmin
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2006-06-15 22:01:57 +0000
committerKen Raeburn <raeburn@mit.edu>2006-06-15 22:01:57 +0000
commitac7858aee8d23354d706bb8d32b278ea6acd6277 (patch)
tree3f729ecade7447f16adc19fd700f6b53b269f919 /src/kadmin
parentb0f8172db91ab91df49534e9aeeb2310e92a9c06 (diff)
downloadkrb5-ac7858aee8d23354d706bb8d32b278ea6acd6277.tar.gz
krb5-ac7858aee8d23354d706bb8d32b278ea6acd6277.tar.xz
krb5-ac7858aee8d23354d706bb8d32b278ea6acd6277.zip
(kadmin_startup): Properly skip "\@" and "\/" sequences when
processing principal name, rather than going into an infinite loop. Suggested by Mark Phalan at Sun. ticket: 3697 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18148 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin')
-rw-r--r--src/kadmin/cli/kadmin.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c
index 0b1342015..e7594170d 100644
--- a/src/kadmin/cli/kadmin.c
+++ b/src/kadmin/cli/kadmin.c
@@ -404,7 +404,7 @@ char *kadmin_startup(argc, argv)
if (realm - canon && *(realm - 1) != '\\')
break;
else
- realm = strchr(realm, '@');
+ realm = strchr(realm+1, '@');
}
if (realm)
*realm++ = '\0';
@@ -413,7 +413,7 @@ char *kadmin_startup(argc, argv)
if (cp - canon && *(cp - 1) != '\\')
break;
else
- cp = strchr(cp, '/');
+ cp = strchr(cp+1, '/');
}
if (cp != NULL)
*cp = '\0';