From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 18 Dec 2014 00:44:34 +0000 (+0100)
Subject: nss-myhostname: introduce is_gateway() similar to the existing is_hostname()
X-Git-Tag: v219~922
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=b7d131939347fee0f1af7a288052a3dffb5a6763

nss-myhostname: introduce is_gateway() similar to the existing is_hostname()
---

diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c
index 2f768603b..dcf7c1f5d 100644
--- a/src/nss-myhostname/nss-myhostname.c
+++ b/src/nss-myhostname/nss-myhostname.c
@@ -47,6 +47,13 @@
 NSS_GETHOSTBYNAME_PROTOTYPES(myhostname);
 NSS_GETHOSTBYADDR_PROTOTYPES(myhostname);
 
+static bool is_gateway(const char *hostname) {
+        assert(hostname);
+
+        return streq(hostname, "gateway") ||
+               streq(hostname, "gateway.");
+}
+
 enum nss_status _nss_myhostname_gethostbyname4_r(
                 const char *name,
                 struct gaih_addrtuple **pat,
@@ -78,7 +85,7 @@ enum nss_status _nss_myhostname_gethostbyname4_r(
                 canonical = "localhost";
                 local_address_ipv4 = htonl(INADDR_LOOPBACK);
 
-        } else if (streq(name, "gateway") || streq(name, "gateway.")) {
+        } else if (is_gateway(name)) {
 
                 n_addresses = local_gateways(NULL, 0, AF_UNSPEC, &addresses);
                 if (n_addresses <= 0) {
@@ -348,7 +355,7 @@ enum nss_status _nss_myhostname_gethostbyname3_r(
                 canonical = "localhost";
                 local_address_ipv4 = htonl(INADDR_LOOPBACK);
 
-        } else if (streq(name, "gateway") || streq(name, "gateway.")) {
+        } else if (is_gateway(name)) {
 
                 n_addresses = local_gateways(NULL, 0, af, &addresses);
                 if (n_addresses <= 0) {