libexport.a: Reduce code duplication in client_init()

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

diff --git a/support/export/client.c b/support/export/client.c
index bf2a35995a1d00536c74d0f9c1745549e05e6619..e06c874bca15b5b831745df0257be3519627eda8 100644 (file)
--- a/support/export/client.c
+++ b/support/export/client.c
@@ -137,6 +137,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, '/');
@@ -160,10 +161,10 @@ client_init(nfs_client *clp, const char *hname, struct hostent *hp)
                        }
                }
                *cp = '/';
-               clp->m_naddr = 0;
-       } else if (!hp) {
-               clp->m_naddr = 0;
-       } else {
+               return;
+       }
+
+       if (hp) {
                char    **ap = hp->h_addr_list;
                int     i;
 
@@ -451,9 +452,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 +477,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;