[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Tue Nov 9 15:44:01 MST 2010
The branch, master has been updated
via 3c496f3 s4:dsdb/operational.c: use DSDB_SECRET_ATTRIBUTES_EX()
via dedc9e3 s4:dsdb/common: add DSDB_SECRET_ATTRIBUTES_EX()
via 2fba950 s4:dsdb/local_password: use DSDB_SECRET_ATTRIBUTES
via 9f39d4b s4:dsdb/schema/schema_filtered.c: make never_in_filtered_attrs static const
via 44b1c82 s4:dsdb/schema/schema_filtered.c: use DSDB_SECRET_ATTRIBUTES
via 198049f s4:rpc_server/drsuapi: don't ask for constructed "distinguishedName" if we don't use it
via f6e20bf s4:rpc_server/drsuapi: make msg_attrs static const
via 9fa71f8 s4:rpc_server/drsuapi: let dcesrv_drsuapi_DsGetNCChanges() use DSDB_SECRET_ATTRIBUTES
via 0e3a13f s4:dsdb/common: create a DSDB_SECRET_ATTRIBUTES define with all secret attributes
from c83a40d s3: Quieten a bogus error message
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3c496f37c46fb2181c3afecc76e0fa9c3b307f11
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Nov 9 19:50:40 2010 +0100
s4:dsdb/operational.c: use DSDB_SECRET_ATTRIBUTES_EX()
metze
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Tue Nov 9 22:43:44 UTC 2010 on sn-devel-104
commit dedc9e32e57efa86475c32e6196b748df786892d
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Nov 9 22:22:40 2010 +0100
s4:dsdb/common: add DSDB_SECRET_ATTRIBUTES_EX()
metze
commit 2fba9500b380c14abd772a938a5c884521013b14
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Nov 9 19:50:17 2010 +0100
s4:dsdb/local_password: use DSDB_SECRET_ATTRIBUTES
metze
commit 9f39d4bfa4048dceaef98876085fe6a0263c80d5
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Nov 9 19:49:29 2010 +0100
s4:dsdb/schema/schema_filtered.c: make never_in_filtered_attrs static const
metze
commit 44b1c82e845bde1461ff514c54253b0356adebeb
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Nov 9 19:48:55 2010 +0100
s4:dsdb/schema/schema_filtered.c: use DSDB_SECRET_ATTRIBUTES
metze
commit 198049f3c6766b932db0daad9d1d12ccb629edbf
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Nov 9 19:53:45 2010 +0100
s4:rpc_server/drsuapi: don't ask for constructed "distinguishedName" if we don't use it
metze
commit f6e20bf52f5c0a604584a1f50fff1930edc644e1
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Nov 9 19:52:49 2010 +0100
s4:rpc_server/drsuapi: make msg_attrs static const
metze
commit 9fa71f8f573b34c51ec0415917c3c970134eb757
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Nov 9 19:45:31 2010 +0100
s4:rpc_server/drsuapi: let dcesrv_drsuapi_DsGetNCChanges() use DSDB_SECRET_ATTRIBUTES
We should replicate all secret attributes back to other DCs.
metze
commit 0e3a13f8cc2d1d56062945a9ccd9ab33153a2247
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Nov 9 19:44:12 2010 +0100
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
-----------------------------------------------------------------------
Summary of changes:
source4/dsdb/common/util.c | 14 ++------------
source4/dsdb/common/util.h | 16 ++++++++++++++++
source4/dsdb/samdb/ldb_modules/local_password.c | 10 +++-------
source4/dsdb/samdb/ldb_modules/operational.c | 7 ++-----
source4/dsdb/schema/schema_filtered.c | 15 +++------------
source4/rpc_server/drsuapi/getncchanges.c | 9 +++------
6 files changed, 29 insertions(+), 42 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index 79a4c14..16d5011 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 fa87648..afcb3dc 100644
--- a/source4/dsdb/common/util.h
+++ b/source4/dsdb/common/util.h
@@ -37,3 +37,19 @@
#define DSDB_PROVISION 0x0800
bool is_attr_in_list(const char * const * attrs, const char *attr);
+
+#define DSDB_SECRET_ATTRIBUTES_EX(sep) \
+ "currentValue" sep \
+ "dBCSPwd" sep \
+ "initialAuthIncoming" sep \
+ "initialAuthOutgoing" sep \
+ "lmPwdHistory" sep \
+ "ntPwdHistory" sep \
+ "priorValue" sep \
+ "supplementalCredentials" sep \
+ "trustAuthIncoming" sep \
+ "trustAuthOutgoing" sep \
+ "unicodePwd"
+
+#define DSDB_SECRET_ATTRIBUTES_COMMA ,
+#define DSDB_SECRET_ATTRIBUTES DSDB_SECRET_ATTRIBUTES_EX(DSDB_SECRET_ATTRIBUTES_COMMA)
diff --git a/source4/dsdb/samdb/ldb_modules/local_password.c b/source4/dsdb/samdb/ldb_modules/local_password.c
index e1b3054..f544689 100644
--- a/source4/dsdb/samdb/ldb_modules/local_password.c
+++ b/source4/dsdb/samdb/ldb_modules/local_password.c
@@ -35,6 +35,7 @@
#include "librpc/ndr/libndr.h"
#include "dsdb/samdb/ldb_modules/password_modules.h"
#include "dsdb/samdb/ldb_modules/util.h"
+#include "dsdb/common/util.h"
#define PASSWORD_GUID_ATTR "masterGUID"
@@ -51,13 +52,8 @@
*/
static const char * const password_attrs[] = {
- "supplementalCredentials",
- "unicodePwd",
- "dBCSPwd",
- "lmPwdHistory",
- "ntPwdHistory",
- "msDS-KeyVersionNumber",
- "pwdLastSet"
+ "pwdLastSet",
+ DSDB_SECRET_ATTRIBUTES
};
/* And we merge them back into search requests when asked to do so */
diff --git a/source4/dsdb/samdb/ldb_modules/operational.c b/source4/dsdb/samdb/ldb_modules/operational.c
index 12edfc2..d8cf3e0 100644
--- a/source4/dsdb/samdb/ldb_modules/operational.c
+++ b/source4/dsdb/samdb/ldb_modules/operational.c
@@ -571,11 +571,8 @@ static const struct {
{ "msDS-KeyVersionNumber", OPERATIONAL_REMOVE_UNLESS_CONTROL },
{ "parentGUID", OPERATIONAL_REMOVE_ALWAYS },
{ "replPropertyMetaData", OPERATIONAL_REMOVE_UNASKED },
- { "unicodePwd", OPERATIONAL_REMOVE_UNASKED },
- { "dBCSPwd", OPERATIONAL_REMOVE_UNASKED },
- { "ntPwdHistory", OPERATIONAL_REMOVE_UNASKED },
- { "lmPwdHistory", OPERATIONAL_REMOVE_UNASKED },
- { "supplementalCredentials", OPERATIONAL_REMOVE_UNASKED }
+#define _SEP ,OPERATIONAL_REMOVE_UNASKED},{
+ { DSDB_SECRET_ATTRIBUTES_EX(_SEP), OPERATIONAL_REMOVE_UNASKED }
};
diff --git a/source4/dsdb/schema/schema_filtered.c b/source4/dsdb/schema/schema_filtered.c
index 1582aee..80c0ebd 100644
--- a/source4/dsdb/schema/schema_filtered.c
+++ b/source4/dsdb/schema/schema_filtered.c
@@ -25,20 +25,16 @@
#include "../lib/util/dlinklist.h"
#include "param/param.h"
-const char *never_in_filtered_attrs[] = { "accountExpires",
+static const char * const never_in_filtered_attrs[] = {
+ "accountExpires",
"codePage",
"creationTime",
- "currentValue",
- "dBCSPwd",
"dNSHostName",
"displayName",
"domainReplica",
"fSMORoleOwner",
"flatName",
- "initialAuthIncoming",
- "initialAuthOutgoing",
"isCriticalSystemObject",
- "lmPwdHistory",
"lockOutObservationWindow",
"lockoutDuration",
"lockoutTime",
@@ -58,11 +54,9 @@ const char *never_in_filtered_attrs[] = { "accountExpires",
"nETBIOSName",
"nTMixedDomain",
"notFiltlockoutThreshold",
- "ntPwdHistory",
"operatingSystem",
"operatingSystemServicePack",
"operatingSystemVersion",
- "priorValue",
"pwdHistoryLength",
"pwdLastSet",
"pwdProperties",
@@ -70,16 +64,13 @@ const char *never_in_filtered_attrs[] = { "accountExpires",
"sIDHistory",
"securityIdentifier",
"servicePrincipalName",
- "supplementalCredentials",
"trustAttributes",
- "trustAuthIncoming",
- "trustAuthOutgoing",
"trustDirection",
"trustParent",
"trustPartner",
"trustPosixOffset",
"trustType",
- "unicodePwd"
+ DSDB_SECRET_ATTRIBUTES
};
/* returns true if the attribute can be in a filtered replica */
diff --git a/source4/rpc_server/drsuapi/getncchanges.c b/source4/rpc_server/drsuapi/getncchanges.c
index d38250f..9be076e 100644
--- a/source4/rpc_server/drsuapi/getncchanges.c
+++ b/source4/rpc_server/drsuapi/getncchanges.c
@@ -1526,15 +1526,12 @@ WERROR dcesrv_drsuapi_DsGetNCChanges(struct dcesrv_call_state *dce_call, TALLOC_
int uSN;
struct drsuapi_DsReplicaObjectListItemEx *obj;
struct ldb_message *msg;
- const char *msg_attrs[] = { "*", "distinguishedName",
+ static const char * const msg_attrs[] = {
+ "*",
"nTSecurityDescriptor",
"parentGUID",
"replPropertyMetaData",
- "unicodePwd",
- "dBCSPwd",
- "ntPwdHistory",
- "lmPwdHistory",
- "supplementalCredentials",
+ DSDB_SECRET_ATTRIBUTES,
NULL };
struct ldb_result *msg_res;
struct ldb_dn *msg_dn;
--
Samba Shared Repository
More information about the samba-cvs
mailing list