public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
* cluster: STABLE3 - config: Update LDIF to include cn when needed
@ 2009-09-10 17:49 Lon Hohberger
  0 siblings, 0 replies; only message in thread
From: Lon Hohberger @ 2009-09-10 17:49 UTC (permalink / raw)
  To: cluster-cvs-relay

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=b6edcdd24b9b438abe364cf128e05481e9ad644c
Commit:        b6edcdd24b9b438abe364cf128e05481e9ad644c
Parent:        85bc3dd69ce5dfac07bc90e85619fa3123813f29
Author:        Lon Hohberger <lhh@redhat.com>
AuthorDate:    Thu Sep 10 13:30:38 2009 -0400
Committer:     Lon Hohberger <lhh@redhat.com>
CommitterDate: Thu Sep 10 13:30:38 2009 -0400

config: Update LDIF to include cn when needed

Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
 config/plugins/ldap/99cluster.ldif |   27 ++++++++++++++++++++++++---
 config/tools/ldap/rng2ldif/tree.c  |    2 +-
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/config/plugins/ldap/99cluster.ldif b/config/plugins/ldap/99cluster.ldif
index 5fc9ee8..92a0559 100644
--- a/config/plugins/ldap/99cluster.ldif
+++ b/config/plugins/ldap/99cluster.ldif
@@ -1,4 +1,4 @@
-# Auto-generated @ 2009-09-09 09:35:50
+# Auto-generated @ 2009-09-10 13:21:11
 dn: cn=schema
 attributeTypes: (
   1.3.6.1.4.1.2312.8.1.1.15 NAME 'rhcsAlias'
@@ -1375,39 +1375,46 @@ objectClasses: (
    )
 objectClasses: (
      1.3.6.1.4.1.2312.8.1.2.3 NAME 'rhcsCman' SUP top STRUCTURAL
+     MUST ( cn )
      MAY ( rhcsDisable-openais $ rhcsKeyfile $ rhcsBroadcast $ rhcsNodename $ rhcsCluster-id $ rhcsPort $ rhcsDebug-mask $ rhcsCcsd-poll $ rhcsShutdown-timeout $ rhcsQuorum-dev-poll $ rhcsExpected-votes $ rhcsTwo-node )
    )
 objectClasses: (
      1.3.6.1.4.1.2312.8.1.2.8 NAME 'rhcsMulticast' SUP top STRUCTURAL
-     MUST ( rhcsAddr )
+     MUST ( cn $ rhcsAddr )
    )
 objectClasses: (
      1.3.6.1.4.1.2312.8.1.2.4 NAME 'rhcsTotem' SUP top STRUCTURAL
+     MUST ( cn )
      MAY ( rhcsKeyfile $ rhcsSecauth $ rhcsRrp-mode $ rhcsToken-retransmits-before-loss-const $ rhcsToken $ rhcsJoin $ rhcsConsensus )
    )
 objectClasses: (
      1.3.6.1.4.1.2312.8.1.2.56 NAME 'rhcsInterface' SUP top STRUCTURAL
+     MUST ( cn )
      MAY ( rhcsBroadcast $ rhcsMcastport $ rhcsMcastaddr $ rhcsBindnetaddr $ rhcsRingnumber )
    )
 objectClasses: (
      1.3.6.1.4.1.2312.8.1.2.29 NAME 'rhcsQuorumd' SUP top STRUCTURAL
+     MUST ( cn )
      MAY ( rhcsMax-error-cycles $ rhcsAllow-kill $ rhcsParanoid $ rhcsStop-cman $ rhcsPriority $ rhcsReboot $ rhcsScheduler $ rhcsStatus-file $ rhcsLabel $ rhcsDevice $ rhcsMin-score $ rhcsVotes $ rhcsTko $ rhcsInterval )
    )
 objectClasses: (
      1.3.6.1.4.1.2312.8.1.2.30 NAME 'rhcsHeuristic' SUP top STRUCTURAL
-     MUST ( rhcsProgram )
+     MUST ( cn $ rhcsProgram )
      MAY ( rhcsTko $ rhcsInterval $ rhcsScore )
    )
 objectClasses: (
      1.3.6.1.4.1.2312.8.1.2.28 NAME 'rhcsFence-daemon' SUP top STRUCTURAL
+     MUST ( cn )
      MAY ( rhcsSkip-undefined $ rhcsClean-start $ rhcsOverride-time $ rhcsOverride-path $ rhcsPost-fail-delay $ rhcsPost-join-delay )
    )
 objectClasses: (
      1.3.6.1.4.1.2312.8.1.2.18 NAME 'rhcsFence-xvmd' SUP top STRUCTURAL
+     MUST ( cn )
      MAY ( rhcsMulticast-interface $ rhcsKey-file $ rhcsUri $ rhcsHash $ rhcsAuth $ rhcsMulticast-address $ rhcsUse-uuid $ rhcsPort $ rhcsDebug )
    )
 objectClasses: (
      1.3.6.1.4.1.2312.8.1.2.12 NAME 'rhcsDlm' SUP top STRUCTURAL
+     MUST ( cn )
      MAY ( rhcsDrop-resources-age $ rhcsDrop-resources-count $ rhcsDrop-resources-time $ rhcsPlock-ownership $ rhcsPlock-rate-limit $ rhcsPlock-debug $ rhcsEnable-plock $ rhcsEnable-deadlk $ rhcsEnable-quorum $ rhcsEnable-fencing $ rhcsProtocol $ rhcsTimewarn $ rhcsLog-debug )
    )
 objectClasses: (
@@ -1421,14 +1428,17 @@ objectClasses: (
    )
 objectClasses: (
      1.3.6.1.4.1.2312.8.1.2.13 NAME 'rhcsGfs-controld' SUP top STRUCTURAL
+     MUST ( cn )
      MAY ( rhcsDrop-resources-age $ rhcsDrop-resources-count $ rhcsDrop-resources-time $ rhcsPlock-ownership $ rhcsPlock-rate-limit $ rhcsPlock-debug $ rhcsEnable-plock $ rhcsEnable-withdraw )
    )
 objectClasses: (
      1.3.6.1.4.1.2312.8.1.2.16 NAME 'rhcsGroup' SUP top STRUCTURAL
+     MUST ( cn )
      MAY ( rhcsGroupd-compat )
    )
 objectClasses: (
      1.3.6.1.4.1.2312.8.1.2.19 NAME 'rhcsLogging' SUP top STRUCTURAL
+     MUST ( cn )
      MAY ( rhcsDebug $ rhcsLogfile $ rhcsLogfile-priority $ rhcsSyslog-priority $ rhcsSyslog-facility $ rhcsTo-logfile $ rhcsTo-syslog )
    )
 objectClasses: (
@@ -1440,6 +1450,7 @@ objectClasses: (
 ### This object class currently has no attributes
 #objectClasses: (
 #     1.3.6.1.4.1.2312.8.1.2.9 NAME 'rhcsClusternodes' SUP top STRUCTURAL
+#     MUST ( cn )
 #   )
 objectClasses: (
      1.3.6.1.4.1.2312.8.1.2.10 NAME 'rhcsClusternode' SUP top STRUCTURAL
@@ -1454,6 +1465,7 @@ objectClasses: (
 ### This object class currently has no attributes
 #objectClasses: (
 #     1.3.6.1.4.1.2312.8.1.2.17 NAME 'rhcsFencedevices' SUP top STRUCTURAL
+#     MUST ( cn )
 #   )
 objectClasses: (
      1.3.6.1.4.1.2312.8.1.2.5 NAME 'rhcsFencedevice' SUP top STRUCTURAL
@@ -1462,12 +1474,14 @@ objectClasses: (
    )
 objectClasses: (
      1.3.6.1.4.1.2312.8.1.2.21 NAME 'rhcsRm' SUP top STRUCTURAL
+     MUST ( cn )
      MAY ( rhcsLog-facility $ rhcsCentral-processing $ rhcsTransition-throttling $ rhcsStatus-poll-interval $ rhcsStatus-child-max $ rhcsLog-level )
    )
 ### Placeholder for rhcsFailoverdomains
 ### This object class currently has no attributes
 #objectClasses: (
 #     1.3.6.1.4.1.2312.8.1.2.22 NAME 'rhcsFailoverdomains' SUP top STRUCTURAL
+#     MUST ( cn )
 #   )
 objectClasses: (
      1.3.6.1.4.1.2312.8.1.2.23 NAME 'rhcsFailoverdomain' SUP top STRUCTURAL
@@ -1483,6 +1497,7 @@ objectClasses: (
 ### This object class currently has no attributes
 #objectClasses: (
 #     1.3.6.1.4.1.2312.8.1.2.25 NAME 'rhcsEvents' SUP top STRUCTURAL
+#     MUST ( cn )
 #   )
 objectClasses: (
      1.3.6.1.4.1.2312.8.1.2.26 NAME 'rhcsEvent' SUP top STRUCTURAL
@@ -1493,6 +1508,7 @@ objectClasses: (
 ### This object class currently has no attributes
 #objectClasses: (
 #     1.3.6.1.4.1.2312.8.1.2.27 NAME 'rhcsResources' SUP top STRUCTURAL
+#     MUST ( cn )
 #   )
 objectClasses: (
      1.3.6.1.4.1.2312.8.1.2.31 NAME 'rhcsService' SUP top STRUCTURAL
@@ -1500,6 +1516,7 @@ objectClasses: (
    )
 objectClasses: (
      1.3.6.1.4.1.2312.8.1.2.32 NAME 'rhcsIp' SUP top STRUCTURAL
+     MUST ( cn )
      MAY ( rhcs--enforce-timeouts $ rhcs--independent-subtree $ rhcsSleeptime $ rhcsNfslock $ rhcsMonitor-link $ rhcsFamily $ rhcsAddress $ rhcsRef )
    )
 objectClasses: (
@@ -1560,10 +1577,12 @@ objectClasses: (
    )
 objectClasses: (
      1.3.6.1.4.1.2312.8.1.2.47 NAME 'rhcsSAPInstance' SUP top STRUCTURAL
+     MUST ( cn )
      MAY ( rhcs--enforce-timeouts $ rhcs--independent-subtree $ rhcsPOST-STOP-USEREXIT $ rhcsPRE-STOP-USEREXIT $ rhcsPOST-START-USEREXIT $ rhcsPRE-START-USEREXIT $ rhcsAUTOMATIC-RECOVER $ rhcsSTART-WAITTIME $ rhcsSTART-PROFILE $ rhcsDIR-PROFILE $ rhcsDIR-EXECUTABLE $ rhcsInstanceName $ rhcsRef )
    )
 objectClasses: (
      1.3.6.1.4.1.2312.8.1.2.48 NAME 'rhcsSAPDatabase' SUP top STRUCTURAL
+     MUST ( cn )
      MAY ( rhcs--enforce-timeouts $ rhcs--independent-subtree $ rhcsPOST-STOP-USEREXIT $ rhcsPRE-STOP-USEREXIT $ rhcsPOST-START-USEREXIT $ rhcsPRE-START-USEREXIT $ rhcsDB-JARS $ rhcsDIR-SECSTORE $ rhcsDIR-BOOTSTRAP $ rhcsAUTOMATIC-RECOVER $ rhcsSTRICT-MONITORING $ rhcsJAVA-HOME $ rhcsDBJ2EE-ONLY $ rhcsNETSERVICENAME $ rhcsDBTYPE $ rhcsDIR-EXECUTABLE $ rhcsSID $ rhcsRef )
    )
 objectClasses: (
@@ -1591,6 +1610,7 @@ objectClasses: (
 ### This object class currently has no attributes
 #objectClasses: (
 #     1.3.6.1.4.1.2312.8.1.2.54 NAME 'rhcsFence' SUP top STRUCTURAL
+#     MUST ( cn )
 #   )
 objectClasses: (
      1.3.6.1.4.1.2312.8.1.2.7 NAME 'rhcsMethod' SUP top STRUCTURAL
@@ -1600,6 +1620,7 @@ objectClasses: (
 ### This object class currently has no attributes
 #objectClasses: (
 #     1.3.6.1.4.1.2312.8.1.2.55 NAME 'rhcsUnfence' SUP top STRUCTURAL
+#     MUST ( cn )
 #   )
 objectClasses: (
      1.3.6.1.4.1.2312.8.1.2.6 NAME 'rhcsDevice' SUP top STRUCTURAL
diff --git a/config/tools/ldap/rng2ldif/tree.c b/config/tools/ldap/rng2ldif/tree.c
index 61acc5b..a2fae31 100644
--- a/config/tools/ldap/rng2ldif/tree.c
+++ b/config/tools/ldap/rng2ldif/tree.c
@@ -288,7 +288,7 @@ parse_element_tag(xmlNodePtr curr_node,
 		obj->idval = v;
 		obj->next = *objs;
 		*objs = obj;
-		printf("New object class %s \n",obj->name);
+		dbg_printf("New object class %s \n",obj->name);
 	}
 
 	find_optional_attributes(curr_node->xmlChildrenNode, 0,


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2009-09-10 17:49 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-09-10 17:49 cluster: STABLE3 - config: Update LDIF to include cn when needed Lon Hohberger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).