diff options
| author | Kevin Coffman <kwc@citi.umich.edu> | 2006-10-02 18:44:14 +0000 |
|---|---|---|
| committer | Kevin Coffman <kwc@citi.umich.edu> | 2006-10-02 18:44:14 +0000 |
| commit | 4a81f8801f5f129a02af7539f8f36a6c76797c85 (patch) | |
| tree | 38d4c2e608d8a067192d361cb7a5bb1ee467cca3 | |
| parent | f2c9d7d8711e8a9f40e95dc5a2948158a43a7123 (diff) | |
| download | krb5-coffman/preauth-plugin.tar.gz | |
Merge -r 18631:18635 from trunkcoffman/preauth-plugin
git-svn-id: svn://anonsvn.mit.edu/krb5/users/coffman/preauth-plugin@18636 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/kdc/network.c | 2 | ||||
| -rw-r--r-- | src/lib/kdb/kdb5.c | 5 | ||||
| -rw-r--r-- | src/lib/krb5/os/ref_std_conf.out | 4 | ||||
| -rw-r--r-- | src/util/support/fake-addrinfo.c | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/src/kdc/network.c b/src/kdc/network.c index 42c487a2c..3cb4400df 100644 --- 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 6eddfaa90..a20af6b17 100644 --- 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 273a7664b..96349468c 100644 --- 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 eba4c74b6..a1a4818d2 100644 --- 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; \ } /* |