2 files changed, 16 insertions, 9 deletions
diff --git a/src/lib/krb5/asn.1/kprep2prep.c b/src/lib/krb5/asn.1/kprep2prep.c
index d3747bd3d..a78588029 100644
--- a/src/lib/krb5/asn.1/kprep2prep.c
+++ b/src/lib/krb5/asn.1/kprep2prep.c
@@ -50,15 +50,18 @@ register int *error;
     }
     retval->timestamp = unix2gentime(val->timestamp, error);
     if (!retval->timestamp) {
+    errout:
 	free_KRB5_EncKrbPrivPart(retval);
 	return(0);
     }
     retval->msec = val->msec;
-    retval->addresses = krb5_address2KRB5_HostAddresses(val->addresses, error);
-    if (!retval->addresses) {
-	free_KRB5_EncKrbPrivPart(retval);
-	return(0);
+    retval->s__address = krb5_addr2KRB5_HostAddress(val->s_address, error);
+    if (!retval->s__address) {
+	goto errout;
+    }
+    retval->r__address = krb5_addr2KRB5_HostAddress(val->r_address, error);
+    if (!retval->r__address) {
+	goto errout;
     }
-
     return(retval);
 }
diff --git a/src/lib/krb5/asn.1/prep2kprep.c b/src/lib/krb5/asn.1/prep2kprep.c
index d04c541a5..63c2cc458 100644
--- a/src/lib/krb5/asn.1/prep2kprep.c
+++ b/src/lib/krb5/asn.1/prep2kprep.c
@@ -53,14 +53,18 @@ register int *error;
     }
     retval->timestamp = gentime2unix(val->timestamp, error);
     if (*error) {
+    errout:
 	krb5_free_priv_enc_part(retval);
 	return(0);
     }
     retval->msec = val->msec;
-    retval->addresses = KRB5_HostAddresses2krb5_address(val->addresses, error);
-    if (!retval->addresses) {
-	krb5_free_priv_enc_part(retval);
-	return(0);
+    retval->s_address = KRB5_HostAddress2krb5_addr(val->s__address, error);
+    if (!retval->s_address) {
+	goto errout;
+    }
+    retval->r_address = KRB5_HostAddress2krb5_addr(val->r__address, error);
+    if (!retval->r_address) {
+	goto errout;
     }
     return(retval);
 }