From a804f8f3824a2bd7df8221dabe9899116da735f774d9e37970767bc3f3950033 Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Mon, 26 Oct 2015 08:39:01 +0000
Subject: [PATCH] Accepting request 340178 from home:pgajdos

- gensslcert: CN now defaults to `hostname -f` [bnc#949766]
  (internal), fix help [bnc#949771] (internal)

OBS-URL: https://build.opensuse.org/request/show/340178
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=462
---
 apache2.changes | 6 ++++++
 gensslcert      | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/apache2.changes b/apache2.changes
index 0e8480f..6e46532 100644
--- a/apache2.changes
+++ b/apache2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Oct 21 07:35:30 UTC 2015 - pgajdos@suse.com
+
+- gensslcert: CN now defaults to `hostname -f` [bnc#949766] 
+  (internal), fix help [bnc#949771] (internal)
+
 -------------------------------------------------------------------
 Sun Oct 18 03:47:09 UTC 2015 - crrodriguez@opensuse.org
 
diff --git a/gensslcert b/gensslcert
index 020f1ac..d73784b 100644
--- a/gensslcert
+++ b/gensslcert
@@ -23,7 +23,7 @@ function usage
 	-l 	city				$L
 	-o 	organisation			"$O"
 	-u 	organisational unit		"$U"
-	-n	fully qualified domain name	$CN (\$FQHOSTNAME)
+	-n	fully qualified domain name	$CN (hostname -f)
 	-e 	email address of webmaster	webmaster@$CN
 	-y      days server cert is valid for   $srvdays
 	-Y      days CA cert is valid for       $CAdays
@@ -40,7 +40,7 @@ function myexit { error something ugly seems to have happened in line $1...; exi
 
 r=$ROOT
 . $r/etc/sysconfig/network/config
-FQHOSTNAME=`cat /etc/HOSTNAME`
+FQHOSTNAME=`hostname -f`
 
 # defaults
   comment="mod_ssl server certificate"