Author: jsuchome Date: Wed Oct 15 12:53:49 2008 New Revision: 52226 URL: http://svn.opensuse.org/viewcvs/yast?rev=52226&view=rev Log: - use domainname to get the domain name (workaround for bnc#393951) - 2.17.4 Modified: trunk/kerberos-client/VERSION trunk/kerberos-client/package/yast2-kerberos-client.changes trunk/kerberos-client/src/Kerberos.ycp Modified: trunk/kerberos-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/VERSION?rev=52226&r1=52225&r2=52226&view=diff ============================================================================== --- trunk/kerberos-client/VERSION (original) +++ trunk/kerberos-client/VERSION Wed Oct 15 12:53:49 2008 @@ -1 +1 @@ -2.17.3 +2.17.4 Modified: trunk/kerberos-client/package/yast2-kerberos-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/package/yast2-kerberos-client.changes?rev=52226&r1=52225&r2=52226&view=diff ============================================================================== --- trunk/kerberos-client/package/yast2-kerberos-client.changes (original) +++ trunk/kerberos-client/package/yast2-kerberos-client.changes Wed Oct 15 12:53:49 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 15 12:46:25 CEST 2008 - jsuchome@suse.cz + +- use domainname to get the domain name (workaround for bnc#393951) +- 2.17.4 + +------------------------------------------------------------------- Thu Oct 9 11:08:58 CEST 2008 - jsuchome@suse.cz - fixed failing testsuite (Hostname.ycp) Modified: trunk/kerberos-client/src/Kerberos.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/Kerberos.ycp?rev=52226&r1=52225&r2=52226&view=diff ============================================================================== --- trunk/kerberos-client/src/Kerberos.ycp (original) +++ trunk/kerberos-client/src/Kerberos.ycp Wed Oct 15 12:53:49 2008 @@ -26,6 +26,7 @@ import "Progress"; import "Report"; import "Service"; +import "Stage"; import "Summary"; /** @@ -338,6 +339,13 @@ if (default_domain == "") { default_domain = Hostname::CurrentDomain (); + // workaround for bug#393951 + if (default_domain == "" && Stage::cont ()) + { + map out = (map) SCR::Execute (.target.bash_output, "domainname"); + if (out["exit"]:0 == 0) + default_domain = deletechars (out["stdout"]:"", "\n"); + } } // now, check DNS status (Fate 301812) @@ -524,7 +532,8 @@ string domain = default_domain; if ( findfirstof (domain, ".") != 0) domain = "." + domain; - WriteFile (add(.etc.krb5_conf.v.domain_realm,domain),default_realm); + WriteKrb5ConfValue (add(.etc.krb5_conf.v.domain_realm,domain), + default_realm); } WriteKrb5ConfValue (.etc.krb5_conf.v.libdefaults.clockskew, clockskew); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org