* svr_iters.c (glob_to_regexp): a principal glob with no @

 	defaults to @*, not @LOCAL.REAM [krb5-admin/161]

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

diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog
index edc6f35591827e4c01536a1599b0f9369a524246..823576f5c23e4e6a578e9d137245583f5aea294e 100644 (file)
--- a/src/lib/kadm5/srv/ChangeLog
+++ b/src/lib/kadm5/srv/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov  7 16:42:38 1996  Barry Jaspan  <bjaspan@mit.edu>
+
+       * svr_iters.c (glob_to_regexp): a principal glob with no @
+       defaults to @*, not @LOCAL.REAM [krb5-admin/161]
+ 
 Wed Nov  6 10:45:12 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * server_init.c (kadm5_init): Use a more fined grained error

diff --git a/src/lib/kadm5/srv/svr_iters.c b/src/lib/kadm5/srv/svr_iters.c
index 19c90002122add5147298bf1f5aa9506985caf24..706e778212d169ede745517c6cc1b60aad715554 100644 (file)
--- a/src/lib/kadm5/srv/svr_iters.c
+++ b/src/lib/kadm5/srv/svr_iters.c
@@ -59,7 +59,7 @@ struct iter_data {
  * regexp is filled in with allocated memory contained a regular
  * expression to be used with re_comp/compile that matches what the
  * shell-style glob would match.  If glob does not contain an "@"
- * character and realm is not NULL, "@<realm>" is appended to the regexp.
+ * character and realm is not NULL, "@*" is appended to the regexp.
  *
  * Conversion algorithm:
  *
@@ -85,8 +85,7 @@ 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 ? (strlen(realm)+1) : 0));
+     p = (char *) malloc(strlen(glob)*2+ 3 + (append_realm ? 2 : 0));
      if (p == NULL)
          return ENOMEM;
      *regexp = p;
@@ -120,8 +119,7 @@ kadm5_ret_t glob_to_regexp(char *glob, char *realm, char **regexp)
 
      if (append_realm) {
          *p++ = '@';
-         strcpy(p, realm);
-         p += strlen(realm);
+         *p++ = '*';
      }
 
      *p++ = '$';