Hello community,
here is the log from the commit of package yast2-ldap-server
checked in at Fri Feb 2 13:09:55 CET 2007.
--------
--- yast2-ldap-server/yast2-ldap-server.changes 2007-01-17 16:10:19.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-ldap-server/yast2-ldap-server.changes 2007-02-01 12:05:37.000000000 +0100
@@ -1,0 +2,10 @@
+Thu Feb 1 12:03:15 CET 2007 - rhafer@suse.de
+
+- Close window did not work in autoyast UI (Bug #241009)
+
+-------------------------------------------------------------------
+Thu Jan 25 17:17:28 CET 2007 - mc@suse.de
+
+- add commandline interface [Feature #120062]
+
+-------------------------------------------------------------------
Old:
----
yast2-ldap-server-2.15.0.tar.bz2
New:
----
yast2-ldap-server-2.15.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ldap-server.spec ++++++
--- /var/tmp/diff_new_pack.D14705/_old 2007-02-02 13:09:14.000000000 +0100
+++ /var/tmp/diff_new_pack.D14705/_new 2007-02-02 13:09:14.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ldap-server (Version 2.15.0)
+# spec file for package yast2-ldap-server (Version 2.15.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-ldap-server
-Version: 2.15.0
+Version: 2.15.1
Release: 1
License: GNU General Public License (GPL), X11/MIT
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ldap-server-2.15.0.tar.bz2
+Source0: yast2-ldap-server-2.15.1.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer pkg-config update-desktop-files yast2 yast2-core yast2-devtools
Requires: yast2 perl perl-gettext yast2-perl-bindings yast2-ca-management perl-X500-DN perl-Digest-SHA1 net-tools
@@ -34,7 +34,7 @@
Andreas Bauer
%prep
-%setup -n yast2-ldap-server-2.15.0
+%setup -n yast2-ldap-server-2.15.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -73,6 +73,10 @@
%doc %{prefix}/share/doc/packages/yast2-ldap-server
%changelog -n yast2-ldap-server
+* Thu Feb 01 2007 - rhafer@suse.de
+- Close window did not work in autoyast UI (Bug #241009)
+* Thu Jan 25 2007 - mc@suse.de
+- add commandline interface [Feature #120062]
* Wed Jan 17 2007 - rhafer@suse.de
- The Overlay subsection should aways be the last part of a
database section (Bug #235385)
++++++ yast2-ldap-server-2.15.0.tar.bz2 -> yast2-ldap-server-2.15.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.15.0/src/dialogs.ycp new/yast2-ldap-server-2.15.1/src/dialogs.ycp
--- old/yast2-ldap-server-2.15.0/src/dialogs.ycp 2007-01-17 14:38:30.000000000 +0100
+++ new/yast2-ldap-server-2.15.1/src/dialogs.ycp 2007-02-01 11:12:22.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Andreas Bauer
*
- * $Id: dialogs.ycp 35439 2007-01-17 13:38:29Z rhafer $
+ * $Id: dialogs.ycp 35766 2007-02-01 10:12:18Z rhafer $
*/
{
@@ -197,7 +197,7 @@
CWMFirewallInterfaces::OpenFirewallHandle (firewall_widget, "", event);
y2debug( "EnableServiceDialog: seeing return value '%1'", ret );
- if( ret == `back || ret == `abort ) break;
+ if( ret == `back || ret == `abort || ret == `cancel) break;
else if( ret == `next || ret == `finish )
{
CWMFirewallInterfaces::OpenFirewallStore (firewall_widget, "", event);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.15.0/src/ldap-server.ycp new/yast2-ldap-server-2.15.1/src/ldap-server.ycp
--- old/yast2-ldap-server-2.15.0/src/ldap-server.ycp 2005-12-08 09:22:02.000000000 +0100
+++ new/yast2-ldap-server-2.15.1/src/ldap-server.ycp 2007-02-01 10:27:52.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Main file
* Authors: Andreas Bauer
*
- * $Id: ldap-server.ycp 20346 2004-11-17 15:09:24Z schubi $
+ * $Id: ldap-server.ycp 35659 2007-01-26 15:01:25Z mc $
*
* Main file for ldap-server configuration. Uses all other files.
*/
@@ -24,10 +24,179 @@
import "Progress";
import "Report";
import "Summary";
-
+import "RichText";
import "CommandLine";
include "ldap-server/wizards.ycp";
+define boolean serviceHandler (map options ) {
+
+ string command = CommandLine::UniqueOption( options,
+ ["enable", "disable" ] );
+ if( command == nil ) return false;
+
+ LdapServer::WriteServiceEnabled( command == "enable" );
+
+ return true;
+}
+
+define boolean getDatabaseListHandler (map options) {
+
+ map edb = LdapServer::ReadDatabase();
+
+ string s = "";
+ foreach( string suffix, any value, edb,
+ {
+ s = s + suffix + "<br>";
+ });
+
+ CommandLine::Print (RichText::Rich2Plain("<br>"+s));
+
+ return false;
+}
+
+define boolean addDatabaseHandler (map options ) {
+
+ boolean ret = false;
+ map db = $[];
+
+ map edb = LdapServer::ReadDatabase();
+ y2milestone("DBs: %1", edb);
+
+
+ if (options["basedn"]:nil != nil &&
+ edb[options["basedn"]:""]:nil == nil)
+ {
+ db["suffix"] = options["basedn"]:"";
+ }
+ else
+ {
+ CommandLine::Print (_("basedn exists or not available"));
+ return false;
+ }
+ if (options["rootdn"]:nil != nil)
+ {
+ db["rootdn"] = options["rootdn"]:"";
+ }
+ if (options["password"]:nil != nil)
+ {
+ db["passwd"] = options["password"]:"";
+ }
+ if (options["enctype"]:nil != nil)
+ {
+ db["cryptmethod"] = options["enctype"]:"";
+ }
+ if (options["dbdir"]:nil != nil)
+ {
+ db["directory"] = options["dbdir"]:"";
+ }
+
+ if(LdapServer::ReadServiceEnabled() == false)
+ {
+ // Database cannot be written when the service is not enabled
+ LdapServer::WriteServiceEnabled(true);
+ }
+
+ y2milestone("db-options : %1", db);
+
+ ret = LdapServer::AddDatabase(db);
+
+ if(!ret)
+ {
+ CommandLine::Print (_("Error while adding the database"));
+ return false;
+ }
+ return true;
+}
+
+define boolean getSchemaListHandler (map options ) {
+
+ string s = "";
+ integer i = 0;
+ foreach(string v, LdapServer::ReadSchemaIncludeList (),
+ {
+ i = i + 1;
+ s = s + tostring(i) + " "+ v +"<br>";
+ });
+
+ CommandLine::Print (RichText::Rich2Plain("<br>"+s));
+ return false; // do not call Write...
+}
+
+define boolean addSchemaHandler (map options ) {
+
+ boolean ret = false;
+ if (options["file"]:"" != "")
+ {
+ string file = options["file"]:"";
+ if(options["pos"]:"" != "")
+ {
+ integer pos = tointeger (options["pos"]:"");
+ if (pos == nil || pos < 0)
+ {
+ // error: wrong input (probably string or negative integer)
+ Report::Error (_("The value for pos must be a positive integer."));
+ return false;
+ }
+
+ list<string> l = LdapServer::ReadSchemaIncludeList ();
+ list<string> rl = [];
+ boolean added = false;
+ integer i = 0;
+ foreach(string s, l,
+ {
+ i = i + 1;
+ if(i == pos)
+ {
+ rl = add(rl, file);
+ added = true;
+ }
+ rl = add(rl, s);
+ });
+ if(!added)
+ {
+ rl = add(rl, file);
+ }
+ LdapServer::WriteSchemaIncludeList (rl);
+ ret = true;
+ }
+ }
+
+ return ret;
+}
+
+define boolean delSchemaHandler (map options ) {
+
+ boolean ret = false;
+ if(options["pos"]:"" != "")
+ {
+ integer pos = tointeger (options["pos"]:"");
+ if (pos == nil || pos < 0)
+ {
+ // error: wrong input (probably string or negative integer)
+ Report::Error (_("The value for pos must be a positive integer."));
+ return false;
+ }
+
+ list<string> l = LdapServer::ReadSchemaIncludeList ();
+ list<string> rl = [];
+ integer i = 0;
+ foreach(string s, l,
+ {
+ i = i + 1;
+ if(i != pos)
+ {
+ rl = add(rl, s);
+ }
+ });
+ LdapServer::WriteSchemaIncludeList (rl);
+ ret = true;
+ }
+
+ return ret;
+}
+
+
+
map cmdline_description = $[
"id" : "ldap-server",
/* Command line help text for the Xldap-server module */
@@ -36,13 +205,70 @@
"initialize" : LdapServer::Read,
"finish" : LdapServer::Write,
"actions" : $[
- // FIXME TODO: fill the functionality description here
+ "service" : $[
+ "handler" : serviceHandler,
+ "help" : _("Enable/Disable the service")
+ ],
+ "addDatabase" : $[
+ "handler" : addDatabaseHandler,
+ "help" : _("Add a new Database"),
+ ],
+ "getDatabaseList" : $[
+ "handler" : getDatabaseListHandler,
+ "help" : _("Show a List of currently available Databases"),
+ ],
+ "getSchemaList": $[
+ "handler" : getSchemaListHandler,
+ "help" : _("Show a List of currently configured schemas"),
+ ],
+ "addSchema": $[
+ "handler" : addSchemaHandler,
+ "help" : _("Add a schema to the list"),
+ ],
+ "delSchema": $[
+ "handler" : delSchemaHandler,
+ "help" : _("Delete a schema from the list"),
+ ],
],
"options" : $[
- // FIXME TODO: fill the option descriptions here
+ "enable" : $[ "help" : _("Enable the service") ],
+ "disable" : $[ "help" : _("Disable the service") ],
+ "basedn" : $[
+ "help" : _("Base DN for the database"),
+ "type" : "string"
+ ],
+ "rootdn" : $[
+ "help" : _("DN for the administrator login"),
+ "type" : "string"
+ ],
+ "password" : $[
+ "help" : _("Administrator password"),
+ "type" : "string"
+ ],
+ "enctype" : $[
+ "help" : "SSHA, SHA, SMD5, CRYPT, PLAIN",
+ "type" : "string"
+ ],
+ "dbdir" : $[
+ "help" : _("Directory for the database"),
+ "type" : "string"
+ ],
+ "file" : $[
+ "help" : _("File"),
+ "type" : "string"
+ ],
+ "pos" : $[
+ "help" : _("Position"),
+ "type" : "string"
+ ]
],
- "mapping" : $[
- // FIXME TODO: fill the mappings of actions and options here
+ "mappings" : $[
+ "service" :[ "enable", "disable" ],
+ "addDatabase" : [ "basedn", "rootdn", "password", "enctype", "dbdir" ],
+ "getDatabaseList" : [],
+ "getSchemaList" : [],
+ "addSchema": [ "file", "pos" ],
+ "delSchema": [ "pos" ]
]
];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.15.0/VERSION new/yast2-ldap-server-2.15.1/VERSION
--- old/yast2-ldap-server-2.15.0/VERSION 2007-01-17 16:09:24.000000000 +0100
+++ new/yast2-ldap-server-2.15.1/VERSION 2007-02-01 12:03:11.000000000 +0100
@@ -1 +1 @@
-2.15.0
+2.15.1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org