Merge remote-tracking branch 'origin/pr/9'

Conflicts: package/yast2-ldap-server.changes
yast · Jul 29, 2013 · 83a117c · 83a117c
2 parents f2b2a3b + b2053de
commit 83a117c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 17 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.22.2
+2.22.3
diff --git a/package/yast2-ldap-server.changes b/package/yast2-ldap-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul  2 11:44:46 UTC 2013 - varkoly@suse.com
+
+- bnc#533243 - After starting YaST LDAP server, during initialization get error
+- 2.22.3
+
 -------------------------------------------------------------------
 Sun Jun 16 20:07:33 UTC 2013 - lslezak@suse.cz
 

diff --git a/src/tree_structure.ycp b/src/tree_structure.ycp
@@ -118,14 +118,6 @@ define boolean cb_read_daemon()
     {
         UI::ChangeWidget( `cb_interface_ldaps, `Value, false );
     }
-    if ( LdapServer::ReadProtocolListenerEnabled("ldapi") )
-    {
-        UI::ChangeWidget( `cb_interface_ldapi, `Value, true );
-    }
-    else
-    {
-        UI::ChangeWidget( `cb_interface_ldapi, `Value, false );
-    }
     return true;
 }
 
@@ -146,7 +138,7 @@ define boolean cb_write_daemon()
 
     LdapServer::WriteSLPEnabled( (boolean) UI::QueryWidget( `id( `cb_register_slp ), `Value ) );
     LdapServer::WriteProtocolListenerEnabled( "ldap", (boolean) UI::QueryWidget( `id( `cb_interface_ldap ), `Value ) );
-    LdapServer::WriteProtocolListenerEnabled( "ldapi", (boolean) UI::QueryWidget( `id( `cb_interface_ldapi ), `Value ) );
+    LdapServer::WriteProtocolListenerEnabled( "ldapi", true );
     if ( (boolean) UI::QueryWidget( `id( `cb_interface_ldaps ), `Value ) )
     {
         map<string, any> tls = LdapServer::ReadTlsConfig();

diff --git a/src/widgets.ycp b/src/widgets.ycp
@@ -59,13 +59,6 @@
                                 //`HWeight(1, `PushButton( `id( `pb_interface_ldaps), "Interfaces ...")),
                                 `HWeight(1, `HStretch())
                             )
-                        ),
-                        `Left(
-                            `HBox(
-                                `HWeight(1, `CheckBox( `id( `cb_interface_ldapi), _("LDAP over IPC (ldapi)"), false ) ),
-                                //`HWeight(1, `PushButton( `id( `pb_interface_ldapi), "Interfaces ...") ),
-                                `HWeight(1, `HStretch())
-                            )
                         )
                     )
                 )