From: Amos Jeffries Date: Fri, 30 Jun 2017 05:47:19 +0000 (+1200) Subject: ext_file_userip_acl: merge 'deny all' example into example.conf file X-Git-Tag: M-staged-PR71~87 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4afa03fe94fa66b9c4116e0eadb005e14626f9c;p=thirdparty%2Fsquid.git ext_file_userip_acl: merge 'deny all' example into example.conf file --- diff --git a/src/acl/external/file_userip/Makefile.am b/src/acl/external/file_userip/Makefile.am index f3dd928063..33503d05a5 100644 --- a/src/acl/external/file_userip/Makefile.am +++ b/src/acl/external/file_userip/Makefile.am @@ -19,6 +19,5 @@ ext_file_userip_acl_LDADD= \ EXTRA_DIST = \ example.conf \ - example-deny_all_but.conf \ ext_file_userip_acl.8 \ required.m4 diff --git a/src/acl/external/file_userip/example-deny_all_but.conf b/src/acl/external/file_userip/example-deny_all_but.conf deleted file mode 100644 index a5280b0e43..0000000000 --- a/src/acl/external/file_userip/example-deny_all_but.conf +++ /dev/null @@ -1,2 +0,0 @@ -192.168.1.0/255.255.255.0 diniz -0.0.0.0/0.0.0.0 NONE diff --git a/src/acl/external/file_userip/example.conf b/src/acl/external/file_userip/example.conf index 377d3c81a0..dd6aa1c7c0 100644 --- a/src/acl/external/file_userip/example.conf +++ b/src/acl/external/file_userip/example.conf @@ -43,3 +43,8 @@ # # Users of the "tol" group may authenticate from their VLAN # 10.0.0.0/255.255.0.0 @tol +# +# User "diniz" may authenticate from the LAN, but deny all others +# 192.168.1.0/255.255.255.0 diniz +# 0.0.0.0/0.0.0.0 NONE +