From: Chuck Lever Date: Thu, 8 Apr 2010 15:01:14 +0000 (-0400) Subject: libexport.a: replace xlog(L_FATAL) in client_check() X-Git-Tag: nfs-utils-1-2-3-rc2~12 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=bf867b09201abb155b52e81aeb08757b2f7c6937;p=nfs-utils.git libexport.a: replace xlog(L_FATAL) in client_check() Clean up: Prevent the process from exiting in client_check(). Report bad m_type values, but return 0. This removes another site where a mountd or exportfs process can exit sideways. Signed-off-by: Chuck Lever Signed-off-by: Steve Dickson --- diff --git a/support/export/client.c b/support/export/client.c index bf2a359..aa28fcf 100644 --- a/support/export/client.c +++ b/support/export/client.c @@ -451,9 +451,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 +476,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;