check_acl(): remove the fd argument - it is not used.

Host name and IP address are provided instead.

Michael

3 files changed, 3 insertions, 5 deletions

diff --git a/src/acl.c b/src/acl.c
index f5d06fb..1002332 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -331,13 +331,12 @@ check_numeric_acl (const struct acl_s *acl, const char *ip)
  *     0 if denied
  */
 int
-check_acl (int fd, const char *ip, const char *host)
+check_acl (const char *ip, const char *host)
 {
   struct acl_s *acl;
   int perm;
   size_t i;
 
-  assert (fd >= 0);
   assert (ip != NULL);
   assert (host != NULL);
 
diff --git a/src/acl.h b/src/acl.h
index 6ed2a61..5b41b2a 100644
--- a/src/acl.h
+++ b/src/acl.h
@@ -25,7 +25,6 @@ typedef enum
 { ACL_ALLOW, ACL_DENY } acl_access_t;
 
 extern int insert_acl (char *location, acl_access_t access_type);
-extern int check_acl (int fd, const char *ip_address,
-                      const char *string_address);
+extern int check_acl (const char *ip_address, const char *string_address);
 
 #endif
diff --git a/src/reqs.c b/src/reqs.c
index 5a46a28..0fc4778 100644
--- a/src/reqs.c
+++ b/src/reqs.c
@@ -1623,7 +1623,7 @@ handle_connection (int fd)
       return;
     }
 
-  if (check_acl (fd, peer_ipaddr, peer_string) <= 0)
+  if (check_acl (peer_ipaddr, peer_string) <= 0)
     {
       update_stats (STAT_DENIED);
       indicate_http_error (connptr, 403, "Access denied",