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

Host name and IP address are provided instead.

Michael
This commit is contained in:
Michael Adam 2009-08-04 14:40:25 +02:00
parent 64ff313260
commit 14a3e187ee
3 changed files with 3 additions and 5 deletions

View File

@ -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);

View File

@ -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

View File

@ -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",