[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  5cb8f6b Fix compilation without external heimdal.
       via  09289c0 use system heimdal headers if possible, fix missing dependencies on hx509 and krb5 libraries.
      from  32296a2 s3: Add a quick test for bug 8042

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5cb8f6b9f1129ba4cd55a812411d38e7fbaa20f1
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Apr 3 16:32:27 2011 +0200

    Fix compilation without external heimdal.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Sun Apr  3 17:18:56 CEST 2011 on sn-devel-104

commit 09289c073c1239f17dfcbc030310b1ed2a210328
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Apr 3 15:40:24 2011 +0200

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

-----------------------------------------------------------------------

Summary of changes:
 source4/rpc_server/backupkey/dcesrv_backupkey.c |   10 +++++++---
 source4/rpc_server/wscript_build                |    2 +-
 source4/torture/rpc/backupkey.c                 |    7 ++++++-
 3 files changed, 14 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/rpc_server/backupkey/dcesrv_backupkey.c b/source4/rpc_server/backupkey/dcesrv_backupkey.c
index 611837f..2aee678 100644
--- a/source4/rpc_server/backupkey/dcesrv_backupkey.c
+++ b/source4/rpc_server/backupkey/dcesrv_backupkey.c
@@ -28,9 +28,13 @@
 #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 <com_err.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 f1d3c0d..127e396 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 0f38946..442df14 100644
--- a/source4/torture/rpc/backupkey.c
+++ b/source4/torture/rpc/backupkey.c
@@ -25,7 +25,12 @@
 #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 <com_err.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


-- 
Samba Shared Repository