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

Remove policy name checking against krb5.conf code.

Browse Source
This commit is contained in:
Nicolas Williams
2011-07-19 14:18:54 -05:00
parent 87742e8118
commit 07370612bd
1 changed files with 2 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/kadm5/modify_s.c
View File

@@ -35,35 +35,6 @@
RCSID("$Id$"); RCSID("$Id$");
static int
check_policy_exists(kadm5_server_context *context, const char *pol_name)
{
char **pols;
char **pol;
char *pend;
size_t len;
pols = krb5_config_get_strings(context->context, "kadmin",
"policies", NULL);
if (pols == NULL) {
if (strcmp(pol_name, "default") == 0)
return 1;
return 0;
}
for (pol = pols; *pol != NULL; pol++) {
pend = strchr(pol, ':');
if (pend == NULL)
len = strlen(*pol);
else
len = pend - *pol;
if (strncmp(pol_name, *pol, len) == 0 && pol_name[len] == '\0')
return 1;
}
return 0;
}
static kadm5_ret_t static kadm5_ret_t
modify_principal(void *server_handle, modify_principal(void *server_handle,
kadm5_principal_ent_t princ, kadm5_principal_ent_t princ,
@@ -76,9 +47,8 @@ modify_principal(void *server_handle,
if((mask & forbidden_mask)) if((mask & forbidden_mask))
return KADM5_BAD_MASK; return KADM5_BAD_MASK;
if((mask & KADM5_POLICY)) { if((mask & KADM5_POLICY) && strcmp(princ->policy, "default"))
if (!check_policy_exists(context, princ->policy)) return KADM5_UNK_POLICY;
return KADM5_UNK_POLICY;
} }
memset(&ent, 0, sizeof(ent)); memset(&ent, 0, sizeof(ent));