From 388b1f5dada099d5ed4f6fc32d361660c1bf1c0c Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Wed, 7 Jun 2000 01:57:31 +0000 Subject: [PATCH] (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 --- lib/kadm5/log.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/kadm5/log.c b/lib/kadm5/log.c index 31cc58200..2ee1cbdfe 100644 --- a/lib/kadm5/log.c +++ b/lib/kadm5/log.c @@ -532,9 +532,13 @@ kadm5_log_replay_modify (kadm5_server_context *context, ent.flags = log_ent.flags; } if (mask & KADM5_MAX_LIFE) { - if (ent.max_life == NULL) - ent.max_life = malloc (sizeof(*ent.max_life)); - *ent.max_life = *log_ent.max_life; + if (log_ent.max_life == NULL) { + ent.max_life = NULL; + } 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 (ent.modified_by == NULL) { @@ -559,9 +563,13 @@ kadm5_log_replay_modify (kadm5_server_context *context, abort (); /* XXX */ } if (mask & KADM5_MAX_RLIFE) { - if (ent.max_renew == NULL) - ent.max_renew = malloc (sizeof(*ent.max_renew)); - *ent.max_renew = *log_ent.max_renew; + if (log_ent.max_renew == NULL) { + ent.max_renew = NULL; + } 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) { abort (); /* XXX */