libexport.a: Allow client_init() to fail instead of exit

[nfs-utils.git] / support / export / client.c

diff --git a/support/export/client.c b/support/export/client.c
index bf2a35995a1d00536c74d0f9c1745549e05e6619..8f83da31526a6e1f21e59a7d8c9718703b4a5a79 100644 (file)
--- a/support/export/client.c
+++ b/support/export/client.c
@@ -30,12 +30,35 @@ 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,
+static int     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)
+{
+       xfree(clp->m_hostname);
+       xfree(clp);
+}
+
 /* 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
@@ -92,19 +115,18 @@ client_lookup(char *hname, int canonical)
                clp = (nfs_client *) xmalloc(sizeof(*clp));
                memset(clp, 0, sizeof(*clp));
                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);
 
@@ -121,12 +143,15 @@ client_dup(nfs_client *clp, struct hostent *hp)
        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
+static int
 client_init(nfs_client *clp, const char *hname, struct hostent *hp)
 {
        xfree(clp->m_hostname);
@@ -137,6 +162,7 @@ client_init(nfs_client *clp, const char *hname, struct hostent *hp)
 
        clp->m_exported = 0;
        clp->m_count = 0;
+       clp->m_naddr = 0;
 
        if (clp->m_type == MCL_SUBNETWORK) {
                char    *cp = strchr(clp->m_hostname, '/');
@@ -155,23 +181,17 @@ client_init(nfs_client *clp, const char *hname, struct hostent *hp)
                                        htonl ((uint32_t) ~0 << (32 - netmask));
                        }
                        else {
-                               xlog(L_FATAL, "invalid netmask `%s' for %s",
-                                    cp + 1, clp->m_hostname);
+                               xlog(L_ERROR, "invalid netmask `%s' for %s",
+                                            cp + 1, clp->m_hostname);
+                               return 0;
                        }
                }
                *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;
+               return 1;
        }
+       
+       init_addrlist(clp, hp);
+       return 1;
 }
 
 void
@@ -206,8 +226,7 @@ client_freeall(void)
                head = clientlist + i;
                while (*head) {
                        *head = (clp = *head)->m_next;
-                       xfree(clp->m_hostname);
-                       xfree(clp);
+                       client_free(clp);
                }
        }
 }
@@ -451,9 +470,13 @@ 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)
@@ -472,7 +495,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;