sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

krb5_wrap: Fix smb_krb5_mk_error() with MIT Kerberos

Browse Source 
The server principal is required, so if not set create an obscure one.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Andreas Schneider 2016-09-02 11:54:48 +02:00 committed by Jeremy Allison
parent 5ae447e102
commit 2f36e6d3ec
4 changed files with 50 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
lib/krb5_wrap/krb5_samba.c
View File

@ -206,6 +206,8 @@ krb5_error_code smb_krb5_mk_error(krb5_context context,
krb5_error_code error_code,
const char *e_text,
krb5_data *e_data,
const krb5_principal client,
const krb5_principal server,
krb5_data *enc_err)
{
krb5_error_code code = EINVAL;
@ -214,27 +216,59 @@ krb5_error_code smb_krb5_mk_error(krb5_context context,
error_code,
e_text,
e_data,
NULL, /* client */
NULL, /* server */
client,
server,
NULL, /* client_time */
NULL, /* client_usec */
enc_err);
#else
krb5_error dec_err = {
.error = error_code,
};
krb5_principal unspec_server = NULL;
krb5_error errpkt;
if (e_text != NULL) {
dec_err.text.length = strlen(e_text);
dec_err.text.data = discard_const_p(char, e_text);
errpkt.ctime = 0;
errpkt.cusec = 0;
code = krb5_us_timeofday(context,
&errpkt.stime,
&errpkt.susec);
if (code != 0) {
return code;
}
errpkt.error = error_code;
errpkt.text.length = 0;
if (e_text != NULL) {
errpkt.text.length = strlen(e_text);
errpkt.text.data = discard_const_p(char, e_text);
}
errpkt.e_data.magic = KV5M_DATA;
errpkt.e_data.length = 0;
errpkt.e_data.data = NULL;
if (e_data != NULL) {
dec_err.e_data = *e_data;
errpkt.e_data = *e_data;
}
errpkt.client = client;
if (server != NULL) {
errpkt.server = server;
} else {
code = smb_krb5_make_principal(context,
&unspec_server,
"<unspecified realm>",
NULL);
if (code != 0) {
return code;
}
errpkt.server = unspec_server;
}
code = krb5_mk_error(context,
&dec_err,
&errpkt,
enc_err);
krb5_free_principal(context, unspec_server);
#endif
return code;
}

2
lib/krb5_wrap/krb5_samba.h
View File

@ -169,6 +169,8 @@ krb5_error_code smb_krb5_mk_error(krb5_context context,
krb5_error_code error_code,
const char *e_text,
krb5_data *e_data,
const krb5_principal client,
const krb5_principal server,
krb5_data *enc_err);
krb5_error_code smb_krb5_get_allowed_etypes(krb5_context context,

2
source4/kdc/kdc-server.c
View File

@ -83,6 +83,8 @@ static NTSTATUS kdc_proxy_unavailable_error(struct kdc_server *kdc,
KRB5KDC_ERR_SVC_UNAVAILABLE,
NULL,
NULL,
NULL,
NULL,
&enc_error);
if (code != 0) {
DBG_WARNING("Unable to form krb5 error reply\n");

2
source4/kdc/kpasswd-heimdal.c
View File

@ -81,6 +81,8 @@ static bool kpasswdd_make_unauth_error_reply(struct kdc_server *kdc,
result_code,
NULL,
&k5_error_bytes,
NULL,
NULL,
&k5_error_blob);
if (kret) {
return false;