X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Fexport%2Fclient.c;h=f8c84de32178ba7c6b685aeb0f8c3dacdf927ff7;hp=1754aa0d0d630f25962c3a4abd89bab9a118e7cc;hb=aa4c771fc359e097a3a6c3637f78c7bed7c450e9;hpb=1cecd88106230fc9a8c3527bcdf4195150e9ad64 diff --git a/support/export/client.c b/support/export/client.c index 1754aa0..f8c84de 100644 --- a/support/export/client.c +++ b/support/export/client.c @@ -211,26 +211,17 @@ client_freeall(void) } } -nfs_client * -client_find(struct hostent *hp) +struct hostent * +client_resolve(struct in_addr addr) { - nfs_client *clp; - int i; + struct hostent *he = NULL; - for (i = 0; i < MCL_MAXTYPES; i++) { - for (clp = clientlist[i]; clp; clp = clp->m_next) { - if (!client_check(clp, hp)) - continue; -#ifdef notdef - if (clp->m_type == MCL_FQDN) - return clp; - return client_dup(clp, hp); -#else - return clp; -#endif - } - } - return 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; } /* @@ -242,17 +233,11 @@ client_find(struct hostent *hp) 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; - 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) { @@ -261,7 +246,6 @@ client_compose(struct in_addr addr) name = add_name(name, clp->m_hostname); } } - free(he); return name; } @@ -291,7 +275,7 @@ name_cmp(char *a, char *b) /* compare strings a and b, but only upto ',' in a */ while (*a && *b && *a != ',' && *a == *b) a++, b++; - if (!*b && (!*a || !a == ',') ) + if (!*b && (!*a || *a == ',')) return 0; if (!*b) return 1; if (!*a || *a == ',') return -1; @@ -365,7 +349,7 @@ client_check(nfs_client *clp, struct hostent *hp) #ifdef HAVE_INNETGR { char *dot; - int match; + int match, i; struct hostent *nhp = NULL; struct sockaddr_in addr; @@ -374,6 +358,12 @@ client_check(nfs_client *clp, struct hostent *hp) if (innetgr(cname+1, hname, NULL, NULL)) return 1; + /* try the aliases as well */ + for (i = 0; hp->h_aliases[i]; i++) { + if (innetgr(cname+1, hp->h_aliases[i], NULL, NULL)) + return 1; + } + /* If hname is ip address convert to FQDN */ if (inet_aton(hname, &addr.sin_addr) && (nhp = gethostbyaddr((const char *)&(addr.sin_addr),