From: Kurt Zeilenga Date: Fri, 8 Dec 2006 02:30:11 +0000 (+0000) Subject: Monitor attributes should have dSAOperation usage, X-Git-Tag: OPENLDAP_REL_ENG_2_4_4ALPHA~8^2~403 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80d74dc2cd31931dae1d630bfb468278bd64049e;p=thirdparty%2Fopenldap.git Monitor attributes should have dSAOperation usage, not directoryOperation usage. Update test000 to request return of only @monitor attributes. --- diff --git a/servers/slapd/back-bdb/monitor.c b/servers/slapd/back-bdb/monitor.c index 6697b82c03..7349796381 100644 --- a/servers/slapd/back-bdb/monitor.c +++ b/servers/slapd/back-bdb/monitor.c @@ -67,7 +67,7 @@ static struct { "DESC 'Number of items in Entry Cache' " "SUP monitorCounter " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", + "USAGE dSAOperation )", &ad_olmBDBEntryCache }, { "( olmBDBAttributes:2 " @@ -75,7 +75,7 @@ static struct { "DESC 'Number of items in EntryInfo Cache' " "SUP monitorCounter " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", + "USAGE dSAOperation )", &ad_olmBDBEntryInfo }, { "( olmBDBAttributes:3 " @@ -83,7 +83,7 @@ static struct { "DESC 'Number of items in IDL Cache' " "SUP monitorCounter " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", + "USAGE dSAOperation )", &ad_olmBDBIDLCache }, { "( olmBDBAttributes:4 " @@ -92,7 +92,7 @@ static struct { "where the database environment resides' " "SUP monitoredInfo " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", + "USAGE dSAOperation )", &ad_olmDbDirectory }, { NULL } diff --git a/servers/slapd/back-monitor/init.c b/servers/slapd/back-monitor/init.c index 6543fed041..4b32e124b0 100644 --- a/servers/slapd/back-monitor/init.c +++ b/servers/slapd/back-monitor/init.c @@ -1598,7 +1598,7 @@ monitor_back_initialize( "SUBSTR caseIgnoreSubstringsMatch " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitoredInfo) }, { "( 1.3.6.1.4.1.4203.666.1.55.2 " "NAME 'managedInfo' " @@ -1612,28 +1612,28 @@ monitor_back_initialize( "ORDERING integerOrderingMatch " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorCounter) }, { "( 1.3.6.1.4.1.4203.666.1.55.4 " "NAME 'monitorOpCompleted' " "DESC 'monitor completed operations' " "SUP monitorCounter " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorOpCompleted) }, { "( 1.3.6.1.4.1.4203.666.1.55.5 " "NAME 'monitorOpInitiated' " "DESC 'monitor initiated operations' " "SUP monitorCounter " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorOpInitiated) }, { "( 1.3.6.1.4.1.4203.666.1.55.6 " "NAME 'monitorConnectionNumber' " "DESC 'monitor connection number' " "SUP monitorCounter " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionNumber) }, { "( 1.3.6.1.4.1.4203.666.1.55.7 " "NAME 'monitorConnectionAuthzDN' " @@ -1642,21 +1642,21 @@ monitor_back_initialize( "EQUALITY distinguishedNameMatch " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionAuthzDN) }, { "( 1.3.6.1.4.1.4203.666.1.55.8 " "NAME 'monitorConnectionLocalAddress' " "DESC 'monitor connection local address' " "SUP monitoredInfo " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionLocalAddress) }, { "( 1.3.6.1.4.1.4203.666.1.55.9 " "NAME 'monitorConnectionPeerAddress' " "DESC 'monitor connection peer address' " "SUP monitoredInfo " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionPeerAddress) }, { "( 1.3.6.1.4.1.4203.666.1.55.10 " "NAME 'monitorTimestamp' " @@ -1666,14 +1666,14 @@ monitor_back_initialize( "SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 " "SINGLE-VALUE " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorTimestamp) }, { "( 1.3.6.1.4.1.4203.666.1.55.11 " "NAME 'monitorOverlay' " "DESC 'name of overlays defined for a given database' " "SUP monitoredInfo " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorOverlay) }, { "( 1.3.6.1.4.1.4203.666.1.55.12 " "NAME 'readOnly' " @@ -1681,7 +1681,7 @@ monitor_back_initialize( "EQUALITY booleanMatch " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 " "SINGLE-VALUE " - "USAGE directoryOperation )", SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_readOnly) }, { "( 1.3.6.1.4.1.4203.666.1.55.13 " "NAME 'restrictedOperation' " @@ -1693,77 +1693,77 @@ monitor_back_initialize( "DESC 'monitor connection protocol' " "SUP monitoredInfo " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionProtocol) }, { "( 1.3.6.1.4.1.4203.666.1.55.15 " "NAME 'monitorConnectionOpsReceived' " "DESC 'monitor number of operations received by the connection' " "SUP monitorCounter " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionOpsReceived) }, { "( 1.3.6.1.4.1.4203.666.1.55.16 " "NAME 'monitorConnectionOpsExecuting' " "DESC 'monitor number of operations in execution within the connection' " "SUP monitorCounter " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionOpsExecuting) }, { "( 1.3.6.1.4.1.4203.666.1.55.17 " "NAME 'monitorConnectionOpsPending' " "DESC 'monitor number of pending operations within the connection' " "SUP monitorCounter " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionOpsPending) }, { "( 1.3.6.1.4.1.4203.666.1.55.18 " "NAME 'monitorConnectionOpsCompleted' " "DESC 'monitor number of operations completed within the connection' " "SUP monitorCounter " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionOpsCompleted) }, { "( 1.3.6.1.4.1.4203.666.1.55.19 " "NAME 'monitorConnectionGet' " "DESC 'number of times connection_get() was called so far' " "SUP monitorCounter " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionGet) }, { "( 1.3.6.1.4.1.4203.666.1.55.20 " "NAME 'monitorConnectionRead' " "DESC 'number of times connection_read() was called so far' " "SUP monitorCounter " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionRead) }, { "( 1.3.6.1.4.1.4203.666.1.55.21 " "NAME 'monitorConnectionWrite' " "DESC 'number of times connection_write() was called so far' " "SUP monitorCounter " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionWrite) }, { "( 1.3.6.1.4.1.4203.666.1.55.22 " "NAME 'monitorConnectionMask' " "DESC 'monitor connection mask' " "SUP monitoredInfo " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionMask) }, { "( 1.3.6.1.4.1.4203.666.1.55.23 " "NAME 'monitorConnectionListener' " "DESC 'monitor connection listener' " "SUP monitoredInfo " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionListener) }, { "( 1.3.6.1.4.1.4203.666.1.55.24 " "NAME 'monitorConnectionPeerDomain' " "DESC 'monitor connection peer domain' " "SUP monitoredInfo " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionPeerDomain) }, { "( 1.3.6.1.4.1.4203.666.1.55.25 " "NAME 'monitorConnectionStartTime' " @@ -1771,7 +1771,7 @@ monitor_back_initialize( "SUP monitorTimestamp " "SINGLE-VALUE " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionStartTime) }, { "( 1.3.6.1.4.1.4203.666.1.55.26 " "NAME 'monitorConnectionActivityTime' " @@ -1779,7 +1779,7 @@ monitor_back_initialize( "SUP monitorTimestamp " "SINGLE-VALUE " "NO-USER-MODIFICATION " - "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorConnectionActivityTime) }, { "( 1.3.6.1.4.1.4203.666.1.55.27 " "NAME 'monitorIsShadow' " @@ -1787,14 +1787,14 @@ monitor_back_initialize( "EQUALITY booleanMatch " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 " "SINGLE-VALUE " - "USAGE directoryOperation )", SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorIsShadow) }, { "( 1.3.6.1.4.1.4203.666.1.55.28 " "NAME 'monitorUpdateRef' " "DESC 'update referral for shadow databases' " "SUP monitoredInfo " "SINGLE-VALUE " - "USAGE directoryOperation )", SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorUpdateRef) }, { "( 1.3.6.1.4.1.4203.666.1.55.29 " "NAME 'monitorRuntimeConfig' " @@ -1802,7 +1802,7 @@ monitor_back_initialize( "EQUALITY booleanMatch " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 " "SINGLE-VALUE " - "USAGE directoryOperation )", SLAP_AT_HIDE, + "USAGE dSAOperation )", SLAP_AT_HIDE, offsetof(monitor_info_t, mi_ad_monitorRuntimeConfig) }, { NULL, 0, -1 } }; diff --git a/tests/scripts/test000-rootdse b/tests/scripts/test000-rootdse index 635b9fff6b..c95182660d 100755 --- a/tests/scripts/test000-rootdse +++ b/tests/scripts/test000-rootdse @@ -33,7 +33,7 @@ sleep 1 echo "Using ldapsearch to retrieve the root DSE..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -b "" -s base -h $LOCALHOST -p $PORT1 \ - '+extensibleObject' > $SEARCHOUT 2>&1 + '@extensibleObject' > $SEARCHOUT 2>&1 RC=$? if test $RC = 0 ; then break @@ -57,7 +57,7 @@ if test $RC = 0 ; then count=3 echo "Using ldapsearch to retrieve the cn=Monitor..." $LDAPSEARCH -b "cn=Monitor" -s base -h $LOCALHOST -p $PORT1 \ - '+extensibleObject' >> $SEARCHOUT 2>&1 + '@monitor' >> $SEARCHOUT 2>&1 RC=$? ;; esac