libexport.a: Clean up client_compose() and client_member()

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

diff --git a/support/export/client.c b/support/export/client.c
index 1cb242f33fa62b993695df7c8623c7d9d9318a45..5e937b0adac158b6e781182b409882d141526b7b 100644 (file)
--- a/support/export/client.c
+++ b/support/export/client.c
@@ -28,6 +28,8 @@
 #if !defined(__GLIBC__) || __GLIBC__ < 2
 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,
                                        struct hostent *hp);
 static int     client_checkaddr(nfs_client *clp, struct in_addr addr);
@@ -211,28 +213,6 @@ client_freeall(void)
        }
 }
 
-nfs_client *
-client_find(struct hostent *hp)
-{
-       nfs_client      *clp;
-       int             i;
-
-       for (i = 0; i < MCL_MAXTYPES; i++) {
-               for (clp = clientlist[i]; clp; clp = clp->m_next) {
-                       if (!client_check(clp, hp))
-                               continue;
-#ifdef notdef
-                       if (clp->m_type == MCL_FQDN)
-                               return clp;
-                       return client_dup(clp, hp);
-#else
-                       return clp;
-#endif
-               }
-       }
-       return NULL;
-}
-
 struct hostent *
 client_resolve(struct in_addr addr)
 {
@@ -246,14 +226,18 @@ client_resolve(struct in_addr addr)
        return he;
 }
 
-/*
- * Find client name given an IP address
- * This is found by gathering all known names that match that IP address,
- * sorting them and joining them with '+'
+/**
+ * client_compose - Make a list of cached hostnames that match an IP address
+ * @he: pointer to hostent containing IP address information to match
+ *
+ * Gather all known client hostnames that match the IP address, and sort
+ * the result into a comma-separated list.
  *
+ * Returns a '\0'-terminated ASCII string containing a comma-separated
+ * sorted list of client hostnames, or NULL if no client records matched
+ * the IP address or memory could not be allocated.  Caller must free the
+ * returned string with free(3).
  */
-static char *add_name(char *old, char *add);
-
 char *
 client_compose(struct hostent *he)
 {
@@ -271,13 +255,19 @@ client_compose(struct hostent *he)
        return name;
 }
 
+/**
+ * client_member - check if @name is contained in the list @client
+ * @client: '\0'-terminated ASCII string containing
+ *             comma-separated list of hostnames
+ * @name: '\0'-terminated ASCII string containing hostname to look for
+ *
+ * Returns 1 if @name was found in @client, otherwise zero is returned.
+ */
 int
-client_member(char *client, char *name)
+client_member(const char *client, const char *name)
 {
-       /* check if "client" (a ',' separated list of names)
-        * contains 'name' as a member
-        */
-       int l = strlen(name);
+       size_t l = strlen(name);
+
        while (*client) {
                if (strncmp(client, name, l) == 0 &&
                    (client[l] == ',' || client[l] == '\0'))
@@ -290,14 +280,13 @@ client_member(char *client, char *name)
        return 0;
 }
 
-
-int
-name_cmp(char *a, char *b)
+static int
+name_cmp(const char *a, const char *b)
 {
        /* compare strings a and b, but only upto ',' in a */
        while (*a && *b && *a != ',' && *a == *b)
                a++, b++;
-       if (!*b && (!*a || !a == ',') )
+       if (!*b && (!*a || *a == ','))
                return 0;
        if (!*b) return 1;
        if (!*a || *a == ',') return -1;
@@ -305,9 +294,9 @@ name_cmp(char *a, char *b)
 }
 
 static char *
-add_name(char *old, char *add)
+add_name(char *old, const char *add)
 {
-       int len = strlen(add)+2;
+       size_t len = strlen(add) + 2;
        char *new;
        char *cp;
        if (old) len += strlen(old);
@@ -371,7 +360,7 @@ client_check(nfs_client *clp, struct hostent *hp)
 #ifdef HAVE_INNETGR
                {
                        char    *dot;
-                       int     match;
+                       int     match, i;
                        struct hostent *nhp = NULL;
                        struct sockaddr_in addr;
 
@@ -380,6 +369,12 @@ client_check(nfs_client *clp, struct hostent *hp)
                        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),