--- a/components/puppet/files/solaris/lib/puppet/type/ldap.rb	Thu Jan 09 03:35:51 2014 -0800
+++ b/components/puppet/files/solaris/lib/puppet/type/ldap.rb	Fri Jan 31 14:12:10 2014 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 require 'ipaddr'
@@ -48,8 +48,18 @@
     @doc = "Manage the configuration of the LDAP client for Oracle Solaris"
 
     newparam(:name) do
+        desc "The symbolic name for the LDAP client settings to use.  This name
+              is used for human reference only."
+        isnamevar
+    end
+
+    newproperty(:profile) do
         desc "The LDAP profile name"
-        isnamevar
+        class << self
+            attr_accessor :pg
+        end
+        self.pg = "config"
+        desc "The LDAP profile name"
     end
 
     newproperty(:server_list, :parent => Puppet::Property::List) do
@@ -65,7 +75,7 @@
         def should
             @should
         end
-
+        
         def insync?(is)
             is = [] if is == :absent or is.nil?
             is.sort == self.should.sort
@@ -94,7 +104,7 @@
         def should
             @should
         end
-
+        
         def insync?(is)
             is = [] if is == :absent or is.nil?
             is.sort == self.should.sort
@@ -144,7 +154,7 @@
         def should
             @should
         end
-
+        
         def insync?(is)
             is = [] if is == :absent or is.nil?
             is.sort == self.should.sort
@@ -218,7 +228,7 @@
         def should
             @should
         end
-
+        
         def insync?(is)
             is = [] if is == :absent or is.nil?
             is.sort == self.should.sort
@@ -244,7 +254,7 @@
         def should
             @should
         end
-
+        
         def insync?(is)
             is = [] if is == :absent or is.nil?
             is.sort == self.should.sort
@@ -280,7 +290,7 @@
         def should
             @should
         end
-
+        
         def insync?(is)
             is = [] if is == :absent or is.nil?
             is.sort == self.should.sort
@@ -305,7 +315,7 @@
         def should
             @should
         end
-
+        
         def insync?(is)
             is = [] if is == :absent or is.nil?
             is.sort == self.should.sort
@@ -335,7 +345,7 @@
         self.pg = "cred"
     end
 
-    newproperty(:admin_dn) do
+    newproperty(:admin_bind_dn) do
         desc "The Bind Distinguised Name for the administrator identity that
               is used for shadow information update"
         class << self
@@ -344,7 +354,7 @@
         self.pg = "cred"
     end
 
-    newproperty(:admin_password) do
+    newproperty(:admin_bind_passwd) do
         desc "The administrator password"
         class << self
             attr_accessor :pg
@@ -352,7 +362,7 @@
         self.pg = "cred"
     end
 
-    newproperty(:certificate_path) do
+    newproperty(:host_certpath) do
         desc "The location of the certificate files"
         class << self
             attr_accessor :pg