Merge pull request #2947 from keszybz/test-nss

Add a test for nss modules and some related fixes

1 files changed, 25 insertions, 54 deletions

diff --git a/src/nss-resolve/nss-resolve.c b/src/nss-resolve/nss-resolve.c
index 0de6bd2241..5ce10f1cbd 100644
--- a/src/nss-resolve/nss-resolve.c
+++ b/src/nss-resolve/nss-resolve.c
@@ -117,13 +117,6 @@ enum nss_status _nss_resolve_gethostbyname4_r(
                 int *errnop, int *h_errnop,
                 int32_t *ttlp) {
 
-        enum nss_status (*fallback)(
-                        const char *name,
-                        struct gaih_addrtuple **pat,
-                        char *buffer, size_t buflen,
-                        int *errnop, int *h_errnop,
-                        int32_t *ttlp);
-
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *req = NULL, *reply = NULL;
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
         struct gaih_addrtuple *r_tuple, *r_tuple_first = NULL;
@@ -275,15 +268,15 @@ enum nss_status _nss_resolve_gethostbyname4_r(
         return NSS_STATUS_SUCCESS;
 
 fallback:
-        fallback = (enum nss_status (*)(const char *name,
-                                        struct gaih_addrtuple **pat,
-                                        char *buffer, size_t buflen,
-                                        int *errnop, int *h_errnop,
-                                        int32_t *ttlp))
-                find_fallback("libnss_dns.so.2", "_nss_dns_gethostbyname4_r");
+        {
+                _nss_gethostbyname4_r_t fallback;
+
+                fallback = (_nss_gethostbyname4_r_t)
+                        find_fallback("libnss_dns.so.2", "_nss_dns_gethostbyname4_r");
 
-        if (fallback)
-                return fallback(name, pat, buffer, buflen, errnop, h_errnop, ttlp);
+                if (fallback)
+                        return fallback(name, pat, buffer, buflen, errnop, h_errnop, ttlp);
+        }
 
 fail:
         *errnop = -r;
@@ -300,15 +293,6 @@ enum nss_status _nss_resolve_gethostbyname3_r(
                 int32_t *ttlp,
                 char **canonp) {
 
-        enum nss_status (*fallback)(
-                        const char *name,
-                        int af,
-                        struct hostent *result,
-                        char *buffer, size_t buflen,
-                        int *errnop, int *h_errnop,
-                        int32_t *ttlp,
-                        char **canonp);
-
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *req = NULL, *reply = NULL;
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
         char *r_name, *r_aliases, *r_addr, *r_addr_list;
@@ -480,16 +464,14 @@ enum nss_status _nss_resolve_gethostbyname3_r(
         return NSS_STATUS_SUCCESS;
 
 fallback:
-        fallback = (enum nss_status (*)(const char *name,
-                                        int af,
-                                        struct hostent *result,
-                                        char *buffer, size_t buflen,
-                                        int *errnop, int *h_errnop,
-                                        int32_t *ttlp,
-                                        char **canonp))
-                find_fallback("libnss_dns.so.2", "_nss_dns_gethostbyname3_r");
-        if (fallback)
-                return fallback(name, af, result, buffer, buflen, errnop, h_errnop, ttlp, canonp);
+        {
+                _nss_gethostbyname3_r_t fallback;
+
+                fallback = (_nss_gethostbyname3_r_t)
+                        find_fallback("libnss_dns.so.2", "_nss_dns_gethostbyname3_r");
+                if (fallback)
+                        return fallback(name, af, result, buffer, buflen, errnop, h_errnop, ttlp, canonp);
+        }
 
 fail:
         *errnop = -r;
@@ -505,15 +487,6 @@ enum nss_status _nss_resolve_gethostbyaddr2_r(
                 int *errnop, int *h_errnop,
                 int32_t *ttlp) {
 
-        enum nss_status (*fallback)(
-                        const void* addr, socklen_t len,
-                        int af,
-                        struct hostent *result,
-                        char *buffer, size_t buflen,
-                        int *errnop, int *h_errnop,
-                        int32_t *ttlp);
-
-
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *req = NULL, *reply = NULL;
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
         char *r_name, *r_aliases, *r_addr, *r_addr_list;
@@ -682,17 +655,15 @@ enum nss_status _nss_resolve_gethostbyaddr2_r(
         return NSS_STATUS_SUCCESS;
 
 fallback:
-        fallback = (enum nss_status (*)(
-                                    const void* addr, socklen_t len,
-                                    int af,
-                                    struct hostent *result,
-                                    char *buffer, size_t buflen,
-                                    int *errnop, int *h_errnop,
-                                    int32_t *ttlp))
-                find_fallback("libnss_dns.so.2", "_nss_dns_gethostbyaddr2_r");
-
-        if (fallback)
-                return fallback(addr, len, af, result, buffer, buflen, errnop, h_errnop, ttlp);
+        {
+                _nss_gethostbyaddr2_r_t fallback;
+
+                fallback = (_nss_gethostbyaddr2_r_t)
+                        find_fallback("libnss_dns.so.2", "_nss_dns_gethostbyaddr2_r");
+
+                if (fallback)
+                        return fallback(addr, len, af, result, buffer, buflen, errnop, h_errnop, ttlp);
+        }
 
 fail:
         *errnop = -r;