Package: molly-guard
Version: 0.4.4-2
Severity: normal
Tags: patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Attached is a patch that implements this feature. If it's acceptable, please
consider applying it.
- -- System Information:
Debian Release: 6.0.4
APT prefers stable
APT policy: (500, 'stable')
Architecture: i386 (i686)
Kernel: Linux 2.6.32-5-686 (SMP w/1 CPU core)
Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages molly-guard depends on:
ii procps 1:3.2.8-9 /proc file system utilities
molly-guard recommends no packages.
molly-guard suggests no packages.
- -- no debconf information
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iQIcBAEBCAAGBQJPKbixAAoJEFHf2Ts++3nvcE4P/3fjDB5uNTaT3HWzgmopXoEL
MtDofXxdVNTlyAPcplfL675ho/PWuGGnXyHaJdU6TAwnZAaHqRxlYvWAakoWsCWB
Ifm9+CnzLU8r92SqLd7jFrFQnLdo1Ita6f6UcZBTr3L8OfWQSZyg9us0B2luT0IO
/rKcMxa/ws5xek1UK7qikJAGvyzbGB2A1OEJfPQgkg75aYn1EyMg+RYRLLA2ioQB
iXRfO2AhZJDnJF7LZpNLnO4Bv2E/iPcqjjQGC10eTV4l4U73B7/X9IuYJEkDEyYf
wJjsHRUu7A4JsKoKTIohn3qKFShXJ6iH9Tljy55SOiOIRWcvPMqYiyNvfI8IhFjH
57OlteG3t3vOandf8I0BQBD5yVmBLe4a//E3iiptuvJ269Wn11COV0NWczibo4wK
rk6HPIHDuDDSiZyoM6UbLp+KaXcKWTDR6yVEmxN872P2h4ko4lAxBTHRZ9F7H9YA
L4WrGErbFg4GgsE0DDI3TciK3tVkiiV+PpoYT/gkIkDQTfDYfkatmDeiYh1gp/4P
cLCVjZyV/9pmh7AnJAS+C84x7BchVPKtuCalvbxnjhkOk2FgEH8kVcnHjWCj1uF/
rKA8k6EJkom3/NlLzmcaNgFe5vvOmkC4tYMXWCm7z9J/c2J8H0XNZex3M8Nd9Em5
UaHpkxLty6hoUwcnsHUQ
=lzqf
-----END PGP SIGNATURE-----
diff -u molly-guard-0.4.4/debian/changelog molly-guard-0.4.4/debian/changelog
--- molly-guard-0.4.4/debian/changelog
+++ molly-guard-0.4.4/debian/changelog
@@ -1,3 +1,10 @@
+molly-guard (0.4.4-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add configuration option to require fully-qualified hostname (closes: #658282)
+
+ -- Andrew Pollock <apoll...@debian.org> Wed, 01 Feb 2012 11:16:32 -0800
+
molly-guard (0.4.4-2) unstable; urgency=low
* Remove dependency on sysvutils, which is essential, and upstart, which is
only in patch2:
unchanged:
--- molly-guard-0.4.4.orig/rc
+++ molly-guard-0.4.4/rc
@@ -4,3 +4,8 @@
# when set, causes the 30-query-hostname script to always ask for the
# hostname, even if no SSH session was detected.
#ALWAYS_QUERY_HOSTNAME=true
+
+# USE_FQDN
+# when set, causes the 30-query-hostname script to ask for the fully-qualified
+# hostname, rather than the short name
+USE_FQDN=true
only in patch2:
unchanged:
--- molly-guard-0.4.4.orig/run.d/30-query-hostname
+++ molly-guard-0.4.4/run.d/30-query-hostname
@@ -43,7 +43,14 @@
;;
esac
-HOSTNAME="$(hostname --short)"
+case "${USE_FQDN:-0}" in
+ 0|false|False|no|No|off|Off)
+ HOSTNAME="$(hostname --short)"
+ ;;
+ *)
+ HOSTNAME="$(hostname --fqdn)"
+ ;;
+esac
sigh()
{
