diff options
| author | Barry Jaspan <bjaspan@mit.edu> | 1996-11-07 21:43:14 +0000 |
|---|---|---|
| committer | Barry Jaspan <bjaspan@mit.edu> | 1996-11-07 21:43:14 +0000 |
| commit | 94f68efe7c406b6a4921bd2cc479c3a8c2e2d587 (patch) | |
| tree | a44a8a4fb56ad62a1ae9313692186e1bb5b37389 /src | |
| parent | 841b4d8fa2a3a2bf1b808f2ce9536d2ceceeee31 (diff) | |
| download | krb5-94f68efe7c406b6a4921bd2cc479c3a8c2e2d587.tar.gz krb5-94f68efe7c406b6a4921bd2cc479c3a8c2e2d587.tar.xz krb5-94f68efe7c406b6a4921bd2cc479c3a8c2e2d587.zip | |
* 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/kadm5/srv/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/kadm5/srv/svr_iters.c | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog index edc6f3559..823576f5c 100644 --- 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 19c900021..706e77821 100644 --- 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++ = '$'; |