summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-07-02 13:41:31 +0200
committerLennart Poettering <lennart@poettering.net>2014-07-02 13:41:31 +0200
commitfecc80c1ba2eed9dadb9a10c15508c356bcc5fc1 (patch)
tree8db82ae690416827c910683432c9746f365acf2e /src
parent9a00f57a5ba7ed431e6bac8d8b36518708503b4e (diff)
util: generalize is_localhost() and use it everywhere where applicable
Diffstat (limited to 'src')
-rw-r--r--src/hostname/hostnamed.c2
-rw-r--r--src/login/pam_systemd.c4
-rw-r--r--src/network/networkd-link.c12
-rw-r--r--src/shared/util.c15
-rw-r--r--src/shared/util.h2
5 files changed, 19 insertions, 16 deletions
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 241d296916..c2b6d3d6f3 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -258,7 +258,7 @@ static char* context_fallback_icon_name(Context *c) {
}
static bool hostname_is_useful(const char *hn) {
- return !isempty(hn) && !streq(hn, "localhost");
+ return !isempty(hn) && !is_localhost(hn);
}
static int context_update_kernel_hostname(Context *c) {
diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
index 262621d43f..f522d6ec4f 100644
--- a/src/login/pam_systemd.c
+++ b/src/login/pam_systemd.c
@@ -357,9 +357,7 @@ _public_ PAM_EXTERN int pam_sm_open_session(
if (isempty(class))
class = streq(type, "unspecified") ? "background" : "user";
- remote = !isempty(remote_host) &&
- !streq_ptr(remote_host, "localhost") &&
- !streq_ptr(remote_host, "localhost.localdomain");
+ remote = !isempty(remote_host) && !is_localhost(remote_host);
/* Talk to logind over the message bus */
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 3324276bcc..660efedc61 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1928,18 +1928,6 @@ static int link_enter_enslave(Link *link) {
return 0;
}
-/* make sure the hostname is not "localhost" */
-static bool is_localhost(const char *hostname) {
- assert(hostname);
-
- return streq(hostname, "localhost") ||
- streq(hostname, "localhost.") ||
- endswith(hostname, ".localhost") ||
- endswith(hostname, ".localhost.") ||
- endswith(hostname, ".localdomain") ||
- endswith(hostname, ".localdomain.");
-}
-
static int link_configure(Link *link) {
int r;
diff --git a/src/shared/util.c b/src/shared/util.c
index a1c8baf237..ceafa019a8 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -6732,3 +6732,18 @@ char *tempfn_random(const char *p) {
return t;
}
+
+/* make sure the hostname is not "localhost" */
+bool is_localhost(const char *hostname) {
+ assert(hostname);
+
+ /* This tries to identify local hostnames described in RFC6761
+ * plus the redhatism of .localdomain */
+
+ return streq(hostname, "localhost") ||
+ streq(hostname, "localhost.") ||
+ endswith(hostname, ".localhost") ||
+ endswith(hostname, ".localhost.") ||
+ endswith(hostname, ".localdomain") ||
+ endswith(hostname, ".localdomain.");
+}
diff --git a/src/shared/util.h b/src/shared/util.h
index 6ad43cd274..6d3791be7f 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -959,3 +959,5 @@ int fflush_and_check(FILE *f);
char *tempfn_xxxxxx(const char *p);
char *tempfn_random(const char *p);
+
+bool is_localhost(const char *hostname);