Author: jsuchome Date: Wed Oct 15 12:53:59 2008 New Revision: 52228 URL: http://svn.opensuse.org/viewcvs/yast?rev=52228&view=rev Log: - use domainname to get the domain name (workaround for bnc#393951) - 2.17.13 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=52228&r1=52227&r2=52228&view=diff ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Wed Oct 15 12:53:59 2008 @@ -1 +1 @@ -2.17.12 +2.17.13 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-client.changes?rev=52228&r1=52227&r2=52228&view=diff ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Wed Oct 15 12:53:59 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 15 12:47:13 CEST 2008 - jsuchome@suse.cz + +- use domainname to get the domain name (workaround for bnc#393951) +- 2.17.13 + +------------------------------------------------------------------- Mon Oct 13 16:34:43 CEST 2008 - jsuchome@suse.cz - restart of dbus is back, there's no reload Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=52228&r1=52227&r2=52228&view=diff ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Wed Oct 15 12:53:59 2008 @@ -678,6 +678,13 @@ && FileUtils::Exists ("/usr/bin/dig") && !Mode::test()) { string domain = Hostname::CurrentDomain (); + // workaround for bug#393951 + if (domain == "" && Stage::cont ()) + { + map out = (map) SCR::Execute (.target.bash_output,"domainname"); + if (out["exit"]:0 == 0) + domain = deletechars (out["stdout"]:"", "\n"); + } map out = (map) SCR::Execute (.target.bash_output, sformat ("dig SRV _ldap._tcp.%1 +short", domain)); string first = splitstring (out["stdout"]:"", "\n")[0]:""; string srv = splitstring (first, " ")[3]:""; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org