Merge -r 18631:18635 from trunk

git-svn-id: svn://anonsvn.mit.edu/krb5/users/coffman/preauth-plugin@18636 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kdc/network.c b/src/kdc/network.c
index 42c487a2c8951de69bfd5d005d46b32ee3740e2e..3cb4400dfc3b45c86419b26a4840c949e3fb8d56 100644 (file)
--- a/src/kdc/network.c
+++ b/src/kdc/network.c
@@ -904,6 +904,8 @@ make_toolong_error (krb5_data **out)
     errpkt.error = KRB_ERR_FIELD_TOOLONG;
     errpkt.server = tgs_server;
     errpkt.client = NULL;
+    errpkt.cusec = 0;
+    errpkt.ctime = 0;
     errpkt.text.length = 0;
     errpkt.text.data = 0;
     errpkt.e_data.length = 0;

diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c
index 6eddfaa904a6f5561e197e3b26168370d96e1f78..a20af6b17514a528f21c7a1a77341e858a489fd1 100644 (file)
--- a/src/lib/kdb/kdb5.c
+++ b/src/lib/kdb/kdb5.c
@@ -585,10 +585,13 @@ get_errmsg (krb5_context kcontext, krb5_error_code err_code)
     /* Must be called with dal_handle->lib_handle locked!  */
     assert(kcontext->db_context != NULL);
     dal_handle = (kdb5_dal_handle *) kcontext->db_context;
+    if (dal_handle->lib_handle->vftabl.errcode_2_string == NULL)
+       return;
     e = dal_handle->lib_handle->vftabl.errcode_2_string(kcontext, err_code);
     assert (e != NULL);
     krb5_set_error_message(kcontext, err_code, "%s", e);
-    dal_handle->lib_handle->vftabl.release_errcode_string(kcontext, e);
+    if (dal_handle->lib_handle->vftabl.release_errcode_string)
+       dal_handle->lib_handle->vftabl.release_errcode_string(kcontext, e);
 }
 
 /*

diff --git a/src/lib/krb5/os/ref_std_conf.out b/src/lib/krb5/os/ref_std_conf.out
index 273a7664b6fce8646213ab8638f69154db406ac9..96349468c5be90826b96c7b0e174067b26d92aa0 100644 (file)
--- a/src/lib/krb5/os/ref_std_conf.out
+++ b/src/lib/krb5/os/ref_std_conf.out
@@ -9,5 +9,5 @@ krb_get_host_realm(itar.bad.idea) returned: 'NSA.GOV'
 krb_get_host_realm(really.BAD.IDEA.) returned: 'NSA.GOV'
 krb_get_host_realm(clipper.bad.idea) returned: 'NIST.GOV'
 krb_get_host_realm(KeYEsCrOW.BaD.IDea) returned: 'NSA.GOV'
-krb_get_host_realm(pgp.good.idea) returned: 'GOOD.IDEA'
-krb_get_host_realm(no_domain) returned: 'NEW.DEFAULT.REALM'
+krb_get_host_realm(pgp.good.idea) returned: ''
+krb_get_host_realm(no_domain) returned: ''

diff --git a/src/util/support/fake-addrinfo.c b/src/util/support/fake-addrinfo.c
index eba4c74b604ed9638fc9cc00ad35208d9c4559b5..a1a4818d2a3ba52d91a1a996b42bd779e65b1a3f 100644 (file)
--- a/src/util/support/fake-addrinfo.c
+++ b/src/util/support/fake-addrinfo.c
@@ -177,7 +177,7 @@ typedef struct {
     {                                                          \
        (HP) = (gethostbyname_r((NAME), &TMP.ent, &TMP.data)    \
                ? 0                                             \
-               : &my_h_ent);                                   \
+               : &TMP.ent);                                    \
        (ERR) = h_errno;                                        \
     }
 /*