Hello community,
here is the log from the commit of package yast2-ldap-server
checked in at Mon Oct 6 16:00:34 CEST 2008.
--------
--- yast2-ldap-server/yast2-ldap-server.changes 2008-09-29 13:56:33.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-ldap-server/yast2-ldap-server.changes 2008-10-01 16:11:28.000000000 +0200
@@ -1,0 +2,12 @@
+Wed Oct 1 16:01:24 CEST 2008 - rhafer@suse.de
+
+- Verstion 2.17.9
+ * revived commandline support (bnc#429486)
+ * additional checks when adding .schema files (bnc#431168)
+ * workaround for Firewall-Widget in installation proposal
+ (bnc#428364)
+ * fixed regression in initial server configuration (bnc#431250)
+ * use ldap-server icon in all wizards (bnc#431210)
+ * adjust size of Warning Popup (bnc#431228)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-ldap-server-2.17.8.tar.bz2
New:
----
yast2-ldap-server-2.17.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ldap-server.spec ++++++
--- /var/tmp/diff_new_pack.UQ7855/_old 2008-10-06 15:58:56.000000000 +0200
+++ /var/tmp/diff_new_pack.UQ7855/_new 2008-10-06 15:58:56.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ldap-server (Version 2.17.8)
+# spec file for package yast2-ldap-server (Version 2.17.9)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-ldap-server
-Version: 2.17.8
+Version: 2.17.9
Release: 1
License: GPL v2 or later; X11/MIT
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ldap-server-2.17.8.tar.bz2
+Source0: yast2-ldap-server-2.17.9.tar.bz2
Prefix: /usr
BuildRequires: boost-devel gcc-c++ libldapcpp-devel perl-Digest-SHA1 perl-X500-DN perl-gettext pkg-config update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-ldap-client
Requires: acl net-tools perl perl-Digest-SHA1 perl-gettext perl-X500-DN yast2 yast2-ca-management yast2-ldap-client yast2-perl-bindings yast2-users
@@ -41,7 +41,7 @@
Andreas Bauer
%prep
-%setup -n yast2-ldap-server-2.17.8
+%setup -n yast2-ldap-server-2.17.9
%build
%{prefix}/bin/y2tool y2autoconf
@@ -86,6 +86,15 @@
/usr/share/YaST2/scrconf/*
%doc %{prefix}/share/doc/packages/yast2-ldap-server
%changelog
+* Wed Oct 01 2008 rhafer@suse.de
+- Verstion 2.17.9
+ * revived commandline support (bnc#429486)
+ * additional checks when adding .schema files (bnc#431168)
+ * workaround for Firewall-Widget in installation proposal
+ (bnc#428364)
+ * fixed regression in initial server configuration (bnc#431250)
+ * use ldap-server icon in all wizards (bnc#431210)
+ * adjust size of Warning Popup (bnc#431228)
* Mon Sep 29 2008 rhafer@suse.de
- Version 2.17.8
* revived AutoYaST support (bnc#429528)
++++++ yast2-ldap-server-2.17.8.tar.bz2 -> yast2-ldap-server-2.17.9.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.8/configure new/yast2-ldap-server-2.17.9/configure
--- old/yast2-ldap-server-2.17.8/configure 2008-09-29 13:09:06.000000000 +0200
+++ new/yast2-ldap-server-2.17.9/configure 2008-10-01 15:20:18.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-ldap-server 2.17.8.
+# Generated by GNU Autoconf 2.63 for yast2-ldap-server 2.17.9.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -750,8 +750,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-ldap-server'
PACKAGE_TARNAME='yast2-ldap-server'
-PACKAGE_VERSION='2.17.8'
-PACKAGE_STRING='yast2-ldap-server 2.17.8'
+PACKAGE_VERSION='2.17.9'
+PACKAGE_STRING='yast2-ldap-server 2.17.9'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1529,7 +1529,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-ldap-server 2.17.8 to adapt to many kinds of systems.
+\`configure' configures yast2-ldap-server 2.17.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1601,7 +1601,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-ldap-server 2.17.8:";;
+ short | recursive ) echo "Configuration of yast2-ldap-server 2.17.9:";;
esac
cat <<\_ACEOF
@@ -1714,7 +1714,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-ldap-server configure 2.17.8
+yast2-ldap-server configure 2.17.9
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1728,7 +1728,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-ldap-server $as_me 2.17.8, which was
+It was created by yast2-ldap-server $as_me 2.17.9, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2575,7 +2575,7 @@
# Define the identity of the package.
PACKAGE='yast2-ldap-server'
- VERSION='2.17.8'
+ VERSION='2.17.9'
cat >>confdefs.h <<_ACEOF
@@ -2799,7 +2799,7 @@
-VERSION="2.17.8"
+VERSION="2.17.9"
RPMNAME="yast2-ldap-server"
MAINTAINER="Ralf Haferkamp "
@@ -22183,7 +22183,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-ldap-server $as_me 2.17.8, which was
+This file was extended by yast2-ldap-server $as_me 2.17.9, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22246,7 +22246,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-ldap-server config.status 2.17.8
+yast2-ldap-server config.status 2.17.9
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.8/configure.in new/yast2-ldap-server-2.17.9/configure.in
--- old/yast2-ldap-server-2.17.8/configure.in 2008-09-29 13:08:47.000000000 +0200
+++ new/yast2-ldap-server-2.17.9/configure.in 2008-10-01 15:19:59.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ldap-server, 2.17.8, http://bugs.opensuse.org/, yast2-ldap-server)
+AC_INIT(yast2-ldap-server, 2.17.9, http://bugs.opensuse.org/, yast2-ldap-server)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.8"
+VERSION="2.17.9"
RPMNAME="yast2-ldap-server"
MAINTAINER="Ralf Haferkamp "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.8/src/agent/SlapdConfigAgent.cc new/yast2-ldap-server-2.17.9/src/agent/SlapdConfigAgent.cc
--- old/yast2-ldap-server-2.17.8/src/agent/SlapdConfigAgent.cc 2008-09-29 13:08:17.000000000 +0200
+++ new/yast2-ldap-server-2.17.9/src/agent/SlapdConfigAgent.cc 2008-10-01 15:14:13.000000000 +0200
@@ -111,6 +111,7 @@
return ConfigToLdif();
}
} catch ( std::runtime_error e ) {
+ y2error("Error during Read: %s", e.what() );
lastError->add(YCPString("summary"), YCPString(std::string( e.what() ) ) );
lastError->add(YCPString("description"), YCPString("") );
return YCPBoolean(false);
@@ -1387,6 +1388,14 @@
std::string filename = arg->asString()->value_cstr();
y2milestone("adding Ldif File: %s", filename.c_str());
std::ifstream ldifFile(filename.c_str());
+ if ( ! ldifFile )
+ {
+ lastError->add( YCPString("summary"),
+ YCPString("Error while opening Schema file") );
+ lastError->add( YCPString("description"),
+ YCPString("") );
+ return YCPBoolean(false);
+ }
try {
LdifReader ldif(ldifFile);
if ( ldif.readNextRecord() )
@@ -1434,6 +1443,14 @@
y2milestone("RDN will be: %s", dn.c_str());
std::ifstream input(filename.c_str());
+ if ( ! input )
+ {
+ lastError->add( YCPString("summary"),
+ YCPString("Error while opening Schema file") );
+ lastError->add( YCPString("description"),
+ YCPString("") );
+ return YCPBoolean(false);
+ }
std::string schemaLine;
LDAPEntry entry(dn), oldEntry;
entry.addAttribute( LDAPAttribute( "objectClass", "olcSchemaConfig" ) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.8/src/complex.ycp new/yast2-ldap-server-2.17.9/src/complex.ycp
--- old/yast2-ldap-server-2.17.8/src/complex.ycp 2008-09-11 17:38:12.000000000 +0200
+++ new/yast2-ldap-server-2.17.9/src/complex.ycp 2008-10-01 16:01:20.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Andreas Bauer
*
- * $Id: complex.ycp 50980 2008-09-10 15:11:53Z rhafer $
+ * $Id: complex.ycp 51752 2008-10-01 14:01:20Z rhafer $
*/
{
@@ -170,7 +170,11 @@
}
else if ( !serviceEnabled || !serviceRunning )
{
- symbol ret = Popup::AnyQuestion3( _("You have an existing configuration but the LDAP Server is not currently running."), _("Do you want to start it now to re-read its configuration data or do you want to create a new configuration from scratch?"), _("Restart"), _("New Configuration"), Label::AbortButton(), `focus_yes );
+ symbol ret = Popup::AnyQuestion3( _("Existing configuration detected."),
+ _("You have an existing configuration, but the LDAP server is currently not running.
+Do you want to start the server now and re-read its configuration data or do you
+want to create a new configuration from scratch?"),
+ _("Restart"), _("New Configuration"), Label::AbortButton(), `focus_yes );
if ( ret == `yes )
{
LdapServer::WriteServiceEnabled( true );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.8/src/dialogs.ycp new/yast2-ldap-server-2.17.9/src/dialogs.ycp
--- old/yast2-ldap-server-2.17.8/src/dialogs.ycp 2008-09-12 14:57:53.000000000 +0200
+++ new/yast2-ldap-server-2.17.9/src/dialogs.ycp 2008-10-01 15:46:50.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Andreas Bauer
*
- * $Id: dialogs.ycp 51109 2008-09-12 12:57:44Z rhafer $
+ * $Id: dialogs.ycp 51750 2008-10-01 13:46:49Z rhafer $
*/
{
@@ -194,7 +194,7 @@
{
map defaults = LdapServer::CreateInitialDefaults();
map firewall_settings = $[
- "services": [ "ldap" , "ldaps" ],
+ "services": [ "service:openldap" ],
"display_details": true,
];
map firewall_widget =
@@ -322,6 +322,7 @@
//close service dialog
// UI::CloseDialog();
Wizard::CreateTreeDialog();
+ Wizard::SetDesktopIcon("ldap-server");
//item selected at start
current_tree_item = "daemon";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.8/src/LdapServer.pm new/yast2-ldap-server-2.17.9/src/LdapServer.pm
--- old/yast2-ldap-server-2.17.8/src/LdapServer.pm 2008-09-29 13:08:17.000000000 +0200
+++ new/yast2-ldap-server-2.17.9/src/LdapServer.pm 2008-10-01 15:14:13.000000000 +0200
@@ -4,7 +4,7 @@
# Summary: LdapServer settings, input and output functions
# Authors: Ralf Haferkamp , Andreas Bauer
#
-# $Id: LdapServer.pm 51556 2008-09-25 19:31:17Z rhafer $
+# $Id: LdapServer.pm 51745 2008-10-01 13:14:00Z rhafer $
#
# Representation of the configuration of ldap-server.
# Input and output routines.
@@ -34,6 +34,7 @@
my %error = ( msg => undef, details => undef );
my $usingDefaults = 1;
+my $readConfig = 0;
my $configured = 0;
my $usesBackConfig = 0;
my $slapdConfChanged = 0;
@@ -231,6 +232,7 @@
SCR->Execute('.ldapserver.init' );
my $rc = SCR->Read('.ldapserver.databases');
$usingDefaults = 0;
+ $readConfig = 1;
}
else
{
@@ -656,6 +658,11 @@
Progress->Finish();
return 1;
}
+ if ( ! $wasEnabled && $serviceEnabled )
+ {
+ Service->Enable("ldap");
+ Service->Start("ldap");
+ }
my $progressItems = [ _("Writing Sysconfig files"),
_("Applying changes to Configuration Database"),
_("Applying changes to /etc/openldap/ldap.conf"),
@@ -931,7 +938,7 @@
# Configuration summary text for autoyast
my $self = shift;
my $string;
- if ( keys(%dbDefaults) && $usingDefaults )
+ if ( keys(%dbDefaults) && ! $readConfig )
{
$string .= '<h2>'._("Startup Configuration").'</h2>'
.'<p>'._("Start LDAP Server: ").'<code>'.($dbDefaults{'serviceEnabled'}->value?_("Yes"):_("No")).'</code></p>'
@@ -1416,9 +1423,17 @@
{ bind_dn => $dbDefaults{'rootdn'},
bind_pw => $dbDefaults{'rootpw_clear'} } );
$usingDefaults = 0;
+ $readConfig = 1;
return 1;
}
+##
+ # Read the list of configured Databases.
+ #
+ # @return A list of hashes. Each hash represents a database and has the keys
+ # 'type' (e.g. "hdb" or "bdb"), 'suffix' (the base DN of the database) and
+ # 'index' (the index number used by back-config to order databases correctly)
+ #
BEGIN { $TYPEINFO {ReadDatabaseList} = ["function", [ "list", [ "map" , "string", "string"] ] ]; }
sub ReadDatabaseList
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.8/src/ldap-server_proposal.ycp new/yast2-ldap-server-2.17.9/src/ldap-server_proposal.ycp
--- old/yast2-ldap-server-2.17.8/src/ldap-server_proposal.ycp 2008-09-29 13:08:17.000000000 +0200
+++ new/yast2-ldap-server-2.17.9/src/ldap-server_proposal.ycp 2008-10-01 15:14:13.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Proposal function dispatcher.
* Authors: Andreas Bauer
*
- * $Id: ldap-server_proposal.ycp 51630 2008-09-29 11:07:56Z rhafer $
+ * $Id: ldap-server_proposal.ycp 51738 2008-10-01 12:06:34Z rhafer $
*
* Proposal function dispatcher for ldap-server configuration.
* See source/installation/proposal/proposal-API.txt
@@ -59,6 +59,12 @@
{
y2milestone ("Openldap2 is not installed. --> service disabled");
LdapServer::WriteServiceEnabled (false);
+ // temporarly create the services file for the Firewallsettings
+ if (SCR::Read(.target.size, "/etc/sysconfig/SuSEfirewall2.d/services/openldap") <= 0)
+ {
+ SCR::Write(.target.string, "/etc/sysconfig/SuSEfirewall2.d/services/openldap",
+ "TCP=\"ldap ldaps\"\nUDP=\"ldap\"\n" );
+ }
}
else
{
@@ -101,7 +107,7 @@
y2milestone("Zones used by firewall: %1", used_zones);
foreach (string zone, used_zones, {
- if (SuSEFirewall::IsServiceSupportedInZone ("ldap", zone))
+ if (SuSEFirewall::IsServiceSupportedInZone ("service:openldap", zone))
is_ldap_enabled = true;
});
}
@@ -179,6 +185,11 @@
else if(func == "Write") {
if( LdapServer::Configured() ) return ret;
+ if (!Package::Installed ("openldap2"))
+ {
+ //remove temp file
+ SCR::Execute(.target.remove, "/etc/sysconfig/SuSEfirewall2.d/services/openldap");
+ }
if( LdapServer::ReadServiceEnabled() )
{
/* ensure openldap2 package is installed */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.17.8/src/ldap-server.ycp new/yast2-ldap-server-2.17.9/src/ldap-server.ycp
--- old/yast2-ldap-server-2.17.8/src/ldap-server.ycp 2008-09-18 15:50:25.000000000 +0200
+++ new/yast2-ldap-server-2.17.9/src/ldap-server.ycp 2008-10-01 15:14:13.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Main file
* Authors: Andreas Bauer
*
- * $Id: ldap-server.ycp 51284 2008-09-18 13:50:25Z rhafer $
+ * $Id: ldap-server.ycp 51737 2008-10-01 12:06:31Z rhafer $
*
* Main file for ldap-server configuration. Uses all other files.
*/
@@ -34,22 +34,23 @@
["enable", "disable" ] );
if( command == nil ) return false;
-// LdapServer::WriteServiceEnabled( command == "enable" );
+ 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));
+ list