3 files changed, 21 insertions, 6 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 5da1c1d997..1dfebcea78 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -696,6 +696,7 @@ extern int errno;
 #include "dlinklist.h"
 #include "../tdb/tdb.h"
 #include "../tdb/spinlock.h"
+#include "../tdb/tdbutil.h"
 #include "talloc.h"
 #include "ads.h"
 #include "interfaces.h"
diff --git a/source3/include/rpc_lsa.h b/source3/include/rpc_lsa.h
index ccdce6f263..ceb0e17d5c 100644
--- a/source3/include/rpc_lsa.h
+++ b/source3/include/rpc_lsa.h
@@ -278,8 +278,8 @@ typedef struct lsa_r_query_info
 typedef struct lsa_enum_trust_dom_info
 {
 	POLICY_HND pol; /* policy handle */
-    uint32 enum_context; /* enumeration context handle */
-    uint32 preferred_len; /* preferred maximum length */
+	uint32 enum_context; /* enumeration context handle */
+	uint32 preferred_len; /* preferred maximum length */
 
 } LSA_Q_ENUM_TRUST_DOM;
 
diff --git a/source3/include/secrets.h b/source3/include/secrets.h
index 69ab4f6c8d..3d7e2aa97e 100644
--- a/source3/include/secrets.h
+++ b/source3/include/secrets.h
@@ -48,12 +48,26 @@ struct machine_acct_pass {
 	time_t mod_time;
 };
 
-/* structure for storing trusted domain password */
+/*
+ * storage structure for trusted domain
+ */
 struct trusted_dom_pass {
-	int pass_len;
-	fstring pass;
+	size_t uni_name_len;
+	smb_ucs2_t uni_name[32]; /* unicode domain name */
+	size_t pass_len;
+	fstring pass;		/* trust relationship's password */
 	time_t mod_time;
-	DOM_SID domain_sid; /* remote domain's sid */
+	DOM_SID domain_sid;	/* remote domain's sid */
 };
 
+/*
+ * trusted domain entry/entries returned by secrets_get_trusted_domains
+ * (used in _lsa_enum_trust_dom call)
+ */
+typedef struct trustdom {
+	smb_ucs2_t *name;
+	DOM_SID sid;
+} TRUSTDOM;
+
+
 #endif /* _SECRETS_H */