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

(fetch_acl): do not return bogus flags and re-organize function

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10551 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2001-08-24 04:01:42 +00:00
parent 6f0e549ca6
commit 436ae373d6
1 changed files with 48 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
lib/kadm5/acl.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 - 2000 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2001 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -79,63 +79,64 @@ fetch_acl (kadm5_server_context *context,
krb5_const_principal princ, krb5_const_principal princ,
unsigned *ret_flags) unsigned *ret_flags)
{ {
unsigned flags = -1; FILE *f;
FILE *f = fopen(context->config.acl_file, "r");
krb5_error_code ret = 0; krb5_error_code ret = 0;
char buf[256];
if(f != NULL) { *ret_flags = 0;
char buf[256];
while(fgets(buf, sizeof(buf), f) != NULL){ /* no acl file -> no rights */
char *foo = NULL, *p; f = fopen(context->config.acl_file, "r");
krb5_principal this_princ; if (f == NULL)
return 0;
flags = -1; while(fgets(buf, sizeof(buf), f) != NULL) {
p = strtok_r(buf, " \t\n", &foo); char *foo = NULL, *p;
if(p == NULL) krb5_principal this_princ;
continue; unsigned flags = 0;
ret = krb5_parse_name(context->context, p, &this_princ);
if(ret) p = strtok_r(buf, " \t\n", &foo);
continue; if(p == NULL)
if(!krb5_principal_compare(context->context, continue;
context->caller, this_princ)) { if (*p == '#') /* comment */
krb5_free_principal(context->context, this_princ); continue;
continue; ret = krb5_parse_name(context->context, p, &this_princ);
} if(ret)
break;
if(!krb5_principal_compare(context->context,
context->caller, this_princ)) {
krb5_free_principal(context->context, this_princ); krb5_free_principal(context->context, this_princ);
p = strtok_r(NULL, " \t\n", &foo); continue;
if(p == NULL) }
continue; krb5_free_principal(context->context, this_princ);
ret = _kadm5_string_to_privs(p, &flags); p = strtok_r(NULL, " \t\n", &foo);
if(p == NULL)
continue;
ret = _kadm5_string_to_privs(p, &flags);
if (ret)
break;
p = strtok_r(NULL, "\n", &foo);
if (p == NULL) {
*ret_flags = flags;
break;
}
if (princ != NULL) {
krb5_principal pattern_princ;
krb5_boolean match;
ret = krb5_parse_name (context->context, p, &pattern_princ);
if (ret) if (ret)
break; break;
p = strtok_r(NULL, "\n", &foo); match = krb5_principal_match (context->context,
if (p == NULL) { princ, pattern_princ);
ret = 0; krb5_free_principal (context->context, pattern_princ);
if (match) {
*ret_flags = flags;
break; 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;
break;
}
}
} }
fclose(f);
} }
if(flags == -1) fclose(f);
flags = 0;
if (ret == 0)
*ret_flags = flags;
return ret; return ret;
} }