(kadm5_log_replay_create): handle more NULL pointers (should they

really happen?)


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8338 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2000-06-07 02:55:46 +00:00
parent 9f46991dfa
commit 386538399f

View File

@@ -516,15 +516,23 @@ kadm5_log_replay_modify (kadm5_server_context *context,
if (ret) if (ret)
return ret; return ret;
if (mask & KADM5_PRINC_EXPIRE_TIME) { if (mask & KADM5_PRINC_EXPIRE_TIME) {
if (log_ent.valid_end == NULL) {
ent.valid_end = NULL;
} else {
if (ent.valid_end == NULL) if (ent.valid_end == NULL)
ent.valid_end = malloc(sizeof(*ent.valid_end)); ent.valid_end = malloc(sizeof(*ent.valid_end));
*ent.valid_end = *log_ent.valid_end; *ent.valid_end = *log_ent.valid_end;
} }
}
if (mask & KADM5_PW_EXPIRATION) { if (mask & KADM5_PW_EXPIRATION) {
if (log.ent_pw_end == NULL) {
ent.pw_end = NULL;
} else {
if (ent.pw_end == NULL) if (ent.pw_end == NULL)
ent.pw_end = malloc(sizeof(*ent.pw_end)); ent.pw_end = malloc(sizeof(*ent.pw_end));
*ent.pw_end = *log_ent.pw_end; *ent.pw_end = *log_ent.pw_end;
} }
}
if (mask & KADM5_LAST_PWD_CHANGE) { if (mask & KADM5_LAST_PWD_CHANGE) {
abort (); /* XXX */ abort (); /* XXX */
} }