Merge lp:~darkmuggle-deactivatedaccount/ubuntu/quantal/ssl-cert/fdqn.lp1004682 into lp:ubuntu/quantal/ssl-cert

[Ben Howard]

When the FQDN is longer than 64 characters, fallback to the short hostname.

Currently this prevents hosts with greater than 63 character from installing Apache on Natty and later.

[lp:~darkmuggle-deactivatedaccount/ubuntu/quantal/ssl-cert/fdqn.lp1004682]

15. By Ben Howard on 2012-05-25

If fully qualified domain name is longer than 64 characters, use the
short hostname. (LP: 1004682)

[Scott Moser (smoser)]

I'll upload. Thanks.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-12 14:35:29 +0000
+++ debian/changelog	2012-05-25 20:40:24 +0000
@@ -1,3 +1,10 @@
+ssl-cert (1.0.28ubuntu1) UNRELEASED; urgency=low
+
+  * If fully qualified domain name is longer than 64 characters, use the
+    short hostname. (LP: 1004682)
+
+ -- Ben Howard <[e-mail]>  Fri, 25 May 2012 14:37:13 -0600
+
 ssl-cert (1.0.28) unstable; urgency=low
 
   * Add Danish translation, thanks to Joe Hansen. Closes: #606736

=== modified file 'make-ssl-cert'
--- make-ssl-cert	2010-08-08 23:15:53 +0000
+++ make-ssl-cert	2012-05-25 20:40:24 +0000
@@ -30,9 +30,9 @@
 }
 
 make_snakeoil() {
-    if ! HostName="$(hostname -f)" ; then
+    if ! { HostName="$(hostname -f)" && [ ${#HostName} -lt 64 ]; }; then
         HostName="$(hostname)"
-        echo make-ssl-cert: Could not get FQDN, using \"$HostName\".
+        echo make-ssl-cert: Could not get or use FQDN, using \"$HostName\".
         echo make-ssl-cert: You may want to fix your /etc/hosts and/or DNS setup and run
         echo make-ssl-cert: 'make-ssl-cert generate-default-snakeoil --force-overwrite'
         echo make-ssl-cert: again.