libexport.a: Remove dead code

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

diff --git a/support/export/client.c b/support/export/client.c
index 3884795c0f58e12147ec443947753ad620c9961c..f8c84de32178ba7c6b685aeb0f8c3dacdf927ff7 100644 (file)
--- a/support/export/client.c
+++ b/support/export/client.c
@@ -6,13 +6,16 @@
  * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 #include <netdb.h>
 #include "xmalloc.h"
 #include "misc.h"
@@ -115,6 +118,7 @@ client_dup(nfs_client *clp, struct hostent *hp)
        new = (nfs_client *) xmalloc(sizeof(*new));
        memcpy(new, clp, sizeof(*new));
        new->m_type = MCL_FQDN;
+       new->m_hostname = NULL;
 
        client_init(new, (char *) hp->h_name, hp);
        client_add(new);
@@ -124,21 +128,20 @@ client_dup(nfs_client *clp, struct hostent *hp)
 static void
 client_init(nfs_client *clp, const char *hname, struct hostent *hp)
 {
-       if (hp) {
-               strncpy(clp->m_hostname, hp->h_name,
-                       sizeof (clp->m_hostname) -  1);
-       } else {
-               strncpy(clp->m_hostname, hname,
-                       sizeof (clp->m_hostname) - 1);
-       }
-       clp->m_hostname[sizeof (clp->m_hostname) - 1] = '\0';
+       xfree(clp->m_hostname);
+       if (hp)
+               clp->m_hostname = xstrdup(hp->h_name);
+       else
+               clp->m_hostname = xstrdup(hname);
 
        clp->m_exported = 0;
        clp->m_count = 0;
 
        if (clp->m_type == MCL_SUBNETWORK) {
                char    *cp = strchr(clp->m_hostname, '/');
+               static char slash32[] = "/32";
 
+               if(!cp) cp = slash32;
                *cp = '\0';
                clp->m_addrlist[0].s_addr = inet_addr(clp->m_hostname);
                if (strchr(cp + 1, '.')) {
@@ -202,31 +205,23 @@ client_freeall(void)
                head = clientlist + i;
                while (*head) {
                        *head = (clp = *head)->m_next;
+                       xfree(clp->m_hostname);
                        xfree(clp);
                }
        }
 }
 
-nfs_client *
-client_find(struct hostent *hp)
+struct hostent *
+client_resolve(struct in_addr addr)
 {
-       nfs_client      *clp;
-       int             i;
+       struct hostent *he = NULL;
 
-       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;
+       if (clientlist[MCL_WILDCARD] || clientlist[MCL_NETGROUP])
+               he = get_reliable_hostbyaddr((const char*)&addr, sizeof(addr), AF_INET);
+       if (he == NULL)
+               he = get_hostent((const char*)&addr, sizeof(addr), AF_INET);
+
+       return he;
 }
 
 /*
@@ -238,17 +233,11 @@ client_find(struct hostent *hp)
 static char *add_name(char *old, char *add);
 
 char *
-client_compose(struct in_addr addr)
+client_compose(struct hostent *he)
 {
-       struct hostent *he = NULL;
        char *name = NULL;
        int i;
 
-       if (clientlist[MCL_WILDCARD] || clientlist[MCL_NETGROUP])
-               he = get_reliable_hostbyaddr((const char*)&addr, sizeof(addr), AF_INET);
-       if (he == NULL)
-               he = get_hostent((const char*)&addr, sizeof(addr), AF_INET);
-
        for (i = 0 ; i < MCL_MAXTYPES; i++) {
                nfs_client      *clp;
                for (clp = clientlist[i]; clp ; clp = clp->m_next) {
@@ -260,11 +249,11 @@ client_compose(struct in_addr addr)
        return name;
 }
 
-int 
+int
 client_member(char *client, char *name)
 {
        /* check if "client" (a ',' separated list of names)
-        * contains 'name' as a member 
+        * contains 'name' as a member
         */
        int l = strlen(name);
        while (*client) {
@@ -280,13 +269,13 @@ client_member(char *client, char *name)
 }
 
 
-int 
+int
 name_cmp(char *a, 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;
@@ -324,6 +313,7 @@ add_name(char *old, char *add)
                strcat(new, ",");
                strcat(new, cp);
        }
+       free(old);
        return new;
 }
 
@@ -359,7 +349,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;
 
@@ -368,6 +358,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),
@@ -443,5 +439,12 @@ client_gettype(char *ident)
                if (*sp == '\\' && sp[1])
                        sp++;
        }
-       return MCL_FQDN;
+       /* check for N.N.N.N */
+       sp = ident;
+       if(!isdigit(*sp) || strtoul(sp, &sp, 10) > 255 || *sp != '.') return MCL_FQDN;
+       sp++; if(!isdigit(*sp) || strtoul(sp, &sp, 10) > 255 || *sp != '.') return MCL_FQDN;
+       sp++; if(!isdigit(*sp) || strtoul(sp, &sp, 10) > 255 || *sp != '.') return MCL_FQDN;
+       sp++; if(!isdigit(*sp) || strtoul(sp, &sp, 10) > 255 || *sp != '\0') return MCL_FQDN;
+       /* we lie here a bit. but technically N.N.N.N == N.N.N.N/32 :) */
+       return MCL_SUBNETWORK;
 }