pull up r17399 from trunk

ticket: 3190
version_fixed: 1.4.3

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17419 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog
index eeba8685c97686749cb033660b404e27cb6dcc0f..ac4be628d8478dcd34f849b631329dc510419503 100644 (file)
--- a/src/lib/kadm5/srv/ChangeLog
+++ b/src/lib/kadm5/srv/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-27  Tom Yu  <tlyu@mit.edu>
+
+       * svr_iters.c (glob_to_regexp): Increment pointer, not character,
+       when handling backslash quoting.  Patch from K.G. Gokulavasan.
+
 2004-12-20  Tom Yu  <tlyu@mit.edu>
 
        * svr_principal.c (add_to_history): Rewrite somewhat, using

diff --git a/src/lib/kadm5/srv/svr_iters.c b/src/lib/kadm5/srv/svr_iters.c
index 8c04d78574ae6a071bb41e19745b30f2b68aa3c8..b314f30c36159c4fc711521ac48aac6e171f13d8 100644 (file)
--- a/src/lib/kadm5/srv/svr_iters.c
+++ b/src/lib/kadm5/srv/svr_iters.c
@@ -109,7 +109,7 @@ static kadm5_ret_t glob_to_regexp(char *glob, char *realm, char **regexp)
               break;
          case '\\':
               *p++ = '\\';
-              *p++ = ++*glob;
+              *p++ = *++glob;
               break;
          default:
               *p++ = *glob;