summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2009-03-14 11:25:03 +1100
committerJames Turnbull <james@lovedthanlost.net>2009-03-14 11:25:03 +1100
commitb24b9f5de02f4dfc6a7e89d5432aec32ea39cae1 (patch)
tree6510383b9ad8e5ab3a61796320718b0837fa4acf
parent88aa1bc2cfef4517fca9e467c86f70ae356be883 (diff)
downloadpuppet-b24b9f5de02f4dfc6a7e89d5432aec32ea39cae1.tar.gz
puppet-b24b9f5de02f4dfc6a7e89d5432aec32ea39cae1.tar.xz
puppet-b24b9f5de02f4dfc6a7e89d5432aec32ea39cae1.zip
Fixed #2071 - Updated LDAP schema
-rw-r--r--CHANGELOG2
-rw-r--r--ext/ldap/puppet.schema3
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 6334bfeac..ab1dd988e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
0.25.0
+ Fixed #2071 - Updated LDAP schema
+
Fixed #1849 - Ruby 1.9 portability: `when' doesn't like colons, replace with semicolons
Fixed #1910 - Updated logcheck regex
diff --git a/ext/ldap/puppet.schema b/ext/ldap/puppet.schema
index a7a5f46ff..651cbafc8 100644
--- a/ext/ldap/puppet.schema
+++ b/ext/ldap/puppet.schema
@@ -10,7 +10,8 @@ attributetype ( 1.1.3.10 NAME 'puppetclass'
attributetype ( 1.1.3.9 NAME 'parentnode'
DESC 'Puppet Parent Node'
EQUALITY caseIgnoreIA5Match
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+ SINGLE-VALUE )
attributetype ( 1.1.3.11 NAME 'environment'
DESC 'Puppet Node Environment'