diff options
| author | Simo Sorce <idra@samba.org> | 2012-04-21 17:26:18 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2012-04-23 19:20:38 -0400 |
| commit | 08c733d75fd83fd5e32ced9712d41dd595e0f182 (patch) | |
| tree | a49d6ebbf1d6c498294862f268d6890a1e6a507f /source4 | |
| parent | f7070c90b94954835478a09e89a85c03f0f85500 (diff) | |
| download | samba-08c733d75fd83fd5e32ced9712d41dd595e0f182.tar.gz samba-08c733d75fd83fd5e32ced9712d41dd595e0f182.tar.bz2 samba-08c733d75fd83fd5e32ced9712d41dd595e0f182.zip | |
Make krb5 wrapper library common so they can be used all over
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/auth/kerberos/kerberos.h | 3 | ||||
| -rwxr-xr-x | source4/auth/kerberos/wscript_build | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | source4/dsdb/wscript_build | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/source4/auth/kerberos/kerberos.h b/source4/auth/kerberos/kerberos.h index fc2195de8d..cc02aee27f 100644 --- a/source4/auth/kerberos/kerberos.h +++ b/source4/auth/kerberos/kerberos.h @@ -23,9 +23,10 @@ #if defined(HAVE_KRB5) +#include "system/kerberos.h" #include "auth/kerberos/krb5_init_context.h" #include "librpc/gen_ndr/krb5pac.h" -#include "libcli/auth/krb5_wrap.h" +#include "lib/krb5_wrap/krb5_samba.h" struct auth_user_info_dc; struct cli_credentials; diff --git a/source4/auth/kerberos/wscript_build b/source4/auth/kerberos/wscript_build index be41d1b7b3..2ba6d56410 100755 --- a/source4/auth/kerberos/wscript_build +++ b/source4/auth/kerberos/wscript_build @@ -2,14 +2,14 @@ bld.SAMBA_SUBSYSTEM('KRB_INIT_CTX', source='krb5_init_context.c', - deps='krb5 com_err' + deps='krb5samba' ) bld.SAMBA_LIBRARY('authkrb5', source='kerberos.c kerberos_heimdal.c kerberos_pac.c keytab_copy.c', autoproto='proto.h', - public_deps='krb5 ndr-krb5pac samba_socket LIBCLI_RESOLVE com_err asn1', - deps='auth_sam_reply tevent LIBPACKET ndr ldb KRB5_WRAP KRB_INIT_CTX errors', + 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', private_library=True ) diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build index 0eb4eebe1f..af0defdb28 100644..100755 --- a/source4/dsdb/wscript_build +++ b/source4/dsdb/wscript_build @@ -9,7 +9,7 @@ bld.SAMBA_LIBRARY('samdb', public_deps='krb5', public_headers='', vnum='0.0.1', - deps='ndr NDR_DRSUAPI NDR_DRSBLOBS auth_system_session LIBCLI_AUTH ndr SAMDB_SCHEMA ldbsamba samdb-common LIBCLI_DRSUAPI cli-ldap-common samba-util com_err authkrb5 samba-credentials ldbwrap errors', + deps='ndr NDR_DRSUAPI NDR_DRSBLOBS auth_system_session LIBCLI_AUTH ndr SAMDB_SCHEMA ldbsamba samdb-common LIBCLI_DRSUAPI cli-ldap-common samba-util com_err authkrb5 samba-credentials ldbwrap errors krb5samba', ) |