From: Nadezhda Ivanova Date: Mon, 3 May 2010 14:47:56 +0000 (+0200) Subject: Replaced DS_FLAG_ATTR_IS_CRITICAL with SCHEMA_FLAG_ATTR_IS_CRITICAL. X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=e2e39117bcea5264c913383ccc68e23307264c63;p=kamenim%2Fsamba.git Replaced DS_FLAG_ATTR_IS_CRITICAL with SCHEMA_FLAG_ATTR_IS_CRITICAL. --- diff --git a/libds/common/flags.h b/libds/common/flags.h index 67811d06aa..6a29b1b510 100644 --- a/libds/common/flags.h +++ b/libds/common/flags.h @@ -188,9 +188,6 @@ #define DS_FLAG_ATTR_REQ_PARTIAL_SET_MEMBER 0x00000002 #define DS_FLAG_ATTR_IS_CONSTRUCTED 0x00000004 -/* sa->systemFlagsEx on attributes */ -#define DS_FLAG_ATTR_IS_CRITICAL 0x00000001 - /* 7.1.1.2.2.1.2.1.1 nTDSDSA Object options flags */ #define DS_NTDSDSA_OPT_IS_GC 0x00000001 #define DS_NTDSDSA_OPT_DISABLE_INBOUND_REPL 0x00000002 diff --git a/source4/dsdb/schema/schema_filtered.c b/source4/dsdb/schema/schema_filtered.c index 304160d473..1582aee8fd 100644 --- a/source4/dsdb/schema/schema_filtered.c +++ b/source4/dsdb/schema/schema_filtered.c @@ -88,7 +88,7 @@ bool dsdb_attribute_is_attr_in_filtered_replica(struct dsdb_attribute *attribute { int i, size = sizeof(never_in_filtered_attrs)/sizeof(char *); if (attribute->systemOnly || - attribute->schemaFlagsEx & DS_FLAG_ATTR_IS_CRITICAL) { + attribute->schemaFlagsEx & SCHEMA_FLAG_ATTR_IS_CRITICAL) { return false; } if (attribute->systemFlags & (DS_FLAG_ATTR_NOT_REPLICATED |