diff options
| author | Simo Sorce <idra@samba.org> | 2012-04-26 12:27:05 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2012-05-04 16:51:28 +0200 |
| commit | a2de8a12d3a218f172cf41fbf896ccf2b3bddfc8 (patch) | |
| tree | 12184589d138ef824b5119b5c40a29d5fa5d81fe | |
| parent | 3109a3de1f362e9dc42bceb81a393e2dbf80b7b2 (diff) | |
| download | samba-a2de8a12d3a218f172cf41fbf896ccf2b3bddfc8.tar.gz samba-a2de8a12d3a218f172cf41fbf896ccf2b3bddfc8.tar.bz2 samba-a2de8a12d3a218f172cf41fbf896ccf2b3bddfc8.zip | |
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.
| -rw-r--r-- | source4/auth/gensec/gensec_krb5.c | 1 | ||||
| -rw-r--r-- | source4/auth/gensec/gensec_krb5_util.c (renamed from source4/auth/kerberos/kerberos_heimdal.c) | 0 | ||||
| -rw-r--r-- | source4/auth/gensec/gensec_krb5_util.h | 10 | ||||
| -rwxr-xr-x[-rw-r--r--] | source4/auth/gensec/wscript_build | 2 | ||||
| -rwxr-xr-x | source4/auth/kerberos/wscript_build | 2 |
5 files changed, 13 insertions, 2 deletions
diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c index 8dde8373a8..6209c2ec4e 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 index 44cb39c518..44cb39c518 100644 --- a/source4/auth/kerberos/kerberos_heimdal.c +++ b/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 0000000000..09be3ff6a7 --- /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 index dd25b23fdb..e7bc021963 100644..100755 --- 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 8f2900be5c..aef7fc6605 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', |