use system heimdal headers if possible, fix missing dependencies on hx509 and krb5...

diff --git a/source4/rpc_server/backupkey/dcesrv_backupkey.c b/source4/rpc_server/backupkey/dcesrv_backupkey.c
index 611837f0e327f329a846f59646f622e0a5e00f7a..035294cd7ecdf89e76471015ebdfa9a0cce0c2a6 100644 (file)
--- 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 <hx509.h>
+#include <hcrypto/rsa.h>
+#include <hcrypto/bn.h>
+#include <hcrypto/sha.h>
+#include <der.h>
 #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 f1d3c0db908d98fcd6f76bc5a333677ea3ec56c6..127e396f6ca05f1f17ea348912f5a8d29657bed0 100755 (executable)
--- 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 0f389462e10b89dc647475e10ef439934772d805..a18d7a16c16049fe2a8a4daa8da94e12b9df09cb 100644 (file)
--- 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 <hcrypto/sha.h>
+#include <system/network.h>
+#include <hx509.h>
+#include <der.h>
+
 
 /* Our very special and valued secret */
 /* No need to put const as we cast the array in uint8_t