Hello community,
here is the log from the commit of package yast2-ldap-server for openSUSE:11.4
checked in at Fri Feb 18 14:22:17 CET 2011.
--------
--- old-versions/11.4/all/yast2-ldap-server/yast2-ldap-server.changes 2010-07-06 14:33:59.000000000 +0200
+++ /mounts/work_src_done/11.4/yast2-ldap-server/yast2-ldap-server.changes 2011-02-16 14:21:38.000000000 +0100
@@ -1,0 +2,20 @@
+Wed Feb 16 11:00:52 UTC 2011 - rhafer@suse.de
+
+- Version 2.20.0
+- Warn user, when creating a database with a non-standard base DN and
+ disable base-object creation in such case (bnc#669213)
+- Allow non-standard db-directory when creating the first database
+ (bnc#669213)
+
+-------------------------------------------------------------------
+Wed Aug 18 15:23:05 CEST 2010 - mzugec@suse.cz
+
+- fixed typos (bnc#631743)
+
+-------------------------------------------------------------------
+Thu Jul 22 10:05:25 UTC 2010 - rhafer@novell.com
+
+- Create LDAP Base objects only after ldap.conf has be written
+ (bnc#619549)
+
+-------------------------------------------------------------------
calling whatdependson for 11.4-i586
Old:
----
yast2-ldap-server-2.19.1.tar.bz2
New:
----
yast2-ldap-server-2.20.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ldap-server.spec ++++++
--- /var/tmp/diff_new_pack.cxpiKP/_old 2011-02-18 14:22:16.000000000 +0100
+++ /var/tmp/diff_new_pack.cxpiKP/_new 2011-02-18 14:22:16.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-ldap-server (Version 2.19.1)
+# spec file for package yast2-ldap-server
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,11 +19,11 @@
Name: yast2-ldap-server
-Version: 2.19.1
-Release: 1
+Version: 2.20.0
+Release: 1.<RELEASE2>
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ldap-server-2.19.1.tar.bz2
+Source0: yast2-ldap-server-2.20.0.tar.bz2
Prefix: /usr
@@ -39,7 +39,7 @@
Center and during installation.
%prep
-%setup -n yast2-ldap-server-2.19.1
+%setup -n yast2-ldap-server-2.20.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -89,4 +89,5 @@
/usr/share/YaST2/scrconf/*
%{prefix}/lib/YaST2/bin/ldap-server-ssl-check
%doc %{prefix}/share/doc/packages/yast2-ldap-server
+
%changelog
++++++ yast2-ldap-server-2.19.1.tar.bz2 -> yast2-ldap-server-2.20.0.tar.bz2 ++++++
++++ 3468 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-server-2.19.1/VERSION new/yast2-ldap-server-2.20.0/VERSION
--- old/yast2-ldap-server-2.19.1/VERSION 2010-07-06 13:30:02.000000000 +0200
+++ new/yast2-ldap-server-2.20.0/VERSION 2011-02-16 12:00:39.000000000 +0100
@@ -1 +1 @@
-2.19.1
+2.20.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-server-2.19.1/config.h.in new/yast2-ldap-server-2.20.0/config.h.in
--- old/yast2-ldap-server-2.19.1/config.h.in 2010-07-06 13:30:52.000000000 +0200
+++ new/yast2-ldap-server-2.20.0/config.h.in 2011-02-15 17:16:47.000000000 +0100
@@ -83,3 +83,6 @@
/* Version number of package */
#undef VERSION
+
+/* Define to `unsigned int' if does not define. */
+#undef size_t
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-server-2.19.1/src/LdapDatabase.ycp new/yast2-ldap-server-2.20.0/src/LdapDatabase.ycp
--- old/yast2-ldap-server-2.19.1/src/LdapDatabase.ycp 2010-07-06 13:26:09.000000000 +0200
+++ new/yast2-ldap-server-2.20.0/src/LdapDatabase.ycp 2011-02-16 11:43:57.000000000 +0100
@@ -19,6 +19,7 @@
string ldapconf_basedn = "";
boolean createDbDir = false;
+ boolean createBase = true;
term editPolicy =
@@ -75,6 +76,17 @@
)
);
+ global define boolean GetCreateBase()
+ {
+ return createBase;
+ }
+
+ global define boolean ResetCreateBase()
+ {
+ createBase = true;
+ return true;
+ }
+
global define symbol AddDbBasic( boolean createDefaults )
{
boolean user_changed_dbdir = false;
@@ -297,6 +309,29 @@
Popup::Error( err["msg"]:"" + "\n" + err["details"]:"" );
continue;
}
+ integer rc = LdapServer::CheckSuffixAutoCreate( db["suffix"]:"" );
+ if ( rc < 0 )
+ {
+ map err = LdapServer::ReadError();
+ Popup::Error( err["msg"]:"" + "\n" + err["details"]:"" );
+ continue;
+ }
+ else if ( rc > 0 )
+ {
+ map err = LdapServer::ReadError();
+ boolean res = Popup::AnyQuestion(Label::WarningMsg(),
+ _("The Base Object: \"") + db["suffix"]:"" +
+ _("\" can not be auto created by YaST.\n") +
+ err["msg"]:"",
+ Label::OKButton(), Label::CancelButton(), `focus);
+ if ( res == false ) {
+ continue;
+ } else {
+ y2debug( "Will not create base objects" );
+ createBase = false;
+ }
+
+ }
if( db["directory"]:"" == "" )
{
Popup::Error( _("A directory must be specified.") );
@@ -445,7 +480,9 @@
UI::ChangeWidget( `cb_ppolicy_uselockout, `Enabled , true );
UI::ChangeWidget( `te_ppolicy_defaultpolicy, `Enabled , true );
UI::ChangeWidget( `cb_pp_append_basedn, `Enabled, true );
- UI::ChangeWidget( `pb_define_policy, `Enabled , true );
+ if (LdapDatabase::GetCreateBase() ) {
+ UI::ChangeWidget( `pb_define_policy, `Enabled , true );
+ }
} else {
UI::ChangeWidget( `cb_ppolicy_hashcleartext, `Enabled , false );
UI::ChangeWidget( `cb_ppolicy_uselockout, `Enabled , false );
@@ -855,10 +892,12 @@
`PushButton( `id (`pb_down ), _("Down") )
)
),
- `HBox(
- `PushButton( `id (`pb_add ), _("Add") ),
- `PushButton( `id (`pb_del ), _("Delete") ),
- `PushButton( `id (`pb_edit ), _("Edit") )
+ `Left(
+ `HBox(
+ `PushButton( `id (`pb_add ), Label::AddButton() ),
+ `PushButton( `id (`pb_edit ), Label::EditButton() ),
+ `PushButton( `id (`pb_del ), Label::DeleteButton() )
+ )
)
)
),
@@ -1147,10 +1186,12 @@
`PushButton( `id (`pb_down ), _("Down") )
)
),
- `HBox(
- `PushButton( `id (`pb_add ), _("Add") ),
- `PushButton( `id (`pb_del ), _("Delete") ),
- `PushButton( `id (`pb_edit ), _("Edit") )
+ `Left(
+ `HBox(
+ `PushButton( `id (`pb_add ), Label::AddButton() ),
+ `PushButton( `id (`pb_edit ),Label::EditButton() ),
+ `PushButton( `id (`pb_del ), Label::DeleteButton() )
+ )
)
)
);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-server-2.19.1/src/LdapServer.pm new/yast2-ldap-server-2.20.0/src/LdapServer.pm
--- old/yast2-ldap-server-2.19.1/src/LdapServer.pm 2010-07-06 13:28:22.000000000 +0200
+++ new/yast2-ldap-server-2.20.0/src/LdapServer.pm 2011-02-16 12:00:20.000000000 +0100
@@ -4,7 +4,7 @@
# Summary: LdapServer settings, input and output functions
# Authors: Ralf Haferkamp , Andreas Bauer
#
-# $Id: LdapServer.pm 62184 2010-07-06 11:28:21Z rhafer $
+# $Id: LdapServer.pm 63430 2011-02-16 11:00:19Z rhafer $
#
# Representation of the configuration of ldap-server.
# Input and output routines.
@@ -799,11 +799,6 @@
return 0;
}
Progress->NextStage();
- $self->CreateBaseObjects();
- if ( $setupSyncreplMaster )
- {
- $self->CreateSyncReplAccount();
- }
if ( $write_ldapconf )
{
y2milestone("Updating /etc/openldap/ldap.conf");
@@ -819,6 +814,11 @@
}
SCR->Write(".etc.ldap_conf", "force" );
}
+ $self->CreateBaseObjects();
+ if ( $setupSyncreplMaster )
+ {
+ $self->CreateSyncReplAccount();
+ }
if (! $usesBackConfig )
{
SCR->Execute('.target.bash', 'cp -f /etc/openldap/slapd.conf /etc/openldap/slapd.conf.YaSTsave' );
@@ -1696,7 +1696,7 @@
'suffix' => $dbDefaults{'suffix'},
'rootdn' => $dbDefaults{'rootdn'},
'rootpw' => $pwHash,
- 'directory' => '/var/lib/ldap',
+ 'directory' => $dbDefaults{'directory'},
'entrycache' => YaST::YCP::Integer($dbDefaults{'entrycache'}),
'idlcache' => YaST::YCP::Integer($dbDefaults{'idlcache'}),
'checkpoint' => [ YaST::YCP::Integer($dbDefaults{'checkpoint'}->[0]),
@@ -1755,6 +1755,20 @@
return $rc;
}
+ if ( ! defined SCR->Read(".target.dir", $database->{directory}) ) {
+ my $ret = SCR->Execute(".target.bash", "mkdir -m 0700 -p ".$database->{directory});
+ if( ( $ret ) && ( ! defined SCR->Read(".target.dir", $database->{directory}) ) ) {
+ $self->SetError(_("Could not create database directory."), "");
+ return $ret;
+ }
+ my $owner = SCR->Read('.sysconfig.openldap.OPENLDAP_USER');
+ my $group = SCR->Read('.sysconfig.openldap.OPENLDAP_GROUP');
+ $ret = SCR->Execute(".target.bash", "chown ".$owner.":".$group." ".$database->{directory});
+ if ( $ret ) {
+ $self->SetError(_("Could adjust ownership of database directory."), "");
+ return $ret;
+ }
+ }
SCR->Execute('.ldapserver.initDatabases', [ $frontenddb, $cfgdatabase, $database ] );
if ( $dbDefaults{'defaultIndex'} == 1 ||
( ref($dbDefaults{'defaultIndex'}) eq "YaST::YCP::Boolean" &&
@@ -2406,6 +2420,42 @@
return 1;
}
+##
+ # Check whether the object named be the supplied LDAP DN can be auto-created.
+ # @returns 0 in case of success,
+ # <0 if the supplied DN is invalid
+ # >0 if autocreation is not possible
+ #
+BEGIN { $TYPEINFO {CheckSuffixAutoCreate} = ["function", "integer", "string" ]; }
+sub CheckSuffixAutoCreate
+{
+ my ($self, $suffix) = @_;
+ my $object = X500::DN->ParseRFC2253($suffix);
+ my @attr = $object->getRDN($object->getRDNs()-1)->getAttributeTypes();
+ my $val = $object->getRDN($object->getRDNs()-1)->getAttributeValue($attr[0]);
+ if(!defined $attr[0] || !defined $val)
+ {
+ y2error("Error while extracting RDN values");
+ $self->SetError( _("Invalid LDAP DN: \""). $suffix. _("\", can't extract RDN values"));
+ return -1;
+ }
+ if( (lc($attr[0]) eq "ou") || ( lc($attr[0]) eq "o") || ( lc($attr[0]) eq "l") ||
+ ( lc($attr[0]) eq "st") || ( lc($attr[0]) eq "dc") ) {
+ return 0;
+ } elsif( lc($attr[0]) eq "c") {
+ if($val !~ /^\w{2}$/) {
+ $self->SetError( _("The value of the \"c\" Attribute must contain a valid ISO-3166 country 2-letter code."), "");
+ y2error("The countryName must be an ISO-3166 country 2-letter code.");
+ return -1;
+ }
+ return 0;
+ } else {
+ y2error("First part of suffix must be c=, st=, l=, o=, ou= or dc=.");
+ $self->SetError( _("First part of suffix must be c=, st=, l=, o=, ou= or dc=."), "");
+ return 1;
+ }
+}
+
BEGIN { $TYPEINFO {CheckDatabase} = ["function", "boolean", [ "map" , "string", "any"] ]; }
sub CheckDatabase
{
@@ -2448,10 +2498,10 @@
}
-BEGIN { $TYPEINFO {AddDatabase} = ["function", "boolean", "integer", [ "map" , "string", "any"], "boolean" ]; }
+BEGIN { $TYPEINFO {AddDatabase} = ["function", "boolean", "integer", [ "map" , "string", "any"], "boolean", "boolean" ]; }
sub AddDatabase
{
- my ($self, $index, $db, $createDir) = @_;
+ my ($self, $index, $db, $createDir, $createBase) = @_;
if ( ! $self->CheckDatabase($db) )
{
return 0;
@@ -2563,10 +2613,13 @@
$self->SetError( $err->{'summary'}, $err->{'description'} );
return 0;
}
- push @added_databases, $db->{'suffix'};
- $self->WriteAuthInfo( $db->{'suffix'},
+
+ if ( $createBase ) {
+ push @added_databases, $db->{'suffix'};
+ $self->WriteAuthInfo( $db->{'suffix'},
{ bind_dn => $db->{'rootdn'},
bind_pw => $db->{'rootpw_clear'} } );
+ }
return 1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-server-2.19.1/src/dialogs.ycp new/yast2-ldap-server-2.20.0/src/dialogs.ycp
--- old/yast2-ldap-server-2.19.1/src/dialogs.ycp 2010-07-06 13:28:22.000000000 +0200
+++ new/yast2-ldap-server-2.20.0/src/dialogs.ycp 2011-02-15 16:35:25.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Andreas Bauer
*
- * $Id: dialogs.ycp 62184 2010-07-06 11:28:21Z rhafer $
+ * $Id: dialogs.ycp 62404 2010-08-18 13:23:56Z mzugec $
*/
{
@@ -123,7 +123,7 @@
{
if ( name != "daemon" ) {
symbol ret = Popup::AnyQuestion3( _("The LDAP Server is not running."),
- _("Do you want to start it now to re-read its configuration data or do you want to creat a new configuration from scratch?"),
+ _("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(),
@@ -282,33 +282,37 @@
term serverTypeWidget =
`HSquash(
`VBox(
- `Heading( _("Please select Server type") ),
- `VSpacing(),
- `RadioButtonGroup(
- `id( `rbg_servertype ),
+ `Heading( _("Server type") ),
+ `Frame("",
`VBox(
- `Left(
- `RadioButton(
- `id( `rb_standalone ),
- _("This will be a standalone server"),
- true
- )
- ),
`VSpacing(),
- `Left(
- `RadioButton(
- `id( `rb_master ),
- _("This server can act as a master server in a replication setup"),
- false
- )
- ),
- `VSpacing(),
- `Left(
- `RadioButton(
- `id( `rb_slave ),
- _("This will be a replica (slave) server.\n") +
- _("All data including configuration will replicated from a remote server."),
- false
+ `RadioButtonGroup(
+ `id( `rbg_servertype ),
+ `VBox(
+ `Left(
+ `RadioButton(
+ `id( `rb_standalone ),
+ _("Stand-alone server"),
+ true
+ )
+ ),
+ `VSpacing(),
+ `Left(
+ `RadioButton(
+ `id( `rb_master ),
+ _("Master server in a replication setup"),
+ false
+ )
+ ),
+ `VSpacing(),
+ `Left(
+ `RadioButton(
+ `id( `rb_slave ),
+ _("Replica (slave) server.\n") +
+ _("All data, including configuration, is replicated from a remote server."),
+ false
+ )
+ )
)
)
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-server-2.19.1/src/helps.ycp new/yast2-ldap-server-2.20.0/src/helps.ycp
--- old/yast2-ldap-server-2.19.1/src/helps.ycp 2010-07-06 12:09:21.000000000 +0200
+++ new/yast2-ldap-server-2.20.0/src/helps.ycp 2011-02-15 16:35:25.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Help texts of all the dialogs
* Authors: Andreas Bauer
*
- * $Id: helps.ycp 62182 2010-07-06 10:09:20Z rhafer $
+ * $Id: helps.ycp 62404 2010-08-18 13:23:56Z mzugec $
*/
{
@@ -218,11 +218,11 @@
/* Configuration Wizard Step 2 */
"server_type" :
_("<p>Select the type of LDAP Server you want to setup. The following scenarios are available:</p>") +
- _("<p><b>Standalone Server</b>: Setup a single standalone OpenLDAP Server with no preparations for
+ _("<p><b>Stand-alone server</b>: Setup a single standalone OpenLDAP Server with no preparations for
replication</p>") +
- _("<p><b>Replication Master (Provider)</b>: Create an OpenLDAP setup that is prepared to act as a master server
+ _("<p><b>Master server in a replication setup</b>: Create an OpenLDAP setup that is prepared to act as a master server
(provider) in a replication setup.</p>") +
- _("<p><b>Replication Slave (Consumer)</b>: Setup an OpenLDAP slave server that replicates all its data,
+ _("<p><b>Replica slave server</b>: Setup an OpenLDAP slave server that replicates all its data,
including configuration, from a master server.</p>"),
/* Configuration Wizard Step 3 */
@@ -256,7 +256,7 @@
/* Tree Item Dialog "loglevel" */
"g_loglevel" :
- _("<p>Selected the subsystems that should log debugging statements and statistics to syslog.</p>"),
+ _("<p>Please select the subsystems that should log debugging statements and statistics to syslog.</p>"),
/* Tree Item Dialog "allow" 1/1 */
"g_allow" :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-server-2.19.1/src/ldap-server.ycp new/yast2-ldap-server-2.20.0/src/ldap-server.ycp
--- old/yast2-ldap-server-2.19.1/src/ldap-server.ycp 2010-07-06 12:01:22.000000000 +0200
+++ new/yast2-ldap-server-2.20.0/src/ldap-server.ycp 2011-02-16 12:00:20.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Main file
* Authors: Andreas Bauer
*
- * $Id: ldap-server.ycp 52243 2008-10-15 12:47:30Z rhafer $
+ * $Id: ldap-server.ycp 63430 2011-02-16 11:00:19Z rhafer $
*
* Main file for ldap-server configuration. Uses all other files.
*/
@@ -96,7 +96,7 @@
// y2milestone("db-options : %1", db);
//
- ret = LdapServer::AddDatabase(0,db, true);
+ ret = LdapServer::AddDatabase(0,db, true, true);
if(!ret)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-server-2.19.1/src/ldap-server_proposal.ycp new/yast2-ldap-server-2.20.0/src/ldap-server_proposal.ycp
--- old/yast2-ldap-server-2.19.1/src/ldap-server_proposal.ycp 2010-07-06 13:28:22.000000000 +0200
+++ new/yast2-ldap-server-2.20.0/src/ldap-server_proposal.ycp 2010-07-06 12:14:32.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Proposal function dispatcher.
* Authors: Andreas Bauer
*
- * $Id: ldap-server_proposal.ycp 62184 2010-07-06 11:28:21Z rhafer $
+ * $Id: ldap-server_proposal.ycp 62183 2010-07-06 10:14:31Z rhafer $
*
* Proposal function dispatcher for ldap-server configuration.
* See source/installation/proposal/proposal-API.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-server-2.19.1/src/tree_structure.ycp new/yast2-ldap-server-2.20.0/src/tree_structure.ycp
--- old/yast2-ldap-server-2.19.1/src/tree_structure.ycp 2010-07-06 12:09:21.000000000 +0200
+++ new/yast2-ldap-server-2.20.0/src/tree_structure.ycp 2011-02-16 12:00:20.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Widget Tree structure
* Authors: Andreas Bauer
*
- * $Id: tree_structure.ycp 62182 2010-07-06 10:09:20Z rhafer $
+ * $Id: tree_structure.ycp 63430 2011-02-16 11:00:19Z rhafer $
*/
{
textdomain "ldap-server";
@@ -550,12 +550,13 @@
{
rebuild_widget_tree = true;
map newDb = LdapDatabase::GetDatabase();
- if ( ! LdapServer::AddDatabase(0, newDb, LdapDatabase::GetCreateDir() ) )
+ if ( ! LdapServer::AddDatabase(0, newDb, LdapDatabase::GetCreateDir(), LdapDatabase::GetCreateBase() ) )
{
map err = LdapServer::ReadError();
callback_error = err["msg"]:"" + "\n" + err["details"]:"";
return false;
}
+ LdapDatabase::ResetCreateBase();
map syncrepl = LdapDatabase::GetSyncRepl();
if ( size(syncrepl) > 0 )
{
@@ -1192,9 +1193,11 @@
`MinSize( 60, 7,
`Table( `id( `tab_db ),`opt(`keepSorting), `header(_("Suffix DN"), _("Database type") ) )
),
- `HBox(
- `PushButton( `id( `pb_add ), _("A&dd Database...") ),
- `PushButton( `id( `pb_del ), _("Delete Database") )
+ `Left(
+ `HBox(
+ `PushButton( `id( `pb_add ), Label::AddButton() ),
+ `PushButton( `id( `pb_del ), Label::DeleteButton() )
+ )
)
),
"cb_read" : ``( cb_read_databases() ),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-server-2.19.1/src/widgets.ycp new/yast2-ldap-server-2.20.0/src/widgets.ycp
--- old/yast2-ldap-server-2.19.1/src/widgets.ycp 2010-07-06 12:03:50.000000000 +0200
+++ new/yast2-ldap-server-2.20.0/src/widgets.ycp 2011-02-15 16:35:25.000000000 +0100
@@ -298,14 +298,16 @@
`Heading( _("Indexing Configuration") ),
`Table(
`id( `tab_idx ),
- `header( _("Attrbute"), _("Presence"), _("Equality"), _("Substring")),
+ `header( _("Attribute"), _("Presence"), _("Equality"), _("Substring")),
[ ]
),
- `HSquash(
- `HBox(
- `PushButton( `id( `pb_idx_add ), _("Add") ),
- `PushButton( `id( `pb_idx_edit ), _("Edit") ),
- `PushButton( `id( `pb_idx_del ), _("Delete") )
+ `Left(
+ `HSquash(
+ `HBox(
+ `PushButton( `id( `pb_idx_add ), Label::AddButton() ),
+ `PushButton( `id( `pb_idx_edit ), Label::EditButton() ),
+ `PushButton( `id( `pb_idx_del ), Label::DeleteButton() )
+ )
)
)
);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org