summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2016-08-12 14:41:05 +0200
committerAndrew Bartlett <abartlet@samba.org>2016-08-30 11:34:14 +0200
commitab8628ac7a206d5b35022b6161f1ed9963ad0f97 (patch)
tree5a7619da3b6870aa30a2620af273af83e408d01c /source4
parentde224d70062695d50668d1b3084a80ac81d6d79b (diff)
downloadsamba-ab8628ac7a206d5b35022b6161f1ed9963ad0f97.tar.gz
gensec_krb5: Rename smb_rd_req_return_stuff()
Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4')
-rw-r--r--source4/auth/gensec/gensec_krb5.c12
-rw-r--r--source4/auth/gensec/gensec_krb5.h2
-rw-r--r--source4/auth/gensec/gensec_krb5_heimdal.c2
3 files changed, 9 insertions, 7 deletions
diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c
index 4198fef5012..03e869b92ab 100644
--- a/source4/auth/gensec/gensec_krb5.c
+++ b/source4/auth/gensec/gensec_krb5.c
@@ -618,11 +618,13 @@ static NTSTATUS gensec_krb5_update(struct gensec_security *gensec_security,
inbuf.length = in.length;
}
- ret = smb_rd_req_return_stuff(gensec_krb5_state->smb_krb5_context->krb5_context,
- &gensec_krb5_state->auth_context,
- &inbuf, keytab->keytab, server_in_keytab,
- &outbuf,
- &gensec_krb5_state->ticket,
+ ret = smb_krb5_rd_req_decoded(gensec_krb5_state->smb_krb5_context->krb5_context,
+ &gensec_krb5_state->auth_context,
+ &inbuf,
+ keytab->keytab,
+ server_in_keytab,
+ &outbuf,
+ &gensec_krb5_state->ticket,
&gensec_krb5_state->keyblock);
if (ret) {
diff --git a/source4/auth/gensec/gensec_krb5.h b/source4/auth/gensec/gensec_krb5.h
index 230eadc748d..ee684bee014 100644
--- a/source4/auth/gensec/gensec_krb5.h
+++ b/source4/auth/gensec/gensec_krb5.h
@@ -1,6 +1,6 @@
/* See gensec_krb5_util.c for the license */
-krb5_error_code smb_rd_req_return_stuff(krb5_context context,
+krb5_error_code smb_krb5_rd_req_decoded(krb5_context context,
krb5_auth_context *auth_context,
const krb5_data *inbuf,
krb5_keytab keytab,
diff --git a/source4/auth/gensec/gensec_krb5_heimdal.c b/source4/auth/gensec/gensec_krb5_heimdal.c
index 150d9185204..7e9cb5a4392 100644
--- a/source4/auth/gensec/gensec_krb5_heimdal.c
+++ b/source4/auth/gensec/gensec_krb5_heimdal.c
@@ -40,7 +40,7 @@
#include "gensec_krb5.h"
/* Taken from accept_sec_context.c,v 1.65 */
-krb5_error_code smb_rd_req_return_stuff(krb5_context context,
+krb5_error_code smb_krb5_rd_req_decoded(krb5_context context,
krb5_auth_context *auth_context,
const krb5_data *inbuf,
krb5_keytab keytab,