Author: rhafer Date: Fri Apr 16 11:25:35 2010 New Revision: 61724 URL: http://svn.opensuse.org/viewcvs/yast?rev=61724&view=rev Log: Merged latest sle11-sp1 fixes Modified: trunk/ldap-server/ (props changed) trunk/ldap-server/src/LdapDatabase.ycp trunk/ldap-server/src/LdapServer.pm Modified: trunk/ldap-server/src/LdapDatabase.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapDatabase.ycp?rev=61724&r1=61723&r2=61724&view=diff ============================================================================== --- trunk/ldap-server/src/LdapDatabase.ycp (original) +++ trunk/ldap-server/src/LdapDatabase.ycp Fri Apr 16 11:25:35 2010 @@ -1403,7 +1403,7 @@ `InputField( `id( `te_sync_target ), `opt(`hstretch), _("Provider Name"), "" ), `HSpacing(), `HSquash( - `IntField( `id(`if_sync_port), "Port", 0, 65536, 389) + `IntField( `id(`if_sync_port), _("Port"), 0, 65536, 389) ), `HSpacing(), `VBox( @@ -1473,7 +1473,7 @@ `InputField( `id( `te_updateref_target ), `opt(`hstretch), _("Target Host"), "" ), `HSpacing(), `HSquash( - `IntField( `id(`if_updateref_port), "Port", 0, 65536, 389) + `IntField( `id(`if_updateref_port), _("Port"), 0, 65536, 389) ) ) ) Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?rev=61724&r1=61723&r2=61724&view=diff ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Apr 16 11:25:35 2010 @@ -31,6 +31,7 @@ YaST::YCP::Import ("SuSEFirewall"); YaST::YCP::Import ("Service"); YaST::YCP::Import ("SCR"); +YaST::YCP::Import ("Hostname"); my %error = ( msg => undef, details => undef ); my $ssl_check_command = "/usr/lib/YaST2/bin/ldap-server-ssl-check"; @@ -682,7 +683,7 @@ _("Creating Configuration"), _("Starting OpenLDAP Server"), _("Creating Base Objects") ]; - Progress->New("Writing OpenLDAP Server Configuration", "", 5, $progressItems, $progressItems, ""); + Progress->New(_("Writing OpenLDAP Server Configuration"), "", 5, $progressItems, $progressItems, ""); Progress->NextStage(); @@ -847,7 +848,7 @@ my $progressItems = [ _("Stopping LDAP Server"), _("Disabling LDAP Server") ]; - Progress->New("De-activating OpenLDAP Server", "", 2, $progressItems, $progressItems, ""); + Progress->New(_("De-activating OpenLDAP Server"), "", 2, $progressItems, $progressItems, ""); Progress->NextStage(); Service->Disable("ldap"); Progress->NextStage(); @@ -869,7 +870,7 @@ _("Restarting OpenLDAP Server if required"), ]; - Progress->New("Writing OpenLDAP Configuration", "", 7, $progressItems, $progressItems, ""); + Progress->New(_("Writing OpenLDAP Configuration"), "", 7, $progressItems, $progressItems, ""); Progress->NextStage(); # these changes require a restart of slapd @@ -1503,7 +1504,7 @@ _("Converting slapd.conf to config database"), _("Switching startup configuration to use config database"), _("Restarting LDAP Server") ]; - Progress->New("Migrating LDAP Server Configuration", "Blub", 3, $progressItems, $progressItems, ""); + Progress->New(_("Migrating LDAP Server Configuration"), "", 3, $progressItems, $progressItems, ""); Progress->NextStage(); Progress->NextStage(); @@ -1621,8 +1622,12 @@ my $domain = $rc->{"stdout"}; if ( $domain eq "" ) { - y2milestone("\"hostname -d\" returned: \"". $rc->{'stderr'} . "\" falling back to default"); - $domain = "site"; + $domain = Hostname::CurrentDomain(); + if ( $domain eq "" ) + { + y2milestone("unable to determine domainname falling back to hard-coded default"); + $domain = "site"; + } } chomp($domain); y2milestone( "domain is: <".$domain.">" ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org