libexport.a: Allow malloc(3) failures in client_lookup() and friends

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

diff --git a/support/export/client.c b/support/export/client.c
index 859dcf1771dfdea480106d7b256cb5131d989e97..eafc2bfa6d79f3f5a532d23717a9a2df5c666a91 100644 (file)
--- a/support/export/client.c
+++ b/support/export/client.c
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <netdb.h>
-#include "xmalloc.h"
+
 #include "misc.h"
 #include "nfslib.h"
 #include "exportfs.h"
@@ -30,7 +30,7 @@ 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, };
@@ -55,8 +55,8 @@ init_addrlist(nfs_client *clp, const struct hostent *hp)
 static void
 client_free(nfs_client *clp)
 {
-       xfree(clp->m_hostname);
-       xfree(clp);
+       free(clp->m_hostname);
+       free(clp);
 }
 
 /* if canonical is set, then we *know* this is already a canonical name
@@ -111,17 +111,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)
                init_addrlist(clp, hp);
 
+out:
        if (hp)
                free (hp);
 
@@ -133,24 +139,27 @@ 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
+static int
 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_hostname = strdup(hname);
+       if (clp->m_hostname == NULL)
+               return 0;
 
        clp->m_exported = 0;
        clp->m_count = 0;
@@ -173,15 +182,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 = '/';
-               return;
+               return 1;
        }
        
        init_addrlist(clp, hp);
+       return 1;
 }
 
 void