Merge pull request #11 from varkoly/master

Simplify Ldap.rb
yast · Feb 13, 2014 · 9dde5f4 · 9dde5f4
2 parents 5c71817 + e2a4a6d
commit 9dde5f4
Show file tree

Hide file tree

Showing 7 changed files with 132 additions and 1,001 deletions.
diff --git a/conf/Makefile.am b/conf/Makefile.am
@@ -2,6 +2,6 @@
 # Makefile.am for .../agent-ldap/conf
 #
 
-scrconf_DATA = ldap.scr cfg_ldap.scr
+scrconf_DATA = ldap.scr ldap_conf.scr
 
 EXTRA_DIST = $(scrconf_DATA)
diff --git a/conf/cfg_ldap.scr b/conf/cfg_ldap.scr
diff --git a/conf/ldap_conf.scr b/conf/ldap_conf.scr
@@ -0,0 +1,40 @@
+/**
+ * File:
+ *   ldap_conf.scr
+ * Summary:
+ *   SCR Agent for reading/writing /etc/ldap.conf using the ini-agent
+ * Access:
+ *   read/write
+ * Authors:
+ *   Peter Varkoly <varkoly@suse.com>
+ * See:
+ *   yast2-agent-ini
+ *   libscr
+ *   man ldap.conf
+ * Example:
+ *   Dir(.ldap_conf)
+ *   (["base", "host"])
+ **
+ *   Read(.ldap_conf.v.host)
+ *   ("10.10.0.149")
+ **
+ *   Write(.etc.ldap_conf.v.base, "dc=myodmain, dc=com")
+ *   (true)
+ *
+ *
+ *    .ldap_conf
+ */
+.ldap_conf
+
+`ag_ini(
+  `IniAgent( "/etc/openldap/ldap.conf" ,
+    $[ "options" : ["global_values", "repeat_names"],
+       "comments" : [ "^#.*", "^[ \t]*$", ],
+       "params" : [
+         $[ "match" : [ "^[ \t]*([a-zA-Z0-9_]+)[ \t]+(.*[^ \t]|)[ \t]*$",
+                        "%s\t%s",
+                      ]
+         ]
+       ]
+    ]))
+
diff --git a/package/yast2-ldap.changes b/package/yast2-ldap.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Feb 13 11:12:38 UTC 2014 - varkoly@suse.com
+
+- Remove not used subroutines from the Ldap module
+- BNC#863329 - Missing Ldap::Export()
+- BNC#863612 YaST reports Cannot find client ldap/routines.rb
+- Simplify ldap-conf agent: Until now ldap informations was saved in 
+  3 places: /etc/ldap.conf /etc/openldap/ldap.conf and the sysconfig
+  file ldap. From now on only /etc/openldap/ldap.conf will be used.
+  /etc/ldap.conf is only for nss_ldap which is not provided anymore
+  The variable BIND_DN in sysconfig file ldap can saved in 
+  /etc/openldap/ldap.conf too. BASE_CONFIG_DN was everytime 
+  ou=ldapconfig,$BASE
+- 3.1.6
+
 -------------------------------------------------------------------
 Tue Feb 11 16:33:18 UTC 2014 - jreidinger@suse.com
 

diff --git a/package/yast2-ldap.spec b/package/yast2-ldap.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-ldap
-Version:        3.1.5
+Version:        3.1.6
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -30,6 +30,7 @@ BuildRequires:  yast2-devtools >= 3.1.10
 Summary:	YaST2 - LDAP Agent
 Requires: 	ldapcpplib yast2 yast2-network
 Conflicts:	yast2-ldap-client < 3.1.5
+Conflicts:      yast2-auth-client < 3.1.6
 
 %description
 This agent is used by various YaST2 modules to work with LDAP. It