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

Trivial policy bug fix.

Browse Source
This commit is contained in:
Nicolas Williams
2011-07-18 15:40:59 -05:00
parent e7ea698366
commit af23757829
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kadmin/util.c
View File

@@ -186,7 +186,9 @@ edit_policy (const char *prompt, char **policy, int *mask, int bit)
if (mask && (*mask & bit)) if (mask && (*mask & bit))
return 0; return 0;
strlcpy(buf, *policy, sizeof (buf)); buf[0] = '\0';
if (*policy)
strlcpy(buf, *policy, sizeof (buf));
for (;;) { for (;;) {
if(get_response("Policy", buf, resp, sizeof(resp)) != 0) if(get_response("Policy", buf, resp, sizeof(resp)) != 0)
return 1; return 1;
@@ -444,6 +446,14 @@ set_defaults(kadm5_principal_ent_t ent, int *mask,
&& (default_mask & KADM5_ATTRIBUTES) && (default_mask & KADM5_ATTRIBUTES)
&& !(*mask & KADM5_ATTRIBUTES)) && !(*mask & KADM5_ATTRIBUTES))
ent->attributes = default_ent->attributes & ~KRB5_KDB_DISALLOW_ALL_TIX; ent->attributes = default_ent->attributes & ~KRB5_KDB_DISALLOW_ALL_TIX;
if (default_ent
&& (default_mask & KADM5_POLICY)
&& !(*mask & KADM5_POLICY)) {
ent->policy = strdup(default_ent->policy);
if (ent->policy == NULL)
abort();
}
} }
int int