rpc.mountd: create client_resolve and change client_compose to take a hostent arg

This moves the resolution of IP address to hostent into a helper function
and has other functions call it. Having client_compose take a hostent arg
allows us to avoid an extra hostname lookup in the auth_authenticate
codepath as well. Instead of redoing this lookup in client_compose, we can
simply reuse the hostent that was already generated in auth_authenticate.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Acked-by: Steve Dickson <steved@redhat.com>
Signed-off-by: Neil Brown <neilb@suse.de>

diff --git a/support/export/client.c b/support/export/client.c
index 1754aa0d0d630f25962c3a4abd89bab9a118e7cc..1cb242f33fa62b993695df7c8623c7d9d9318a45 100644 (file)
--- a/support/export/client.c
+++ b/support/export/client.c
@@ -233,6 +233,19 @@ client_find(struct hostent *hp)
        return NULL;
 }
 
        return NULL;
 }
 

+struct hostent *
+client_resolve(struct in_addr addr)
+{
+       struct hostent *he = NULL;
+
+       if (clientlist[MCL_WILDCARD] || clientlist[MCL_NETGROUP])
+               he = get_reliable_hostbyaddr((const char*)&addr, sizeof(addr), AF_INET);
+       if (he == NULL)
+               he = get_hostent((const char*)&addr, sizeof(addr), AF_INET);
+
+       return he;
+}
+

 /*
  * Find client name given an IP address
  * This is found by gathering all known names that match that IP address,
 /*
  * Find client name given an IP address
  * This is found by gathering all known names that match that IP address,


@@ -242,17 +255,11 @@ client_find(struct hostent *hp)
 static char *add_name(char *old, char *add);
 
 char *
 static char *add_name(char *old, char *add);
 
 char *

-client_compose(struct in_addr addr)
+client_compose(struct hostent *he)

 {
 {

-       struct hostent *he = NULL;

        char *name = NULL;
        int i;
 
        char *name = NULL;
        int i;
 

-       if (clientlist[MCL_WILDCARD] || clientlist[MCL_NETGROUP])
-               he = get_reliable_hostbyaddr((const char*)&addr, sizeof(addr), AF_INET);
-       if (he == NULL)
-               he = get_hostent((const char*)&addr, sizeof(addr), AF_INET);
-

        for (i = 0 ; i < MCL_MAXTYPES; i++) {
                nfs_client      *clp;
                for (clp = clientlist[i]; clp ; clp = clp->m_next) {
        for (i = 0 ; i < MCL_MAXTYPES; i++) {
                nfs_client      *clp;
                for (clp = clientlist[i]; clp ; clp = clp->m_next) {


@@ -261,7 +268,6 @@ client_compose(struct in_addr addr)
                        name = add_name(name, clp->m_hostname);
                }
        }
                        name = add_name(name, clp->m_hostname);
                }
        }

-       free(he);

        return name;
 }
 
        return name;
 }
 

diff --git a/support/include/exportfs.h b/support/include/exportfs.h
index a491b1a5a609d693d94def785a4241b1a6f877db..c1ba54357fa677f9d9eb48cb5e2517ff8d63a0c3 100644 (file)
--- a/support/include/exportfs.h
+++ b/support/include/exportfs.h
@@ -64,7 +64,8 @@ int                           client_check(nfs_client *, struct hostent *);
 int                            client_match(nfs_client *, char *hname);
 void                           client_release(nfs_client *);
 void                           client_freeall(void);
 int                            client_match(nfs_client *, char *hname);
 void                           client_release(nfs_client *);
 void                           client_freeall(void);

-char *                         client_compose(struct in_addr addr);
+char *                         client_compose(struct hostent *he);
+struct hostent *               client_resolve(struct in_addr addr);

 int                            client_member(char *client, char *name);
 
 int                            export_read(char *fname);
 int                            client_member(char *client, char *name);
 
 int                            export_read(char *fname);

diff --git a/utils/mountd/auth.c b/utils/mountd/auth.c
index 950ea20721fe6273821ced59166996fd46d89548..84fea30d8415f85e55568e442c78e4a011a372f6 100644 (file)
--- a/utils/mountd/auth.c
+++ b/utils/mountd/auth.c
@@ -89,7 +89,7 @@ auth_authenticate_internal(char *what, struct sockaddr_in *caller,
                /* return static nfs_export with details filled in */
                char *n;
                my_client.m_addrlist[0] = caller->sin_addr;
                /* return static nfs_export with details filled in */
                char *n;
                my_client.m_addrlist[0] = caller->sin_addr;

-               n = client_compose(caller->sin_addr);
+               n = client_compose(hp);

                *error = unknown_host;
                if (!n)
                        return NULL;
                *error = unknown_host;
                if (!n)
                        return NULL;


@@ -160,11 +160,7 @@ auth_authenticate(char *what, struct sockaddr_in *caller, char *path)
        epath[sizeof (epath) - 1] = '\0';
        auth_fixpath(epath); /* strip duplicate '/' etc */
 
        epath[sizeof (epath) - 1] = '\0';
        auth_fixpath(epath); /* strip duplicate '/' etc */
 

-       hp = get_reliable_hostbyaddr((const char*)&caller->sin_addr, sizeof(struct in_addr),
-                                    AF_INET);
-       if (!hp)
-               hp = get_hostent((const char*)&caller->sin_addr, sizeof(struct in_addr),
-                                    AF_INET);
+       hp = client_resolve(caller->sin_addr);

        if (!hp)
                return exp;
 
        if (!hp)
                return exp;
 

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index fedc0bfc62b1b3656359ce81cc240d66f680abd0..ef460f75c144fc164f776a66f903963fdeb4898a 100644 (file)
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -76,6 +76,7 @@ void auth_unix_ip(FILE *f)
        char ipaddr[20];
        char *client;
        struct in_addr addr;
        char ipaddr[20];
        char *client;
        struct in_addr addr;

+       struct hostent *he;

        if (readline(fileno(f), &lbuf, &lbuflen) != 1)
                return;
 
        if (readline(fileno(f), &lbuf, &lbuflen) != 1)
                return;
 


@@ -94,7 +95,8 @@ void auth_unix_ip(FILE *f)
        auth_reload();
 
        /* addr is a valid, interesting address, find the domain name... */
        auth_reload();
 
        /* addr is a valid, interesting address, find the domain name... */

-       client = client_compose(addr);
+       he = client_resolve(addr);
+       client = client_compose(he);

 
        
        qword_print(f, "nfsd");
 
        
        qword_print(f, "nfsd");


@@ -105,7 +107,7 @@ void auth_unix_ip(FILE *f)
        qword_eol(f);
 
        if (client) free(client);
        qword_eol(f);
 
        if (client) free(client);

-       
+       free(he);

 }
 
 void auth_unix_gid(FILE *f)
 }
 
 void auth_unix_gid(FILE *f)