X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnss-myhostname%2Fnss-myhostname.c;h=aa92cc96e4a1d46f772f85c3ee4012be20b15b1c;hb=1b8951e5bd9b2bf1722098a861055cae0bb52088;hp=08d70f6c0d74a3ee790fc6d8702f7591663ab05f;hpb=e70df46b9721a3d025e7a0b4ffb5893cbde5e55d;p=elogind.git

diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c
index 08d70f6c0..aa92cc96e 100644
--- a/src/nss-myhostname/nss-myhostname.c
+++ b/src/nss-myhostname/nss-myhostname.c
@@ -77,6 +77,18 @@ enum nss_status _nss_myhostname_gethostbyname4_r(
 
                 canonical = "localhost";
                 local_address_ipv4 = htonl(INADDR_LOOPBACK);
+
+        } else if (streq(name, "gateway")) {
+
+                n_addresses = local_gateways(NULL, 0, AF_UNSPEC, &addresses);
+                if (n_addresses <= 0) {
+                        *errnop = ENOENT;
+                        *h_errnop = HOST_NOT_FOUND;
+                        return NSS_STATUS_NOTFOUND;
+                }
+
+                canonical = "gateway";
+
         } else {
                 hn = gethostname_malloc();
                 if (!hn) {
@@ -92,7 +104,7 @@ enum nss_status _nss_myhostname_gethostbyname4_r(
                         return NSS_STATUS_NOTFOUND;
                 }
 
-                n_addresses = local_addresses(&addresses);
+                n_addresses = local_addresses(NULL, 0, AF_UNSPEC, &addresses);
                 if (n_addresses < 0)
                         n_addresses = 0;
 
@@ -314,7 +326,7 @@ enum nss_status _nss_myhostname_gethostbyname3_r(
         _cleanup_free_ struct local_address *addresses = NULL;
         const char *canonical, *additional = NULL;
         _cleanup_free_ char *hn = NULL;
-        uint32_t local_address_ipv4;
+        uint32_t local_address_ipv4 = 0;
         int n_addresses = 0;
 
         assert(name);
@@ -335,6 +347,18 @@ enum nss_status _nss_myhostname_gethostbyname3_r(
         if (is_localhost(name)) {
                 canonical = "localhost";
                 local_address_ipv4 = htonl(INADDR_LOOPBACK);
+
+        } else if (streq(name, "gateway")) {
+
+                n_addresses = local_gateways(NULL, 0, af, &addresses);
+                if (n_addresses <= 0) {
+                        *errnop = ENOENT;
+                        *h_errnop = HOST_NOT_FOUND;
+                        return NSS_STATUS_NOTFOUND;
+                }
+
+                canonical = "gateway";
+
         } else {
                 hn = gethostname_malloc();
                 if (!hn) {
@@ -349,7 +373,7 @@ enum nss_status _nss_myhostname_gethostbyname3_r(
                         return NSS_STATUS_NOTFOUND;
                 }
 
-                n_addresses = local_addresses(&addresses);
+                n_addresses = local_addresses(NULL, 0, af, &addresses);
                 if (n_addresses < 0)
                         n_addresses = 0;
 
@@ -425,16 +449,42 @@ enum nss_status _nss_myhostname_gethostbyaddr2_r(
 
         }
 
-        n_addresses = local_addresses(&addresses);
-        if (n_addresses < 0)
-                n_addresses = 0;
+        n_addresses = local_addresses(NULL, 0, AF_UNSPEC, &addresses);
+        if (n_addresses > 0) {
+                for (a = addresses, n = 0; (int) n < n_addresses; n++, a++) {
+                        if (af != a->family)
+                                continue;
 
-        for (a = addresses, n = 0; (int) n < n_addresses; n++, a++) {
-                if (af != a->family)
-                        continue;
+                        if (memcmp(addr, &a->address, FAMILY_ADDRESS_SIZE(af)) == 0) {
 
-                if (memcmp(addr, &a->address, FAMILY_ADDRESS_SIZE(af)) == 0)
-                        goto found;
+                                hn = gethostname_malloc();
+                                if (!hn) {
+                                        *errnop = ENOMEM;
+                                        *h_errnop = NO_RECOVERY;
+                                        return NSS_STATUS_TRYAGAIN;
+                                }
+
+                                canonical = hn;
+                                goto found;
+                        }
+                }
+        }
+
+        free(addresses);
+        addresses = NULL;
+
+        n_addresses = local_gateways(NULL, 0, AF_UNSPEC, &addresses);
+        if (n_addresses > 0) {
+                for (a = addresses, n = 0; (int) n < n_addresses; n++, a++) {
+                        if (af != a->family)
+                                continue;
+
+                        if (memcmp(addr, &a->address, FAMILY_ADDRESS_SIZE(af)) == 0) {
+
+                                canonical = "gateway";
+                                goto found;
+                        }
+                }
         }
 
         *errnop = ENOENT;
@@ -443,16 +493,6 @@ enum nss_status _nss_myhostname_gethostbyaddr2_r(
         return NSS_STATUS_NOTFOUND;
 
 found:
-        if (!canonical) {
-                hn = gethostname_malloc();
-                if (!hn) {
-                        *errnop = ENOMEM;
-                        *h_errnop = NO_RECOVERY;
-                        return NSS_STATUS_TRYAGAIN;
-                }
-
-                canonical = hn;
-        }
 
         return fill_in_hostent(
                         canonical, additional,