[SCM] Samba Shared Repository - branch master updated

[Nadezhda Ivanova]

The branch, master has been updated
       via  e2e3911... Replaced DS_FLAG_ATTR_IS_CRITICAL with SCHEMA_FLAG_ATTR_IS_CRITICAL.
      from  9cc10e6... s3-rpcclient: Fix Bug #7277. rpcclient was sending invalid data, causing cupsaddsmb to fail.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e2e39117bcea5264c913383ccc68e23307264c63
Author: Nadezhda Ivanova <nivanova at samba.org>
Date:   Mon May 3 16:47:56 2010 +0200

    Replaced DS_FLAG_ATTR_IS_CRITICAL with SCHEMA_FLAG_ATTR_IS_CRITICAL.

-----------------------------------------------------------------------

Summary of changes:
 libds/common/flags.h                  |    3 ---
 source4/dsdb/schema/schema_filtered.c |    2 +-
 2 files changed, 1 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libds/common/flags.h b/libds/common/flags.h
index 67811d0..6a29b1b 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 304160d..1582aee 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 |


-- 
Samba Shared Repository