mountd: auth.c no longer needs #include xmalloc.h

[nfs-utils.git] / utils / mountd / auth.c

diff --git a/utils/mountd/auth.c b/utils/mountd/auth.c
index 688bf78411808cff236c67415e402bf12dd1d479..330cab531ea5b7832c987b8824b3200f392650a7 100644 (file)
--- a/utils/mountd/auth.c
+++ b/utils/mountd/auth.c
@@ -10,10 +10,12 @@
 #include <config.h>
 #endif
 
+#include <sys/types.h>
 #include <sys/stat.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <unistd.h>
 
 #include "sockaddr.h"
@@ -21,7 +23,6 @@
 #include "nfslib.h"
 #include "exportfs.h"
 #include "mountd.h"
-#include "xmalloc.h"
 #include "v4root.h"
 
 enum auth_error
@@ -112,15 +113,23 @@ auth_reload()
        return counter;
 }
 
+static char *get_client_ipaddr_name(const struct sockaddr *caller)
+{
+       char buf[INET6_ADDRSTRLEN + 1];
+
+       buf[0] = '$';
+       host_ntop(caller, buf + 1, sizeof(buf) - 1);
+       return strdup(buf);
+}
+
 static char *
 get_client_hostname(const struct sockaddr *caller, struct addrinfo *ai,
                enum auth_error *error)
 {
-       char buf[INET6_ADDRSTRLEN];
        char *n;
 
        if (use_ipaddr)
-               return strdup(host_ntop(caller, buf, sizeof(buf)));
+               return get_client_ipaddr_name(caller);
        n = client_compose(ai);
        *error = unknown_host;
        if (!n)
@@ -143,7 +152,7 @@ bool namelist_client_matches(nfs_export *exp, char *dom)
 
 bool client_matches(nfs_export *exp, char *dom, struct addrinfo *ai)
 {
-       if (use_ipaddr)
+       if (is_ipaddr_client(dom))
                return ipaddr_client_matches(exp, ai);
        return namelist_client_matches(exp, dom);
 }