summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2010-11-27 19:32:03 +0100
committerMatthias Dieter Wallnöfer <mdw@samba.org>2010-11-27 21:50:41 +0100
commitc8aa7d5837bdfc7f721ac9fcc12211fd89f3dbcf (patch)
tree4a2d4e0579c596af6919dcdb2d3d8c9f35490839
parent4010eff80b888fec7cb7e5d43cb0c3ff23188a64 (diff)
downloadsamba-c8aa7d5837bdfc7f721ac9fcc12211fd89f3dbcf.tar.gz
samba-c8aa7d5837bdfc7f721ac9fcc12211fd89f3dbcf.tar.bz2
samba-c8aa7d5837bdfc7f721ac9fcc12211fd89f3dbcf.zip
s4:param/secrets.h - fix "enum netr_SchannelType" include correctly
-rw-r--r--source4/dsdb/samdb/samdb.c1
-rw-r--r--source4/libnet/libnet_join.c1
-rw-r--r--source4/param/secrets.h3
-rw-r--r--source4/smbd/process_onefork.c1
-rw-r--r--source4/smbd/process_prefork.c1
5 files changed, 2 insertions, 5 deletions
diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c
index 2c890a7d6f..416cf50396 100644
--- a/source4/dsdb/samdb/samdb.c
+++ b/source4/dsdb/samdb/samdb.c
@@ -23,7 +23,6 @@
#include "includes.h"
#include "librpc/gen_ndr/ndr_netlogon.h"
-#include "librpc/gen_ndr/ndr_misc.h"
#include "librpc/gen_ndr/ndr_security.h"
#include "lib/events/events.h"
#include "lib/ldb-samba/ldb_wrap.h"
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index 235304423e..6077de906b 100644
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -24,7 +24,6 @@
#include "librpc/gen_ndr/ndr_drsuapi_c.h"
#include "lib/ldb/include/ldb.h"
#include "lib/ldb/include/ldb_errors.h"
-#include "param/secrets.h"
#include "dsdb/samdb/samdb.h"
#include "ldb_wrap.h"
#include "libcli/security/security.h"
diff --git a/source4/param/secrets.h b/source4/param/secrets.h
index d9e0f53f0f..4cab9ccadd 100644
--- a/source4/param/secrets.h
+++ b/source4/param/secrets.h
@@ -38,10 +38,11 @@
*/
struct loadparm_context;
struct tevent_context;
-enum netr_SchannelType;
struct ldb_message;
struct ldb_context;
+#include "librpc/gen_ndr/misc.h"
+
struct tdb_wrap *secrets_init(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx);
struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx);
struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx,
diff --git a/source4/smbd/process_onefork.c b/source4/smbd/process_onefork.c
index da34f73164..5194e1bda6 100644
--- a/source4/smbd/process_onefork.c
+++ b/source4/smbd/process_onefork.c
@@ -27,7 +27,6 @@
#include "lib/events/events.h"
#include "lib/socket/socket.h"
#include "smbd/process_model.h"
-#include "param/secrets.h"
#include "system/filesys.h"
#include "cluster/cluster.h"
#include "param/param.h"
diff --git a/source4/smbd/process_prefork.c b/source4/smbd/process_prefork.c
index 1340464381..71c1c57162 100644
--- a/source4/smbd/process_prefork.c
+++ b/source4/smbd/process_prefork.c
@@ -27,7 +27,6 @@
#include "lib/events/events.h"
#include "lib/socket/socket.h"
#include "smbd/process_model.h"
-#include "param/secrets.h"
#include "system/filesys.h"
#include "cluster/cluster.h"
#include "param/param.h"