libexport.a: replace xlog(L_FATAL) in client_check()

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

diff --git a/support/export/client.c b/support/export/client.c
index 42bf45ad5724468c0f23beb33e27c839da909957..aa28fcfb7f6074fc2ff531f76954350090da7014 100644 (file)
--- a/support/export/client.c
+++ b/support/export/client.c
@@ -32,7 +32,6 @@ extern int    innetgr(char *netgr, char *host, char *, char *);
 static char    *add_name(char *old, const char *add);
 static void    client_init(nfs_client *clp, const char *hname,
                                        struct hostent *hp);
-static int     client_checkaddr(nfs_client *clp, struct in_addr addr);
 
 nfs_client     *clientlist[MCL_MAXTYPES] = { NULL, };
 
@@ -372,88 +371,118 @@ check_subnetwork(const nfs_client *clp, const struct hostent *hp)
 }
 
 /*
- * Match a host (given its hostent record) to a client record. This
- * is usually called from mountd.
+ * 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.
+ */
+#ifdef HAVE_INNETGR
+static int
+check_netgroup(const nfs_client *clp, const struct hostent *hp)
+{
+       const char *netgroup = clp->m_hostname + 1;
+       const char *hname = hp->h_name;
+       struct hostent *nhp = NULL;
+       struct sockaddr_in addr;
+       int match, i;
+       char *dot;
+
+       /* First, try to match the hostname without
+        * splitting off the domain */
+       if (innetgr(netgroup, hname, NULL, NULL))
+               return 1;
+
+       /* See if hname aliases listed in /etc/hosts or nis[+]
+        * match the requested netgroup */
+       for (i = 0; hp->h_aliases[i]; i++) {
+               if (innetgr(netgroup, hp->h_aliases[i], NULL, NULL))
+                       return 1;
+       }
+
+       /* If hname is ip address convert to FQDN */
+       if (inet_aton(hname, &addr.sin_addr) &&
+          (nhp = gethostbyaddr((const char *)&(addr.sin_addr),
+           sizeof(addr.sin_addr), AF_INET))) {
+               hname = nhp->h_name;
+               if (innetgr(netgroup, hname, NULL, NULL))
+                       return 1;
+       }
+
+       /* Okay, strip off the domain (if we have one) */
+       dot = strchr(hname, '.');
+       if (dot == NULL)
+               return 0;
+
+       *dot = '\0';
+       match = innetgr(netgroup, hname, NULL, NULL);
+       *dot = '.';
+
+       return match;
+}
+#else  /* !HAVE_INNETGR */
+static int
+check_netgroup(__attribute__((unused)) const nfs_client *clp,
+               __attribute__((unused)) const struct hostent *hp)
+{
+       return 0;
+}
+#endif /* !HAVE_INNETGR */
+
+/**
+ * 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:
-#ifdef HAVE_INNETGR
-               {
-                       char    *dot;
-                       int     match, i;
-                       struct hostent *nhp = NULL;
-                       struct sockaddr_in addr;
-
-                       /* First, try to match the hostname without
-                        * splitting off the domain */
-                       if (innetgr(cname+1, hname, NULL, NULL))
-                               return 1;
-
-                       /* try the aliases as well */
-                       for (i = 0; hp->h_aliases[i]; i++) {
-                               if (innetgr(cname+1, hp->h_aliases[i], NULL, NULL))
-                                       return 1;
-                       }
-
-                       /* If hname is ip address convert to FQDN */
-                       if (inet_aton(hname, &addr.sin_addr) &&
-                          (nhp = gethostbyaddr((const char *)&(addr.sin_addr),
-                           sizeof(addr.sin_addr), AF_INET))) {
-                               hname = (char *)nhp->h_name;
-                               if (innetgr(cname+1, hname, NULL, NULL))
-                                       return 1;
-                       }
-
-                       /* Okay, strip off the domain (if we have one) */
-                       if ((dot = strchr(hname, '.')) == NULL)
-                               return 0;
-
-                       *dot = '\0';
-                       match = innetgr(cname+1, hname, NULL, NULL);
-                       *dot = '.';
-
-                       return match;
-               }
-#else
-               return 0;
-#endif
+               return check_netgroup(clp, hp);
        case MCL_ANONYMOUS:
                return 1;
        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;
 }
 
-static int
-client_checkaddr(nfs_client *clp, struct in_addr addr)
-{
-       return 0;
-}
-
 int
 client_gettype(char *ident)
 {