(kadm5_log_replay_modify): handle max_life == NULL and max_renew ==
NULL git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8333 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -532,9 +532,13 @@ kadm5_log_replay_modify (kadm5_server_context *context,
|
|||||||
ent.flags = log_ent.flags;
|
ent.flags = log_ent.flags;
|
||||||
}
|
}
|
||||||
if (mask & KADM5_MAX_LIFE) {
|
if (mask & KADM5_MAX_LIFE) {
|
||||||
if (ent.max_life == NULL)
|
if (log_ent.max_life == NULL) {
|
||||||
ent.max_life = malloc (sizeof(*ent.max_life));
|
ent.max_life = NULL;
|
||||||
*ent.max_life = *log_ent.max_life;
|
} else {
|
||||||
|
if (ent.max_life == NULL)
|
||||||
|
ent.max_life = malloc (sizeof(*ent.max_life));
|
||||||
|
*ent.max_life = *log_ent.max_life;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if ((mask & KADM5_MOD_TIME) && (mask & KADM5_MOD_NAME)) {
|
if ((mask & KADM5_MOD_TIME) && (mask & KADM5_MOD_NAME)) {
|
||||||
if (ent.modified_by == NULL) {
|
if (ent.modified_by == NULL) {
|
||||||
@@ -559,9 +563,13 @@ kadm5_log_replay_modify (kadm5_server_context *context,
|
|||||||
abort (); /* XXX */
|
abort (); /* XXX */
|
||||||
}
|
}
|
||||||
if (mask & KADM5_MAX_RLIFE) {
|
if (mask & KADM5_MAX_RLIFE) {
|
||||||
if (ent.max_renew == NULL)
|
if (log_ent.max_renew == NULL) {
|
||||||
ent.max_renew = malloc (sizeof(*ent.max_renew));
|
ent.max_renew = NULL;
|
||||||
*ent.max_renew = *log_ent.max_renew;
|
} else {
|
||||||
|
if (ent.max_renew == NULL)
|
||||||
|
ent.max_renew = malloc (sizeof(*ent.max_renew));
|
||||||
|
*ent.max_renew = *log_ent.max_renew;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (mask & KADM5_LAST_SUCCESS) {
|
if (mask & KADM5_LAST_SUCCESS) {
|
||||||
abort (); /* XXX */
|
abort (); /* XXX */
|
||||||
|
Reference in New Issue
Block a user