summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-01-18 03:08:40 +0000
committerJeremy Allison <jra@samba.org>2002-01-18 03:08:40 +0000
commita0b86d4cd2b3654f5cbdb3458cc7a6ab9bfe2f6c (patch)
tree1c873e8e632c371cb0623d17418670bdc7639e06 /source3
parent1fb9ccc4e2a91bf7124fba076ffa5458a1cbf404 (diff)
downloadsamba-a0b86d4cd2b3654f5cbdb3458cc7a6ab9bfe2f6c.tar.gz
samba-a0b86d4cd2b3654f5cbdb3458cc7a6ab9bfe2f6c.tar.bz2
samba-a0b86d4cd2b3654f5cbdb3458cc7a6ab9bfe2f6c.zip
If 127.0.0.1 matches both allow & deny then allow. Patch from Steve Langasek vorlon@netexpress.net
Jeremy. (This used to be commit 478696e924a5e562965eb21841198c96500027c4)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/access.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/source3/lib/access.c b/source3/lib/access.c
index f59bf86057..c7ca164c39 100644
--- a/source3/lib/access.c
+++ b/source3/lib/access.c
@@ -190,8 +190,14 @@ BOOL allow_access(char **deny_list,char **allow_list,
/* if it is loopback then always allow unless specifically denied */
if (strcmp(caddr, "127.0.0.1") == 0) {
+ /*
+ * If 127.0.0.1 matches both allow and deny then allow.
+ * Patch from Steve Langasek vorlon@netexpress.net.
+ */
if (deny_list &&
- list_match(deny_list,(char *)client,client_match)) {
+ list_match(deny_list,(char *)client,client_match) &&
+ (!allow_list ||
+ !list_match(allow_list,(char *)client, client_match))) {
return False;
}
return True;