statd: Replace note() with xlog() in rpc.statd

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

diff --git a/utils/mountd/auth.c b/utils/mountd/auth.c
index a821c131bf3e3d494cbd556d594527f5380a95da..5a7ff8cd0fb81239eb5b717db3749bc7a665f196 100644 (file)
--- a/utils/mountd/auth.c
+++ b/utils/mountd/auth.c
@@ -57,7 +57,7 @@ auth_init(char *exports)
  * expense of larger kernel caches.
  */
 static void
-check_useipaddr()
+check_useipaddr(void)
 {
        nfs_client *clp;
        int old_use_ipaddr = use_ipaddr;
@@ -142,7 +142,7 @@ auth_authenticate_internal(char *what, struct sockaddr_in *caller,
 
                exp = NULL;
                for (i = 0; !exp && i < MCL_MAXTYPES; i++) 
-                       for (exp = exportlist[i]; exp; exp = exp->m_next) {
+                       for (exp = exportlist[i].p_head; exp; exp = exp->m_next) {
                                if (strcmp(path, exp->m_export.e_path))
                                        continue;
                                if (!use_ipaddr && !client_member(my_client.m_hostname, exp->m_client->m_hostname))
@@ -169,8 +169,7 @@ auth_authenticate_internal(char *what, struct sockaddr_in *caller,
                }
        }
        if (!(exp->m_export.e_flags & NFSEXP_INSECURE_PORT) &&
-                   (ntohs(caller->sin_port) <  IPPORT_RESERVED/2 ||
-                    ntohs(caller->sin_port) >= IPPORT_RESERVED)) {
+                    ntohs(caller->sin_port) >= IPPORT_RESERVED) {
                *error = illegal_port;
                return NULL;
        }
@@ -187,7 +186,7 @@ auth_authenticate(char *what, struct sockaddr_in *caller, char *path)
        char            *p = NULL;
        struct hostent  *hp = NULL;
        struct in_addr  addr = caller->sin_addr;
-       enum auth_error error;
+       enum auth_error error = bad_path;
 
        if (path [0] != '/') {
                xlog(L_WARNING, "bad path in %s request from %s: \"%s\"",
@@ -223,7 +222,7 @@ auth_authenticate(char *what, struct sockaddr_in *caller, char *path)
                break;
 
        case unknown_host:
-               xlog(L_WARNING, "%s request from unknown host %s for %s (%s)",
+               xlog(L_WARNING, "refused %s request from %s for %s (%s): unmatched host",
                     what, inet_ntoa(addr), path, epath);
                break;