[systemd-commits] src/shared

Lennart Poettering lennart at kemper.freedesktop.org
Fri Aug 15 07:05:00 PDT 2014


 src/shared/util.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit a0627f82e23491a08106b7329dbbe006c9b579aa
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Aug 15 16:04:46 2014 +0200

    util: make is_localhost() check for 'localdomain' too, so that we can use it for both validating domains and host names

diff --git a/src/shared/util.c b/src/shared/util.c
index 0db4bd9..d6cea4d 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -6868,11 +6868,13 @@ char *tempfn_random(const char *p) {
 bool is_localhost(const char *hostname) {
         assert(hostname);
 
-        /* This tries to identify local hostnames described in RFC6761
-         * plus the redhatism of .localdomain */
+        /* This tries to identify local host and domain names
+         * described in RFC6761 plus the redhatism of .localdomain */
 
         return streq(hostname, "localhost") ||
                streq(hostname, "localhost.") ||
+               streq(hostname, "localdomain.") ||
+               streq(hostname, "localdomain") ||
                endswith(hostname, ".localhost") ||
                endswith(hostname, ".localhost.") ||
                endswith(hostname, ".localdomain") ||
@@ -6929,4 +6931,4 @@ int is_symlink(const char *path) {
                 return 1;
 
         return 0;
-}
\ No newline at end of file
+}



More information about the systemd-commits mailing list