Merge pull request #9 from mchf/Code-11-SP4

Replaced remaining .site using .suse
yast · Jun 24, 2015 · 46d75cc · 46d75cc
2 parents d389f24 + 8946492
commit 46d75cc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.17.27
+2.17.28
diff --git a/package/yast2-ca-management.changes b/package/yast2-ca-management.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jun 24 07:40:25 UTC 2015 - mfilka@suse.com
+
+- bnc#922765
+  - changed default TLD from .site to .suse in AY client
+- 2.17.28 
+
 -------------------------------------------------------------------
 Mon Jun 15 20:17:41 UTC 2015 - mfilka@suse.com
 

diff --git a/src/ca_mgm_auto.ycp b/src/ca_mgm_auto.ycp
@@ -674,10 +674,8 @@ boolean Read() {
 	boolean found = servercert != nil?true:false;
 
 	string hostname = "linux";
-	string domain = "site";
-    map retmap = (map) SCR::Execute (.target.bash_output,
-                                     "/bin/hostname -s",
-                                     $[] );
+	string domain = Hostname::DEFAULT_DOMAIN;
+        map retmap = (map) SCR::Execute (.target.bash_output, "/bin/hostname -s", $[] );
 
 	if (retmap["exit"]:1 == 0)
 	{
@@ -690,7 +688,7 @@ boolean Read() {
 
 	if (retmap["exit"]:1 == 0)
 	{
-		domain = strip(retmap["stdout"]:"site");
+		domain = strip(retmap["stdout"]:Hostname::DEFAULT_DOMAIN);
 	}
 
 	if(found)