oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Also try to match aganist the expression appended with

Browse Source 
`@default-realm'.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4480 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1998-03-01 01:23:06 +00:00
parent 7d5e4e9ed1
commit c0640b8e20
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/kadm5/get_princs_s.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan * Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -42,6 +42,7 @@ RCSID("$Id$");
struct foreach_data { struct foreach_data {
const char *exp; const char *exp;
char *exp2;
char **princs; char **princs;
int count; int count;
}; };
@@ -68,7 +69,7 @@ foreach(krb5_context context, HDB *db, hdb_entry *ent, void *data)
if(ret) if(ret)
return ret; return ret;
if(d->exp){ if(d->exp){
if(fnmatch(d->exp, princ, 0) == 0) if(fnmatch(d->exp, princ, 0) == 0 || fnmatch(d->exp2, princ, 0) == 0)
ret = add_princ(d, princ); ret = add_princ(d, princ);
else else
free(princ); free(princ);
@@ -95,6 +96,12 @@ kadm5_s_get_principals(void *server_handle,
return ret; return ret;
} }
d.exp = exp; d.exp = exp;
{
krb5_realm r;
krb5_get_default_realm(context->context, &r);
asprintf(&d.exp2, "%s@%s", exp, r);
free(r);
}
d.princs = NULL; d.princs = NULL;
d.count = 0; d.count = 0;
ret = hdb_foreach(context->context, context->db, foreach, &d); ret = hdb_foreach(context->context, context->db, foreach, &d);
@@ -106,5 +113,6 @@ kadm5_s_get_principals(void *server_handle,
*count = d.count - 1; *count = d.count - 1;
}else }else
kadm5_free_name_list(context, d.princs, &d.count); kadm5_free_name_list(context, d.princs, &d.count);
free(d.exp2);
return _kadm5_error_code(ret); return _kadm5_error_code(ret);
} }