change to use new address formats

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1099 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/asn.1/ksafe2safe.c b/src/lib/krb5/asn.1/ksafe2safe.c
index 464693bfa957ef47eb52d2544f910dfd50994fd5..b15dca0e6e3b9b6a22c1aaf8ab7b5c92dfd9bc9a 100644 (file)
--- a/src/lib/krb5/asn.1/ksafe2safe.c
+++ b/src/lib/krb5/asn.1/ksafe2safe.c
@@ -58,8 +58,12 @@ register int *error;
        return(0);
     }
     retval->msec = val->msec;
-    retval->addresses = krb5_address2KRB5_HostAddresses(val->addresses, error);
-    if (!retval->addresses) {
+    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;
     }
     retval->checksum = krb5_checksum2KRB5_Checksum(val->checksum, error);

diff --git a/src/lib/krb5/asn.1/safe2ksafe.c b/src/lib/krb5/asn.1/safe2ksafe.c
index 118bec1ce2ad6afe0bec74508bc7daa1c9216a19..a9398a19b72faab225cb48c3e70e5098f1b5493a 100644 (file)
--- a/src/lib/krb5/asn.1/safe2ksafe.c
+++ b/src/lib/krb5/asn.1/safe2ksafe.c
@@ -58,8 +58,12 @@ register int *error;
        return(0);
     }
     retval->msec = val->msec;
-    retval->addresses = KRB5_HostAddresses2krb5_address(val->addresses, error);
-    if (!retval->addresses) {
+    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;
     }
     retval->checksum = KRB5_Checksum2krb5_checksum(val->checksum, error);