From a2de8a12d3a218f172cf41fbf896ccf2b3bddfc8 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Thu, 26 Apr 2012 12:27:05 -0400
Subject: [PATCH] s4-auth-krb: smb_rd_req_return_stuff is used only in
 gensec_krb5

Make it clearly a gensec_krb5 accessory file.
This function should never be used anywhere else.
This function was copied out from the Heimdal tree and is kept in a separate
file for clarity and to keep the original license boilerplate.
---
 source4/auth/gensec/gensec_krb5.c                              |  1 +
 .../{kerberos/kerberos_heimdal.c => gensec/gensec_krb5_util.c} |  0
 source4/auth/gensec/gensec_krb5_util.h                         | 10 ++++++++++
 source4/auth/gensec/wscript_build                              |  2 +-
 source4/auth/kerberos/wscript_build                            |  2 +-
 5 files changed, 13 insertions(+), 2 deletions(-)
 rename source4/auth/{kerberos/kerberos_heimdal.c => gensec/gensec_krb5_util.c} (100%)
 create mode 100644 source4/auth/gensec/gensec_krb5_util.h
 mode change 100644 => 100755 source4/auth/gensec/wscript_build

diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c
index 8dde8373a8e..6209c2ec4ef 100644
--- a/source4/auth/gensec/gensec_krb5.c
+++ b/source4/auth/gensec/gensec_krb5.c
@@ -41,6 +41,7 @@
 #include "lib/util/util_net.h"
 #include "../lib/util/asn1.h"
 #include "auth/kerberos/pac_utils.h"
+#include "gensec_krb5_util.h"
 
 _PUBLIC_ NTSTATUS gensec_krb5_init(void);
 
diff --git a/source4/auth/kerberos/kerberos_heimdal.c b/source4/auth/gensec/gensec_krb5_util.c
similarity index 100%
rename from source4/auth/kerberos/kerberos_heimdal.c
rename to source4/auth/gensec/gensec_krb5_util.c
diff --git a/source4/auth/gensec/gensec_krb5_util.h b/source4/auth/gensec/gensec_krb5_util.h
new file mode 100644
index 00000000000..09be3ff6a79
--- /dev/null
+++ b/source4/auth/gensec/gensec_krb5_util.h
@@ -0,0 +1,10 @@
+/* See gensec_krb5_util.c for the license */
+
+krb5_error_code smb_rd_req_return_stuff(krb5_context context, 
+					krb5_auth_context *auth_context,
+					const krb5_data *inbuf,
+					krb5_keytab keytab, 
+					krb5_principal acceptor_principal,
+					krb5_data *outbuf, 
+					krb5_ticket **ticket, 
+					krb5_keyblock **keyblock);
diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build
old mode 100644
new mode 100755
index dd25b23fdb2..e7bc0219633
--- a/source4/auth/gensec/wscript_build
+++ b/source4/auth/gensec/wscript_build
@@ -6,7 +6,7 @@ bld.SAMBA_SUBSYSTEM('gensec_util',
                     autoproto='gensec_proto.h')
 
 bld.SAMBA_MODULE('gensec_krb5',
-	source='gensec_krb5.c',
+	source='gensec_krb5.c gensec_krb5_util.c',
 	subsystem='gensec',
 	init_function='gensec_krb5_init',
 	deps='samba-credentials authkrb5 com_err gensec_util',
diff --git a/source4/auth/kerberos/wscript_build b/source4/auth/kerberos/wscript_build
index 8f2900be5c0..aef7fc66059 100755
--- a/source4/auth/kerberos/wscript_build
+++ b/source4/auth/kerberos/wscript_build
@@ -6,7 +6,7 @@ bld.SAMBA_SUBSYSTEM('KRB_INIT_CTX',
 		   )
 
 bld.SAMBA_LIBRARY('authkrb5',
-                  source='kerberos_heimdal.c kerberos_pac.c keytab_copy.c',
+                  source='kerberos_pac.c keytab_copy.c',
                   autoproto='proto.h',
                   public_deps='ndr-krb5pac krb5samba samba_socket LIBCLI_RESOLVE asn1',
                   deps='auth_sam_reply tevent LIBPACKET ndr ldb krb5samba KRB_INIT_CTX KRB5_PAC errors',
-- 
2.11.4.GIT