From c5571c7c3964975d5c1f1c347b8629577d2e86c6 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sun, 17 Dec 2006 02:19:56 +0000 Subject: r20221: - move the dsdb_schema, dsdb_attribute, dsdb_class structs into a generic location - this struct should be also used by the dsdb/samdb/ldb_modules/schema.c module later - add functions to map from LDAP OID values to uint32_t values - add torture test for the OID => uint32 mapping code metze (This used to be commit 58ba6ec195ce3a5e2352866809f6cb57f8d8260a) --- source4/dsdb/schema/schema.h | 109 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 source4/dsdb/schema/schema.h (limited to 'source4/dsdb/schema/schema.h') diff --git a/source4/dsdb/schema/schema.h b/source4/dsdb/schema/schema.h new file mode 100644 index 0000000000..e872a6088e --- /dev/null +++ b/source4/dsdb/schema/schema.h @@ -0,0 +1,109 @@ +/* + Unix SMB/CIFS mplementation. + DSDB schema header + + Copyright (C) Stefan Metzmacher 2006 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#ifndef _DSDB_SCHEMA_H +#define _DSDB_SCHEMA_H + +struct dsdb_attribute { + struct dsdb_attribute *prev, *next; + + const char *cn; + const char *lDAPDisplayName; + const char *attributeID_oid; + uint32_t attributeID_id; + struct GUID schemaIDGUID; + uint32_t mAPIID; + + struct GUID attributeSecurityGUID; + + uint32_t searchFlags; + uint32_t systemFlags; + BOOL isMemberOfPartialAttributeSet; + uint32_t linkID; + + const char *attributeSyntax_oid; + uint32_t attributeSyntax_id; + uint32_t oMSyntax; + struct ldb_val oMObjectClass; + + BOOL isSingleValued; + uint32_t rangeLower; + uint32_t rangeUpper; + BOOL extendedCharsAllowed; + + uint32_t schemaFlagsEx; + struct ldb_val msDs_Schema_Extensions; + + BOOL showInAdvancedViewOnly; + const char *adminDisplayName; + const char *adminDescription; + const char *classDisplayName; + BOOL isEphemeral; + BOOL isDefunct; + BOOL systemOnly; +}; + +struct dsdb_class { + struct dsdb_class *prev, *next; + + const char *cn; + const char *lDAPDisplayName; + const char *governsID_oid; + uint32_t governsID_id; + struct GUID schemaIDGUID; + + uint32_t objectClassCategory; + const char *rDNAttID; + const char *defaultObjectCategory; + + const char *subClassOf; + + const char *systemAuxiliaryClass; + const char **systemPossSuperiors; + const char **systemMustContain; + const char **systemMayContain; + + const char *auxiliaryClass; + const char **possSuperiors; + const char **mustContain; + const char **mayContain; + + const char *defaultSecurityDescriptor; + + uint32_t schemaFlagsEx; + struct ldb_val msDs_Schema_Extensions; + + BOOL showInAdvancedViewOnly; + const char *adminDisplayName; + const char *adminDescription; + const char *classDisplayName; + BOOL defaultHidingValue; + BOOL isDefunct; + BOOL systemOnly; +}; + +struct dsdb_schema { + struct dsdb_attribute *attributes; + struct dsdb_class *classes; +}; + +#endif /* _DSDB_SCHEMA_H */ -- cgit From 97d066464b68f0414c658693d3b768279906bf97 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 21 Dec 2006 20:51:50 +0000 Subject: r20306: remove the static oid mapping table and attach the table to the dsdb_schema metze (This used to be commit df63995ec5f322d17145664c1f174783861e1723) --- source4/dsdb/schema/schema.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'source4/dsdb/schema/schema.h') diff --git a/source4/dsdb/schema/schema.h b/source4/dsdb/schema/schema.h index e872a6088e..c1f9081b2d 100644 --- a/source4/dsdb/schema/schema.h +++ b/source4/dsdb/schema/schema.h @@ -101,7 +101,23 @@ struct dsdb_class { BOOL systemOnly; }; +struct dsdb_schema_oid_prefix { + uint32_t id; + const char *oid; + size_t oid_len; +}; + struct dsdb_schema { + uint32_t num_prefixes; + struct dsdb_schema_oid_prefix *prefixes; + + /* + * the last element of the prefix mapping table isn't a oid, + * it starts with 0xFF and has 21 bytes and is maybe a schema + * version number + */ + const char *unknown_magic; + struct dsdb_attribute *attributes; struct dsdb_class *classes; }; -- cgit From 3710a7ae991696dca71d0d8b173d9bd533f072cd Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 23 Dec 2006 10:39:26 +0000 Subject: r20331: the last entry in the oid mapping array which starts with 0xFF is the content of the schemaInfo attribute of the schema head object metze (This used to be commit bfb7756bb0f1bbd9a7a17c9689cf2ea351247116) --- source4/dsdb/schema/schema.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source4/dsdb/schema/schema.h') diff --git a/source4/dsdb/schema/schema.h b/source4/dsdb/schema/schema.h index c1f9081b2d..34cfcdb401 100644 --- a/source4/dsdb/schema/schema.h +++ b/source4/dsdb/schema/schema.h @@ -115,8 +115,11 @@ struct dsdb_schema { * the last element of the prefix mapping table isn't a oid, * it starts with 0xFF and has 21 bytes and is maybe a schema * version number + * + * this is the content of the schemaInfo attribute of the + * Schema-Partition head object. */ - const char *unknown_magic; + const char *schema_info; struct dsdb_attribute *attributes; struct dsdb_class *classes; -- cgit From 40e7f362126407361dbaa56977e6e2463038dbcc Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 28 Dec 2006 13:06:29 +0000 Subject: r20382: systemAuxiliaryClass and auxiliaryClass are also multivalued attributes metze (This used to be commit 5440c0a99fd8dced9020a47af4dbee74df504219) --- source4/dsdb/schema/schema.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/dsdb/schema/schema.h') diff --git a/source4/dsdb/schema/schema.h b/source4/dsdb/schema/schema.h index 34cfcdb401..4911407a21 100644 --- a/source4/dsdb/schema/schema.h +++ b/source4/dsdb/schema/schema.h @@ -77,12 +77,12 @@ struct dsdb_class { const char *subClassOf; - const char *systemAuxiliaryClass; + const char **systemAuxiliaryClass; const char **systemPossSuperiors; const char **systemMustContain; const char **systemMayContain; - const char *auxiliaryClass; + const char **auxiliaryClass; const char **possSuperiors; const char **mustContain; const char **mayContain; -- cgit From d97302d539e7747da28984880769d6cbf8b7357c Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 29 Dec 2006 10:35:44 +0000 Subject: r20405: add an array with attribute syntexes metze (This used to be commit 1a21eb700003db1d7853c9be330b2583db9bff03) --- source4/dsdb/schema/schema.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'source4/dsdb/schema/schema.h') diff --git a/source4/dsdb/schema/schema.h b/source4/dsdb/schema/schema.h index 4911407a21..051f531a52 100644 --- a/source4/dsdb/schema/schema.h +++ b/source4/dsdb/schema/schema.h @@ -23,6 +23,14 @@ #ifndef _DSDB_SCHEMA_H #define _DSDB_SCHEMA_H +struct dsdb_syntax { + const char *name; + const char *ldap_oid; + uint32_t oMSyntax; + struct ldb_val oMObjectClass; + const char *attributeSyntax_oid; +}; + struct dsdb_attribute { struct dsdb_attribute *prev, *next; @@ -60,6 +68,9 @@ struct dsdb_attribute { BOOL isEphemeral; BOOL isDefunct; BOOL systemOnly; + + /* internal stuff */ + const struct dsdb_syntax *syntax; }; struct dsdb_class { -- cgit From 1e4132399158c25278000239e50b8411e9387a40 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 30 Dec 2006 11:51:35 +0000 Subject: r20420: create infrastructure to convert attribute values from drsuapi to ldb metze (This used to be commit 17c52ed27613051beecd5bbf72c6e6e749a21d27) --- source4/dsdb/schema/schema.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'source4/dsdb/schema/schema.h') diff --git a/source4/dsdb/schema/schema.h b/source4/dsdb/schema/schema.h index 051f531a52..b267c6c74e 100644 --- a/source4/dsdb/schema/schema.h +++ b/source4/dsdb/schema/schema.h @@ -23,12 +23,27 @@ #ifndef _DSDB_SCHEMA_H #define _DSDB_SCHEMA_H +struct dsdb_attribute; +struct dsdb_class; +struct dsdb_schema; + struct dsdb_syntax { const char *name; const char *ldap_oid; uint32_t oMSyntax; struct ldb_val oMObjectClass; const char *attributeSyntax_oid; + + WERROR (*drsuapi_to_ldb)(const struct dsdb_schema *schema, + const struct dsdb_attribute *attr, + const struct drsuapi_DsReplicaAttribute *in, + TALLOC_CTX *mem_ctx, + struct ldb_message_element *out); + WERROR (*ldb_to_drsuapi)(const struct dsdb_schema *schema, + const struct dsdb_attribute *attr, + const struct ldb_message_element *in, + TALLOC_CTX *mem_ctx, + struct drsuapi_DsReplicaAttribute *out); }; struct dsdb_attribute { -- cgit From 41c545350748f79fd543e2ac914f63139cf0b9e7 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 14 Mar 2007 19:10:21 +0000 Subject: r21839: add my email address metze (This used to be commit e3be33c1d9f9e44ef37e6ef72a23576474f6e725) --- source4/dsdb/schema/schema.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/dsdb/schema/schema.h') diff --git a/source4/dsdb/schema/schema.h b/source4/dsdb/schema/schema.h index b267c6c74e..e22278ee8d 100644 --- a/source4/dsdb/schema/schema.h +++ b/source4/dsdb/schema/schema.h @@ -2,7 +2,7 @@ Unix SMB/CIFS mplementation. DSDB schema header - Copyright (C) Stefan Metzmacher 2006 + Copyright (C) Stefan Metzmacher 2006 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -- cgit From 0479a2f1cbae51fcd8dbdc3c148c808421fb4d25 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 10 Jul 2007 02:07:03 +0000 Subject: r23792: convert Samba4 to GPLv3 There are still a few tidyups of old FSF addresses to come (in both s3 and s4). More commits soon. (This used to be commit fcf38a38ac691abd0fa51b89dc951a08e89fdafa) --- source4/dsdb/schema/schema.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source4/dsdb/schema/schema.h') diff --git a/source4/dsdb/schema/schema.h b/source4/dsdb/schema/schema.h index e22278ee8d..ca1ebb0388 100644 --- a/source4/dsdb/schema/schema.h +++ b/source4/dsdb/schema/schema.h @@ -6,7 +6,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -15,8 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program. If not, see . */ -- cgit From 4e697b288be11a195d493f2d6800ea8c1e251fee Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 27 Jul 2007 03:08:15 +0000 Subject: r24060: Fix bug #4806 by Matthias Wallnöfer : We need to include the attribute allowedChildClassesEffective for MMC to allow the creation of containers. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This may need further refinement, but it seems to work for now. Andrew Bartlett (This used to be commit d053b8e218767cb12e20a00fb18995e30869db11) --- source4/dsdb/schema/schema.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/dsdb/schema/schema.h') diff --git a/source4/dsdb/schema/schema.h b/source4/dsdb/schema/schema.h index ca1ebb0388..dd50eae684 100644 --- a/source4/dsdb/schema/schema.h +++ b/source4/dsdb/schema/schema.h @@ -111,6 +111,7 @@ struct dsdb_class { const char **possSuperiors; const char **mustContain; const char **mayContain; + const char **possibleInferiors; const char *defaultSecurityDescriptor; -- cgit From 61ffa08f4c95e29d301de9fbabd6e71c2dbc1056 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 27 Aug 2007 18:10:19 +0000 Subject: r24712: No longer expose the 'BOOL' data type in any interfaces. (This used to be commit 1ce32673d960c8b05b6c1b1b99e1976a402417ae) --- source4/dsdb/schema/schema.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'source4/dsdb/schema/schema.h') diff --git a/source4/dsdb/schema/schema.h b/source4/dsdb/schema/schema.h index dd50eae684..1125f775ff 100644 --- a/source4/dsdb/schema/schema.h +++ b/source4/dsdb/schema/schema.h @@ -59,7 +59,7 @@ struct dsdb_attribute { uint32_t searchFlags; uint32_t systemFlags; - BOOL isMemberOfPartialAttributeSet; + bool isMemberOfPartialAttributeSet; uint32_t linkID; const char *attributeSyntax_oid; @@ -67,21 +67,21 @@ struct dsdb_attribute { uint32_t oMSyntax; struct ldb_val oMObjectClass; - BOOL isSingleValued; + bool isSingleValued; uint32_t rangeLower; uint32_t rangeUpper; - BOOL extendedCharsAllowed; + bool extendedCharsAllowed; uint32_t schemaFlagsEx; struct ldb_val msDs_Schema_Extensions; - BOOL showInAdvancedViewOnly; + bool showInAdvancedViewOnly; const char *adminDisplayName; const char *adminDescription; const char *classDisplayName; - BOOL isEphemeral; - BOOL isDefunct; - BOOL systemOnly; + bool isEphemeral; + bool isDefunct; + bool systemOnly; /* internal stuff */ const struct dsdb_syntax *syntax; @@ -118,13 +118,13 @@ struct dsdb_class { uint32_t schemaFlagsEx; struct ldb_val msDs_Schema_Extensions; - BOOL showInAdvancedViewOnly; + bool showInAdvancedViewOnly; const char *adminDisplayName; const char *adminDescription; const char *classDisplayName; - BOOL defaultHidingValue; - BOOL isDefunct; - BOOL systemOnly; + bool defaultHidingValue; + bool isDefunct; + bool systemOnly; }; struct dsdb_schema_oid_prefix { -- cgit From 71e2cafe96f4755b67d01ced497bf5b63aad30f6 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 17 Dec 2007 04:22:44 +0100 Subject: r26483: Merge ldb module dependency fixes, fix auth python module. (This used to be commit 85eeecf997a071ca7e7ad0247e8d34d49b7ffcbb) --- source4/dsdb/schema/schema.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/dsdb/schema/schema.h') diff --git a/source4/dsdb/schema/schema.h b/source4/dsdb/schema/schema.h index 1125f775ff..1379ddee9f 100644 --- a/source4/dsdb/schema/schema.h +++ b/source4/dsdb/schema/schema.h @@ -151,4 +151,6 @@ struct dsdb_schema { struct dsdb_class *classes; }; +#include "dsdb/schema/proto.h" + #endif /* _DSDB_SCHEMA_H */ -- cgit From 7d5987c2e035d1661f25294c26e3d81ba44def90 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 19 Feb 2008 13:39:27 +0100 Subject: Remove uses of global_loadparm. (This used to be commit 138aaef0781e0754cc17b3ffdaa6062ba70c0c6a) --- source4/dsdb/schema/schema.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/dsdb/schema/schema.h') diff --git a/source4/dsdb/schema/schema.h b/source4/dsdb/schema/schema.h index 1379ddee9f..bb34235465 100644 --- a/source4/dsdb/schema/schema.h +++ b/source4/dsdb/schema/schema.h @@ -149,6 +149,8 @@ struct dsdb_schema { struct dsdb_attribute *attributes; struct dsdb_class *classes; + + struct smb_iconv_convenience *iconv_convenience; }; #include "dsdb/schema/proto.h" -- cgit From db0a105aae2ba32be4aa5658fc8963ba28933a6b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 1 Jul 2008 16:35:13 +0200 Subject: schema_fsmo: move fsmo info into struct dsdb_schema metze (This used to be commit 8538d305c803268c712a90879f29a2a74ba0ef03) --- source4/dsdb/schema/schema.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source4/dsdb/schema/schema.h') diff --git a/source4/dsdb/schema/schema.h b/source4/dsdb/schema/schema.h index bb34235465..6fce354f7c 100644 --- a/source4/dsdb/schema/schema.h +++ b/source4/dsdb/schema/schema.h @@ -150,6 +150,11 @@ struct dsdb_schema { struct dsdb_attribute *attributes; struct dsdb_class *classes; + struct { + bool we_are_master; + struct ldb_dn *master_dn; + } fsmo; + struct smb_iconv_convenience *iconv_convenience; }; -- cgit From 83d90d6cd6029446f836774d7c68bc13ce9cd360 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 10 Jul 2008 15:52:44 +1000 Subject: Make ad2oLschema even simpler, by moving the heavy work into dsdb. This will allow the kludge_acl and schema code to leverage the same work. (We might even get schema validation soon! :-) Andrew Bartlett (This used to be commit cecd04ce1f8ce2af2fb654b3abc1499092405d60) --- source4/dsdb/schema/schema.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'source4/dsdb/schema/schema.h') diff --git a/source4/dsdb/schema/schema.h b/source4/dsdb/schema/schema.h index 6fce354f7c..66cc867a19 100644 --- a/source4/dsdb/schema/schema.h +++ b/source4/dsdb/schema/schema.h @@ -158,6 +158,15 @@ struct dsdb_schema { struct smb_iconv_convenience *iconv_convenience; }; +enum dsdb_attr_list_query { + DSDB_SCHEMA_ALL_MAY, + DSDB_SCHEMA_ALL_MUST, + DSDB_SCHEMA_SYS_MAY, + DSDB_SCHEMA_SYS_MUST, + DSDB_SCHEMA_MAY, + DSDB_SCHEMA_MUST +}; + #include "dsdb/schema/proto.h" #endif /* _DSDB_SCHEMA_H */ -- cgit From b4691ad5601a9d3e3f8ff8b42314d5e2cb462cd2 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 11 Jul 2008 15:11:32 +1000 Subject: Use common code to fill in allowedAttributes in kludge_acl. This code is now in common with ad2oLschema. Andrew Bartlett (This used to be commit 0a797388ca442c3ad4809888897b1c63b65a7fdf) --- source4/dsdb/schema/schema.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source4/dsdb/schema/schema.h') diff --git a/source4/dsdb/schema/schema.h b/source4/dsdb/schema/schema.h index 66cc867a19..a4e455ae33 100644 --- a/source4/dsdb/schema/schema.h +++ b/source4/dsdb/schema/schema.h @@ -164,7 +164,8 @@ enum dsdb_attr_list_query { DSDB_SCHEMA_SYS_MAY, DSDB_SCHEMA_SYS_MUST, DSDB_SCHEMA_MAY, - DSDB_SCHEMA_MUST + DSDB_SCHEMA_MUST, + DSDB_SCHEMA_ALL }; #include "dsdb/schema/proto.h" -- cgit From 16112762e70879b50f1dfc49452d6d278bd256cf Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 15 Aug 2008 20:40:57 +1000 Subject: Generate the subSchema in cn=Aggregate This reads the schema from the in-memory structure, when the magic attributes are requested. The code is a modified version of that used in the ad2oLschema tool (now shared). The schema_fsmo module handles the insertion of the generated result. As such, this commit also removes these entries from the setup/schema.ldif Metze's previous stub of this functionality is also removed. Andrew Bartlett (This used to be commit c7c32ec7b42bdf0f7b669644516438c71b364e60) --- source4/dsdb/schema/schema.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'source4/dsdb/schema/schema.h') diff --git a/source4/dsdb/schema/schema.h b/source4/dsdb/schema/schema.h index a4e455ae33..cd714e9c61 100644 --- a/source4/dsdb/schema/schema.h +++ b/source4/dsdb/schema/schema.h @@ -168,6 +168,20 @@ enum dsdb_attr_list_query { DSDB_SCHEMA_ALL }; +enum dsdb_schema_convert_target { + TARGET_OPENLDAP, + TARGET_FEDORA_DS, + TARGET_AD_SCHEMA_SUBENTRY +}; + +struct dsdb_syntax_map { + const char *Standard_OID; + const char *AD_OID; + const char *equality; + const char *substring; + const char *comment; +}; + #include "dsdb/schema/proto.h" #endif /* _DSDB_SCHEMA_H */ -- cgit From 46c94dd8b28cbb6fca28f4884b65be034e135fbb Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 18 Aug 2008 10:16:45 +1000 Subject: Merge the two attribute syntax tables. This merges the table once found in the oLschema2ldif tool (and moved many times) with the table used for DRSUAPI. The OpenLDAP schema map has been updated, to ensure that despite a number of attributes being declared as OIDs, they are actually used as strings (as they are actually LDAP class/attribute names). Andrew Bartlett (This used to be commit 61f2958c84beeedcf369ccdc02afed0c8055b108) --- source4/dsdb/schema/schema.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'source4/dsdb/schema/schema.h') diff --git a/source4/dsdb/schema/schema.h b/source4/dsdb/schema/schema.h index cd714e9c61..df7826d61d 100644 --- a/source4/dsdb/schema/schema.h +++ b/source4/dsdb/schema/schema.h @@ -32,6 +32,9 @@ struct dsdb_syntax { uint32_t oMSyntax; struct ldb_val oMObjectClass; const char *attributeSyntax_oid; + const char *equality; + const char *substring; + const char *comment; WERROR (*drsuapi_to_ldb)(const struct dsdb_schema *schema, const struct dsdb_attribute *attr, @@ -174,14 +177,6 @@ enum dsdb_schema_convert_target { TARGET_AD_SCHEMA_SUBENTRY }; -struct dsdb_syntax_map { - const char *Standard_OID; - const char *AD_OID; - const char *equality; - const char *substring; - const char *comment; -}; - #include "dsdb/schema/proto.h" #endif /* _DSDB_SCHEMA_H */ -- cgit From bb80a19714048def04b9d94d4e9f125a20a95822 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 18 Aug 2008 20:30:27 +1000 Subject: Note the ldb syntax for attribute syntaxes in the table. This includes additional Samba-specific syntaxes made available from the ldif_handlers code. This commit also changes some table to use #defines, to ensure consistancy in other parts of the code. Andrew Bartlett (This used to be commit e26a5efd9a580ed3728e1f449e367b1cd4a73b5f) --- source4/dsdb/schema/schema.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/dsdb/schema/schema.h') diff --git a/source4/dsdb/schema/schema.h b/source4/dsdb/schema/schema.h index df7826d61d..68dc8197cb 100644 --- a/source4/dsdb/schema/schema.h +++ b/source4/dsdb/schema/schema.h @@ -35,6 +35,7 @@ struct dsdb_syntax { const char *equality; const char *substring; const char *comment; + const char *ldb_syntax; WERROR (*drsuapi_to_ldb)(const struct dsdb_schema *schema, const struct dsdb_attribute *attr, -- cgit