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 f3dd928063ec281c732a7063e7b1466a29eaf50e..33503d05a560ed1066e6e56014563c6b3d0626d7 100644 (file)
--- 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 (file)
index a5280b0..0000000
--- 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 377d3c81a077b5db2284756fca49a5b90dff79ef..dd6aa1c7c037755959e5099c405f65a166649a82 100644 (file)
--- 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
+