diff options
| author | Simo Sorce <idra@samba.org> | 2012-04-26 15:05:11 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2012-05-04 16:51:28 +0200 |
| commit | c2f663263c60e6a4b83d85d70fc1e091d77618f5 (patch) | |
| tree | d6ef6da7b4ec8ea227111820d3466710048aa1be | |
| parent | 94b9af6ac6e7d524398d971c44cc5569cf70346f (diff) | |
| download | samba-c2f663263c60e6a4b83d85d70fc1e091d77618f5.tar.gz samba-c2f663263c60e6a4b83d85d70fc1e091d77618f5.tar.bz2 samba-c2f663263c60e6a4b83d85d70fc1e091d77618f5.zip | |
Move keytab_copy to krb5samba lib
This is a helper fucntion that uses purely krb5 code, so it belongs to
krb5samba which is the krb5 wrapper for samba.
| -rw-r--r-- | lib/krb5_wrap/keytab_util.c (renamed from source4/auth/kerberos/keytab_copy.c) | 3 | ||||
| -rw-r--r-- | lib/krb5_wrap/krb5_samba.h | 11 | ||||
| -rwxr-xr-x | lib/krb5_wrap/wscript_build | 2 | ||||
| -rwxr-xr-x | source4/auth/kerberos/wscript_build | 2 |
4 files changed, 14 insertions, 4 deletions
diff --git a/source4/auth/kerberos/keytab_copy.c b/lib/krb5_wrap/keytab_util.c index 3dd687dec2..12aca7f5a0 100644 --- a/source4/auth/kerberos/keytab_copy.c +++ b/lib/krb5_wrap/keytab_util.c @@ -34,8 +34,7 @@ */ #include "includes.h" -#include "system/kerberos.h" -#include "auth/kerberos/kerberos.h" +#include "krb5_samba.h" static krb5_boolean compare_keyblock(const krb5_keyblock *a, const krb5_keyblock *b) diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h index 864cda67bb..e2bd634d7a 100644 --- a/lib/krb5_wrap/krb5_samba.h +++ b/lib/krb5_wrap/krb5_samba.h @@ -241,6 +241,17 @@ bool unwrap_edata_ntstatus(TALLOC_CTX *mem_ctx, DATA_BLOB *edata, DATA_BLOB *edata_out); + +krb5_error_code kt_copy(krb5_context context, + const char *from, + const char *to); +krb5_error_code kt_copy_one_principal(krb5_context context, + const char *from, + const char *to, + const char *principal, + krb5_kvno kvno, + krb5_enctype *enctypes); + #endif /* HAVE_KRB5 */ int cli_krb5_get_ticket(TALLOC_CTX *mem_ctx, diff --git a/lib/krb5_wrap/wscript_build b/lib/krb5_wrap/wscript_build index c585819834..2a61f5633f 100755 --- a/lib/krb5_wrap/wscript_build +++ b/lib/krb5_wrap/wscript_build @@ -1,7 +1,7 @@ #!/usr/bin/env python bld.SAMBA_LIBRARY('krb5samba', - source='krb5_samba.c', + source='krb5_samba.c keytab_util.c', deps='samba-util asn1util talloc krb5 com_err', private_library=True ) diff --git a/source4/auth/kerberos/wscript_build b/source4/auth/kerberos/wscript_build index aef7fc6605..0588bfb2e3 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_pac.c keytab_copy.c', + source='kerberos_pac.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', |