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

(fetch_acl): fix wrong cases, use krb5_principal_match

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8924 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2000-08-10 19:24:08 +00:00
parent 5f648d3799
commit d68fd8235a
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/kadm5/acl.c
View File

@@ -70,7 +70,7 @@ _kadm5_privs_to_string(u_int32_t privs, char *string, size_t len)
/* /*
* retrieve the right for the current caller on `princ' (NULL means all) * retrieve the right for the current caller on `princ' (NULL means all)
* and store them in `flags' * and store them in `ret_flags'
* return 0 or an error. * return 0 or an error.
*/ */
@@ -83,18 +83,14 @@ fetch_acl (kadm5_server_context *context,
FILE *f = fopen(context->config.acl_file, "r"); FILE *f = fopen(context->config.acl_file, "r");
krb5_error_code ret = 0; krb5_error_code ret = 0;
if(f != NULL){ if(f != NULL) {
char buf[256]; char buf[256];
char princ_name[256];
if (princ != NULL)
krb5_unparse_name_fixed (context->context, princ,
princ_name, sizeof(princ_name));
while(fgets(buf, sizeof(buf), f) != NULL){ while(fgets(buf, sizeof(buf), f) != NULL){
char *foo = NULL, *p; char *foo = NULL, *p;
krb5_principal this_princ; krb5_principal this_princ;
flags = -1;
p = strtok_r(buf, " \t\n", &foo); p = strtok_r(buf, " \t\n", &foo);
if(p == NULL) if(p == NULL)
continue; continue;
@@ -115,18 +111,24 @@ fetch_acl (kadm5_server_context *context,
break; break;
p = strtok_r(NULL, "\n", &foo); p = strtok_r(NULL, "\n", &foo);
if (p == NULL) { if (p == NULL) {
if (princ == NULL) { ret = 0;
break;
}
if (princ != NULL) {
krb5_principal pattern_princ;
krb5_boolean tmp;
ret = krb5_parse_name (context->context, p, &pattern_princ);
if (ret)
break;
tmp = krb5_principal_match (context->context,
princ, pattern_princ);
krb5_free_principal (context->context, pattern_princ);
if (tmp) {
ret = 0; ret = 0;
break; break;
} else {
continue;
} }
} }
if(princ != NULL
&& fnmatch (p, princ_name, FNM_PATHNAME) == 0) {
ret = _kadm5_string_to_privs(p, &flags);
break;
}
} }
fclose(f); fclose(f);
} }