From c15a509f92a4a5dde47cd81751b9a5c4a1a20cfb Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Mon, 17 Oct 2005 12:19:26 +0000 Subject: [PATCH] More schema tweaks --- servers/slapd/overlays/accesslog.c | 156 ++++++++++++++--------------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/servers/slapd/overlays/accesslog.c b/servers/slapd/overlays/accesslog.c index 3bb8e62fac..2ac8df76eb 100644 --- a/servers/slapd/overlays/accesslog.c +++ b/servers/slapd/overlays/accesslog.c @@ -188,126 +188,126 @@ static struct { "EQUALITY caseIgnoreMatch " "SYNTAX OMsDirectoryString " "SINGLE-VALUE )", &ad_reqSession }, - { "( " LOG_SCHEMA_AT ".6 NAME 'reqResult' " + { "( " LOG_SCHEMA_AT ".6 NAME 'reqAuthzID' " + "DESC 'Authorization ID of requestor' " + "EQUALITY distinguishedNameMatch " + "SYNTAX OMsDN " + "SINGLE-VALUE )", &ad_reqAuthzID }, + { "( " LOG_SCHEMA_AT ".7 NAME 'reqResult' " "DESC 'Result code of request' " "EQUALITY integerMatch " "ORDERING integerOrderingMatch " "SYNTAX OMsInteger " "SINGLE-VALUE )", &ad_reqResult }, - { "( " LOG_SCHEMA_AT ".7 NAME 'reqAuthzID' " - "DESC 'Authorization ID of requestor' " - "EQUALITY distinguishedNameMatch " - "SYNTAX OMsDN " - "SINGLE-VALUE )", &ad_reqAuthzID }, - { "( " LOG_SCHEMA_AT ".8 NAME 'reqControls' " + { "( " LOG_SCHEMA_AT ".8 NAME 'reqMessage' " + "DESC 'Error text of request' " + "EQUALITY caseIgnoreMatch " + "SUBSTR caseIgnoreSubstringsMatch " + "SYNTAX OMsDirectoryString " + "SINGLE-VALUE )", &ad_reqMessage }, + { "( " LOG_SCHEMA_AT ".9 NAME 'reqReferral' " + "DESC 'Referrals returned for request' " + "SUP labeledURI )", &ad_reqReferral }, + { "( " LOG_SCHEMA_AT ".10 NAME 'reqControls' " "DESC 'Request controls' " "SYNTAX OMsOctetString )", &ad_reqControls }, - { "( " LOG_SCHEMA_AT ".9 NAME 'reqRespControls' " + { "( " LOG_SCHEMA_AT ".11 NAME 'reqRespControls' " "DESC 'Response controls of request' " "SYNTAX OMsOctetString )", &ad_reqRespControls }, - { "( " LOG_SCHEMA_AT ".10 NAME 'reqMethod' " + { "( " LOG_SCHEMA_AT ".12 NAME 'reqId' " + "DESC 'ID of Request to Abandon' " + "EQUALITY integerMatch " + "ORDERING integerOrderingMatch " + "SYNTAX OMsInteger " + "SINGLE-VALUE )", &ad_reqId }, + { "( " LOG_SCHEMA_AT ".13 NAME 'reqVersion' " + "DESC 'Protocol version of Bind request' " + "EQUALITY integerMatch " + "ORDERING integerOrderingMatch " + "SYNTAX OMsInteger " + "SINGLE-VALUE )", &ad_reqVersion }, + { "( " LOG_SCHEMA_AT ".14 NAME 'reqMethod' " "DESC 'Bind method of request' " "EQUALITY caseIgnoreMatch " "SYNTAX OMsDirectoryString " "SINGLE-VALUE )", &ad_reqMethod }, - { "( " LOG_SCHEMA_AT ".11 NAME 'reqAssertion' " + { "( " LOG_SCHEMA_AT ".15 NAME 'reqAssertion' " "DESC 'Compare Assertion of request' " "SYNTAX OMsDirectoryString " "SINGLE-VALUE )", &ad_reqAssertion }, - { "( " LOG_SCHEMA_AT ".12 NAME 'reqNewRDN' " + { "( " LOG_SCHEMA_AT ".16 NAME 'reqMod' " + "DESC 'Modifications of request' " + "SYNTAX OMsDirectoryString " + "EQUALITY caseIgnoreMatch " + "SUBSTR caseIgnoreSubstringsMatch )", &ad_reqMod }, + { "( " LOG_SCHEMA_AT ".17 NAME 'reqOld' " + "DESC 'Old values of entry before request completed' " + "EQUALITY caseIgnoreMatch " + "SUBSTR caseIgnoreSubstringsMatch " + "SYNTAX OMsDirectoryString )", &ad_reqOld }, + { "( " LOG_SCHEMA_AT ".18 NAME 'reqNewRDN' " "DESC 'New RDN of request' " "EQUALITY distinguishedNameMatch " "SYNTAX OMsDN " "SINGLE-VALUE )", &ad_reqNewRDN }, - { "( " LOG_SCHEMA_AT ".13 NAME 'reqNewSuperior' " - "DESC 'New superior DN of request' " - "EQUALITY distinguishedNameMatch " - "SYNTAX OMsDN " - "SINGLE-VALUE )", &ad_reqNewSuperior }, - { "( " LOG_SCHEMA_AT ".14 NAME 'reqDeleteOldRDN' " + { "( " LOG_SCHEMA_AT ".19 NAME 'reqDeleteOldRDN' " "DESC 'Delete old RDN' " "EQUALITY booleanMatch " "SYNTAX OMsBoolean " "SINGLE-VALUE )", &ad_reqDeleteOldRDN }, - { "( " LOG_SCHEMA_AT ".15 NAME 'reqMod' " - "DESC 'Modifications of request' " - "SYNTAX OMsDirectoryString " - "EQUALITY caseIgnoreMatch " - "SUBSTR caseIgnoreSubstringsMatch )", &ad_reqMod }, - { "( " LOG_SCHEMA_AT ".16 NAME 'reqScope' " + { "( " LOG_SCHEMA_AT ".20 NAME 'reqNewSuperior' " + "DESC 'New superior DN of request' " + "EQUALITY distinguishedNameMatch " + "SYNTAX OMsDN " + "SINGLE-VALUE )", &ad_reqNewSuperior }, + { "( " LOG_SCHEMA_AT ".21 NAME 'reqScope' " "DESC 'Scope of request' " "SYNTAX OMsDirectoryString " "SINGLE-VALUE )", &ad_reqScope }, - { "( " LOG_SCHEMA_AT ".17 NAME 'reqFilter' " + { "( " LOG_SCHEMA_AT ".22 NAME 'reqDerefAliases' " + "DESC 'Disposition of Aliases in request' " + "EQUALITY caseIgnoreMatch " + "SYNTAX OMsDirectoryString " + "SINGLE-VALUE )", &ad_reqDerefAliases }, + { "( " LOG_SCHEMA_AT ".23 NAME 'reqAttrsOnly' " + "DESC 'Attributes and values of request' " + "EQUALITY booleanMatch " + "SYNTAX OMsBoolean " + "SINGLE-VALUE )", &ad_reqAttrsOnly }, + { "( " LOG_SCHEMA_AT ".24 NAME 'reqFilter' " "DESC 'Filter of request' " "EQUALITY caseIgnoreMatch " "SUBSTR caseIgnoreSubstringsMatch " "SYNTAX OMsDirectoryString " "SINGLE-VALUE )", &ad_reqFilter }, - { "( " LOG_SCHEMA_AT ".18 NAME 'reqAttr' " + { "( " LOG_SCHEMA_AT ".25 NAME 'reqAttr' " "DESC 'Attributes of request' " "EQUALITY caseIgnoreMatch " "SYNTAX OMsDirectoryString )", &ad_reqAttr }, - { "( " LOG_SCHEMA_AT ".19 NAME 'reqEntries' " - "DESC 'Number of entries returned' " - "EQUALITY integerMatch " - "ORDERING integerOrderingMatch " - "SYNTAX OMsInteger " - "SINGLE-VALUE )", &ad_reqEntries }, - { "( " LOG_SCHEMA_AT ".20 NAME 'reqSizeLimit' " + { "( " LOG_SCHEMA_AT ".26 NAME 'reqSizeLimit' " "DESC 'Size limit of request' " "EQUALITY integerMatch " "ORDERING integerOrderingMatch " "SYNTAX OMsInteger " "SINGLE-VALUE )", &ad_reqSizeLimit }, - { "( " LOG_SCHEMA_AT ".21 NAME 'reqTimeLimit' " + { "( " LOG_SCHEMA_AT ".27 NAME 'reqTimeLimit' " "DESC 'Time limit of request' " "EQUALITY integerMatch " "ORDERING integerOrderingMatch " "SYNTAX OMsInteger " "SINGLE-VALUE )", &ad_reqTimeLimit }, - { "( " LOG_SCHEMA_AT ".22 NAME 'reqAttrsOnly' " - "DESC 'Attributes and values of request' " - "EQUALITY booleanMatch " - "SYNTAX OMsBoolean " - "SINGLE-VALUE )", &ad_reqAttrsOnly }, - { "( " LOG_SCHEMA_AT ".23 NAME 'reqData' " + { "( " LOG_SCHEMA_AT ".28 NAME 'reqEntries' " + "DESC 'Number of entries returned' " + "EQUALITY integerMatch " + "ORDERING integerOrderingMatch " + "SYNTAX OMsInteger " + "SINGLE-VALUE )", &ad_reqEntries }, + { "( " LOG_SCHEMA_AT ".29 NAME 'reqData' " "DESC 'Data of extended request' " "EQUALITY octetStringMatch " "SUBSTR octetStringSubstringsMatch " "SYNTAX OMsOctetString " "SINGLE-VALUE )", &ad_reqData }, - { "( " LOG_SCHEMA_AT ".24 NAME 'reqId' " - "DESC 'ID of Request to Abandon' " - "EQUALITY integerMatch " - "ORDERING integerOrderingMatch " - "SYNTAX OMsInteger " - "SINGLE-VALUE )", &ad_reqId }, - { "( " LOG_SCHEMA_AT ".25 NAME 'reqMessage' " - "DESC 'Error text of request' " - "EQUALITY caseIgnoreMatch " - "SUBSTR caseIgnoreSubstringsMatch " - "SYNTAX OMsDirectoryString " - "SINGLE-VALUE )", &ad_reqMessage }, - { "( " LOG_SCHEMA_AT ".26 NAME 'reqVersion' " - "DESC 'Protocol version of Bind request' " - "EQUALITY integerMatch " - "ORDERING integerOrderingMatch " - "SYNTAX OMsInteger " - "SINGLE-VALUE )", &ad_reqVersion }, - { "( " LOG_SCHEMA_AT ".27 NAME 'reqDerefAliases' " - "DESC 'Disposition of Aliases in request' " - "EQUALITY caseIgnoreMatch " - "SYNTAX OMsDirectoryString " - "SINGLE-VALUE )", &ad_reqDerefAliases }, - { "( " LOG_SCHEMA_AT ".28 NAME 'reqReferral' " - "DESC 'Referrals returned for request' " - "SUP labeledURI )", &ad_reqReferral }, - { "( " LOG_SCHEMA_AT ".29 NAME 'reqOld' " - "DESC 'Old values of entry before request completed' " - "EQUALITY caseIgnoreMatch " - "SUBSTR caseIgnoreSubstringsMatch " - "SYNTAX OMsDirectoryString )", &ad_reqOld }, { NULL, NULL } }; @@ -348,29 +348,29 @@ static struct { "DESC 'Compare operation' " "SUP auditReadObject STRUCTURAL " "MUST reqAssertion )", &log_ocs[LOG_EN_COMPARE] }, - { "( " LOG_SCHEMA_OC ".8 NAME 'auditModify' " + { "( " LOG_SCHEMA_OC ".8 NAME 'auditDelete' " + "DESC 'Delete operation' " + "SUP auditWriteObject STRUCTURAL " + "MAY reqOld )", &log_ocs[LOG_EN_DELETE] }, + { "( " LOG_SCHEMA_OC ".9 NAME 'auditModify' " "DESC 'Modify operation' " "SUP auditWriteObject STRUCTURAL " "MAY reqOld MUST reqMod )", &log_ocs[LOG_EN_MODIFY] }, - { "( " LOG_SCHEMA_OC ".9 NAME 'auditModRDN' " + { "( " LOG_SCHEMA_OC ".10 NAME 'auditModRDN' " "DESC 'ModRDN operation' " "SUP auditWriteObject STRUCTURAL " "MUST ( reqNewRDN $ reqDeleteOldRDN ) " "MAY reqNewSuperior )", &log_ocs[LOG_EN_MODRDN] }, - { "( " LOG_SCHEMA_OC ".10 NAME 'auditSearch' " + { "( " LOG_SCHEMA_OC ".11 NAME 'auditSearch' " "DESC 'Search operation' " "SUP auditReadObject STRUCTURAL " "MUST ( reqScope $ reqDerefAliases $ reqAttrsonly ) " "MAY ( reqFilter $ reqAttr $ reqEntries $ reqSizeLimit $ " "reqTimeLimit ) )", &log_ocs[LOG_EN_SEARCH] }, - { "( " LOG_SCHEMA_OC ".11 NAME 'auditExtended' " + { "( " LOG_SCHEMA_OC ".12 NAME 'auditExtended' " "DESC 'Extended operation' " "SUP auditObject STRUCTURAL " "MAY reqData )", &log_ocs[LOG_EN_EXTENDED] }, - { "( " LOG_SCHEMA_OC ".12 NAME 'auditDelete' " - "DESC 'Delete operation' " - "SUP auditWriteObject STRUCTURAL " - "MAY reqOld )", &log_ocs[LOG_EN_DELETE] }, { NULL, NULL } }; -- 2.39.5