Fix from Marcus Watts for glob-to-regexp conversion bug.

Tweaked test case to exercise the bug.

ticket: 5667

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21285 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/kadm5/srv/svr_iters.c b/src/lib/kadm5/srv/svr_iters.c
index d78b9e554616b46959a3776be4fcfffc142f8669..9774d76ea9bc233beb00e44fcd7b0e71c1ca51dc 100644 (file)
--- a/src/lib/kadm5/srv/svr_iters.c
+++ b/src/lib/kadm5/srv/svr_iters.c
@@ -86,7 +86,7 @@ static kadm5_ret_t glob_to_regexp(char *glob, char *realm, char **regexp)
      /* and trailing null.  If glob has no @, also allocate space for */
      /* the realm. */
      append_realm = (realm != NULL) && (strchr(glob, '@') == NULL);
-     p = (char *) malloc(strlen(glob)*2+ 3 + (append_realm ? 2 : 0));
+     p = (char *) malloc(strlen(glob)*2+ 3 + (append_realm ? 3 : 0));
      if (p == NULL)
          return ENOMEM;
      *regexp = p;
@@ -120,6 +120,7 @@ static kadm5_ret_t glob_to_regexp(char *glob, char *realm, char **regexp)
 
      if (append_realm) {
          *p++ = '@';
+         *p++ = '.';
          *p++ = '*';
      }
 

diff --git a/src/tests/dejagnu/krb-standalone/kadmin.exp b/src/tests/dejagnu/krb-standalone/kadmin.exp
index 98214ed52b602fbb7d0848d5189b01ad5759e89d..3ec5103dbbabfa2f7fb09b94ed1ab08df5c38d64 100644 (file)
--- a/src/tests/dejagnu/krb-standalone/kadmin.exp
+++ b/src/tests/dejagnu/krb-standalone/kadmin.exp
@@ -383,7 +383,9 @@ proc kadmin_list {  } {
     global KEY
     global spawn_id
 
-    spawn $KADMIN -p krbtest/admin@$REALMNAME -q "get_principals *"
+    # "*" would match everything
+    # "*n" should match a few like kadmin/admin but see ticket 5667
+    spawn $KADMIN -p krbtest/admin@$REALMNAME -q "get_principals *n"
     expect_after {
        "Cannot contact any KDC" {
            fail "kadmin ldb lost KDC"