From 0e3a13f8cc2d1d56062945a9ccd9ab33153a2247 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 9 Nov 2010 19:44:12 +0100
Subject: s4:dsdb/common: create a DSDB_SECRET_ATTRIBUTES define with all
 secret attributes

We should have them just in one place, so that we don't forget some of them.

metze
---
 source4/dsdb/common/util.c | 14 ++------------
 source4/dsdb/common/util.h | 13 +++++++++++++
 2 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'source4')

diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index 79a4c143c7..16d5011278 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -4070,18 +4070,8 @@ int dsdb_validate_dsa_guid(struct ldb_context *ldb,
 	return LDB_SUCCESS;
 }
 
-static const char *secret_attributes[] = {
-	"currentValue",
-	"dBCSPwd",
-	"initialAuthIncoming",
-	"initialAuthOutgoing",
-	"lmPwdHistory",
-	"ntPwdHistory",
-	"priorValue",
-	"supplementalCredentials",
-	"trustAuthIncoming",
-	"trustAuthOutgoing",
-	"unicodePwd",
+static const char * const secret_attributes[] = {
+	DSDB_SECRET_ATTRIBUTES,
 	NULL
 };
 
diff --git a/source4/dsdb/common/util.h b/source4/dsdb/common/util.h
index fa876484cb..a09392284d 100644
--- a/source4/dsdb/common/util.h
+++ b/source4/dsdb/common/util.h
@@ -37,3 +37,16 @@
 #define DSDB_PROVISION			      0x0800
 
 bool is_attr_in_list(const char * const * attrs, const char *attr);
+
+#define DSDB_SECRET_ATTRIBUTES \
+	"currentValue", \
+	"dBCSPwd", \
+	"initialAuthIncoming", \
+	"initialAuthOutgoing", \
+	"lmPwdHistory", \
+	"ntPwdHistory", \
+	"priorValue", \
+	"supplementalCredentials", \
+	"trustAuthIncoming", \
+	"trustAuthOutgoing", \
+	"unicodePwd"
-- 
cgit