X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Fexport%2Fclient.c;h=9259180dd1d618f4a36196becade0751769df821;hp=580012d9eaa38d2a45a9f8af4dd563ace3197315;hb=9bb85c5e8d2285f82367c75df5530a71a9a5a5f2;hpb=346ca35298e45e55a58d0f566c3b32b69102c6de diff --git a/support/export/client.c b/support/export/client.c index 580012d..9259180 100644 --- a/support/export/client.c +++ b/support/export/client.c @@ -17,7 +17,7 @@ #include #include #include -#include "xmalloc.h" + #include "misc.h" #include "nfslib.h" #include "exportfs.h" @@ -30,12 +30,89 @@ extern int innetgr(char *netgr, char *host, char *, char *); #endif static char *add_name(char *old, const char *add); -static void client_init(nfs_client *clp, const char *hname, - struct hostent *hp); nfs_client *clientlist[MCL_MAXTYPES] = { NULL, }; +static void +init_addrlist(nfs_client *clp, const struct hostent *hp) +{ + char **ap; + int i; + + if (hp == NULL) + return; + + ap = hp->h_addr_list; + for (i = 0; *ap != NULL && i < NFSCLNT_ADDRMAX; i++, ap++) + clp->m_addrlist[i] = *(struct in_addr *)*ap; + + clp->m_naddr = i; +} + +static void +client_free(nfs_client *clp) +{ + free(clp->m_hostname); + free(clp); +} + +static int +init_netmask(nfs_client *clp, const char *slash) +{ + if (strchr(slash + 1, '.') != NULL) + clp->m_addrlist[1].s_addr = inet_addr(slash + 1); + else { + int prefixlen = atoi(slash + 1); + if (0 < prefixlen && prefixlen <= 32) + clp->m_addrlist[1].s_addr = + htonl((uint32_t)~0 << (32 - prefixlen)); + else + goto out_badprefix; + } + + return 1; + +out_badprefix: + xlog(L_ERROR, "Invalid prefix `%s' for %s", slash + 1, clp->m_hostname); + return 0; +} + +static int +init_subnetwork(nfs_client *clp) +{ + static char slash32[] = "/32"; + char *cp; + + cp = strchr(clp->m_hostname, '/'); + if (cp == NULL) + cp = slash32; + + *cp = '\0'; + clp->m_addrlist[0].s_addr = inet_addr(clp->m_hostname); + *cp = '/'; + + return init_netmask(clp, cp); +} + +static int +client_init(nfs_client *clp, const char *hname, const struct hostent *hp) +{ + clp->m_hostname = strdup(hname); + if (clp->m_hostname == NULL) + return 0; + + clp->m_exported = 0; + clp->m_count = 0; + clp->m_naddr = 0; + + if (clp->m_type == MCL_SUBNETWORK) + return init_subnetwork(clp); + + init_addrlist(clp, hp); + return 1; +} + /* if canonical is set, then we *know* this is already a canonical name * so hostname lookup is avoided. * This is used when reading /proc/fs/nfs/exports @@ -88,23 +165,23 @@ client_lookup(char *hname, int canonical) } } - if (!clp) { - clp = (nfs_client *) xmalloc(sizeof(*clp)); - memset(clp, 0, sizeof(*clp)); + if (clp == NULL) { + clp = calloc(1, sizeof(*clp)); + if (clp == NULL) + goto out; clp->m_type = htype; - client_init(clp, hname, NULL); + if (!client_init(clp, hname, NULL)) { + client_free(clp); + clp = NULL; + goto out; + } client_add(clp); } - if (htype == MCL_FQDN && clp->m_naddr == 0 && hp != NULL) { - char **ap = hp->h_addr_list; - int i; - - for (i = 0; *ap && i < NFSCLNT_ADDRMAX; i++, ap++) - clp->m_addrlist[i] = *(struct in_addr *)*ap; - clp->m_naddr = i; - } + if (htype == MCL_FQDN && clp->m_naddr == 0) + init_addrlist(clp, hp); +out: if (hp) free (hp); @@ -116,64 +193,21 @@ client_dup(nfs_client *clp, struct hostent *hp) { nfs_client *new; - new = (nfs_client *) xmalloc(sizeof(*new)); + new = (nfs_client *)malloc(sizeof(*new)); + if (new == NULL) + return NULL; memcpy(new, clp, sizeof(*new)); new->m_type = MCL_FQDN; new->m_hostname = NULL; - client_init(new, (char *) hp->h_name, hp); + if (!client_init(new, hp->h_name, hp)) { + client_free(new); + return NULL; + } client_add(new); return new; } -static void -client_init(nfs_client *clp, const char *hname, struct hostent *hp) -{ - xfree(clp->m_hostname); - if (hp) - clp->m_hostname = xstrdup(hp->h_name); - else - clp->m_hostname = xstrdup(hname); - - clp->m_exported = 0; - clp->m_count = 0; - - if (clp->m_type == MCL_SUBNETWORK) { - char *cp = strchr(clp->m_hostname, '/'); - static char slash32[] = "/32"; - - if(!cp) cp = slash32; - *cp = '\0'; - clp->m_addrlist[0].s_addr = inet_addr(clp->m_hostname); - if (strchr(cp + 1, '.')) { - clp->m_addrlist[1].s_addr = inet_addr(cp+1); - } - else { - int netmask = atoi(cp + 1); - if (0 < netmask && netmask <= 32) { - clp->m_addrlist[1].s_addr = - htonl ((uint32_t) ~0 << (32 - netmask)); - } - else { - xlog(L_FATAL, "invalid netmask `%s' for %s", - cp + 1, clp->m_hostname); - } - } - *cp = '/'; - clp->m_naddr = 0; - } else if (!hp) { - clp->m_naddr = 0; - } else { - char **ap = hp->h_addr_list; - int i; - - for (i = 0; *ap && i < NFSCLNT_ADDRMAX; i++, ap++) { - clp->m_addrlist[i] = *(struct in_addr *)*ap; - } - clp->m_naddr = i; - } -} - void client_add(nfs_client *clp) { @@ -206,8 +240,7 @@ client_freeall(void) head = clientlist + i; while (*head) { *head = (clp = *head)->m_next; - xfree(clp->m_hostname); - xfree(clp); + client_free(clp); } } } @@ -370,6 +403,31 @@ check_subnetwork(const nfs_client *clp, const struct hostent *hp) return 0; } +/* + * Check if a wildcard nfs_client record matches the canonical name + * or the aliases of a host. Return 1 if a match is found, otherwise + * zero. + */ +static int +check_wildcard(const nfs_client *clp, const struct hostent *hp) +{ + char *cname = clp->m_hostname; + char *hname = hp->h_name; + char **ap; + + if (wildmat(hname, cname)) + return 1; + + /* See if hname aliases listed in /etc/hosts or nis[+] + * match the requested wildcard */ + for (ap = hp->h_aliases; *ap; ap++) { + if (wildmat(*ap, cname)) + return 1; + } + + return 0; +} + /* * Check if @hp's hostname or aliases fall in a given netgroup. * Return 1 if @hp represents a host in the netgroup, otherwise zero. @@ -426,31 +484,24 @@ check_netgroup(__attribute__((unused)) const nfs_client *clp, } #endif /* !HAVE_INNETGR */ -/* - * Match a host (given its hostent record) to a client record. This - * is usually called from mountd. +/** + * client_check - check if IP address information matches a cached nfs_client + * @clp: pointer to a cached nfs_client record + * @hp: pointer to hostent containing host IP information + * + * Returns 1 if the address information matches the cached nfs_client, + * otherwise zero. */ int client_check(nfs_client *clp, struct hostent *hp) { - char *hname = (char *) hp->h_name; - char *cname = clp->m_hostname; - char **ap; - switch (clp->m_type) { case MCL_FQDN: return check_fqdn(clp, hp); case MCL_SUBNETWORK: return check_subnetwork(clp, hp); case MCL_WILDCARD: - if (wildmat(hname, cname)) - return 1; - else { - for (ap = hp->h_aliases; *ap; ap++) - if (wildmat(*ap, cname)) - return 1; - } - return 0; + return check_wildcard(clp, hp); case MCL_NETGROUP: return check_netgroup(clp, hp); case MCL_ANONYMOUS: @@ -458,7 +509,8 @@ client_check(nfs_client *clp, struct hostent *hp) case MCL_GSS: return 0; default: - xlog(L_FATAL, "internal: bad client type %d", clp->m_type); + xlog(D_GENERAL, "%s: unrecognized client type: %d", + __func__, clp->m_type); } return 0;