From 09289c073c1239f17dfcbc030310b1ed2a210328 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 3 Apr 2011 15:40:24 +0200 Subject: use system heimdal headers if possible, fix missing dependencies on hx509 and krb5 libraries. --- source4/rpc_server/backupkey/dcesrv_backupkey.c | 9 ++++++--- source4/rpc_server/wscript_build | 2 +- source4/torture/rpc/backupkey.c | 6 +++++- 3 files changed, 12 insertions(+), 5 deletions(-) (limited to 'source4') diff --git a/source4/rpc_server/backupkey/dcesrv_backupkey.c b/source4/rpc_server/backupkey/dcesrv_backupkey.c index 611837f0e3..035294cd7e 100644 --- a/source4/rpc_server/backupkey/dcesrv_backupkey.c +++ b/source4/rpc_server/backupkey/dcesrv_backupkey.c @@ -28,9 +28,12 @@ #include "../lib/util/util_ldb.h" #include "param/param.h" #include "auth/session.h" -#include "heimdal/lib/hx509/hx_locl.h" -#include "heimdal/lib/hcrypto/rsa.h" -#include "heimdal/lib/hcrypto/bn.h" +#include "system/network.h" +#include +#include +#include +#include +#include #include "../lib/tsocket/tsocket.h" #include "../libcli/security/security.h" diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build index f1d3c0db90..127e396f6c 100755 --- a/source4/rpc_server/wscript_build +++ b/source4/rpc_server/wscript_build @@ -102,7 +102,7 @@ bld.SAMBA_MODULE('dcerpc_backupkey', autoproto='backupkey/proto.h', subsystem='dcerpc_server', init_function='dcerpc_server_backupkey_init', - deps='samdb DCERPC_COMMON NDR_BACKUPKEY RPC_NDR_BACKUPKEY' + deps='samdb DCERPC_COMMON NDR_BACKUPKEY RPC_NDR_BACKUPKEY krb5 hx509 hcrypto' ) diff --git a/source4/torture/rpc/backupkey.c b/source4/torture/rpc/backupkey.c index 0f389462e1..a18d7a16c1 100644 --- a/source4/torture/rpc/backupkey.c +++ b/source4/torture/rpc/backupkey.c @@ -25,7 +25,11 @@ #include "librpc/gen_ndr/ndr_lsa_c.h" #include "torture/rpc/torture_rpc.h" #include "lib/cmdline/popt_common.h" -#include "heimdal/lib/hx509/hx_locl.h" +#include +#include +#include +#include + /* Our very special and valued secret */ /* No need to put const as we cast the array in uint8_t -- cgit