X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmountd%2Fauth.c;h=5a7ff8cd0fb81239eb5b717db3749bc7a665f196;hp=3c9a89a94dcdc7de5f76e175909ebf770c0d3304;hb=9ccfe0fa5a43dfc4453b09e328565a6c8f999fe4;hpb=f461e3348ef3a9e1713fe04ccaa1b88dc0530946 diff --git a/utils/mountd/auth.c b/utils/mountd/auth.c index 3c9a89a..5a7ff8c 100644 --- a/utils/mountd/auth.c +++ b/utils/mountd/auth.c @@ -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;