From c9fec23c45777fe0e88a2a7685e6be02b8b07a37 Mon Sep 17 00:00:00 2001
From: Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com>
Date: Fri, 19 Dec 2014 13:23:13 +0200
Subject: [PATCH] raddb: Comment on ipaddr/ipv4addr/ipv6addr use

Describe combined ipaddr/ipv4addr/ipv6addr use in
raddb/sites-available/default.

Resolves: Bug#1168247
---
 ...ment-on-ipaddr-ipv4addr-ipv6addr-use.patch | 49 +++++++++++++++++++
 freeradius.spec                               |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 freeradius-raddb-Comment-on-ipaddr-ipv4addr-ipv6addr-use.patch

diff --git a/freeradius-raddb-Comment-on-ipaddr-ipv4addr-ipv6addr-use.patch b/freeradius-raddb-Comment-on-ipaddr-ipv4addr-ipv6addr-use.patch
new file mode 100644
index 0000000..5f36338
--- /dev/null
+++ b/freeradius-raddb-Comment-on-ipaddr-ipv4addr-ipv6addr-use.patch
@@ -0,0 +1,49 @@
+From 40537a80edeba25853df745e969f1b0bd5bc71bf Mon Sep 17 00:00:00 2001
+From: Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com>
+Date: Thu, 18 Dec 2014 16:13:58 +0200
+Subject: [PATCH 1/1] raddb: Comment on ipaddr/ipv4addr/ipv6addr use
+
+Describe combined ipaddr/ipv4addr/ipv6addr use in
+raddb/sites-available/default.
+---
+ raddb/sites-available/default | 21 +++++++++++++--------
+ 1 file changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/raddb/sites-available/default b/raddb/sites-available/default
+index 77c271c..77602e4 100644
+--- a/raddb/sites-available/default
++++ b/raddb/sites-available/default
+@@ -84,17 +84,22 @@ listen {
+ 	#  source IP address for packets sent to a home server, the
+ 	#  proxy listeners are automatically created.
+ 
+-	#  IP address on which to listen.
++	#  ipaddr/ipv4addr/ipv6addr - IP address on which to listen.
++	#  Out of several options the first one will be used.
++	#
+ 	#  Allowed values are:
+-	#	dotted quad (1.2.3.4)
+-	#       hostname    (radius.example.com)
+-	#       wildcard    (*)
++	#	IPv4 address (e.g. 1.2.3.4, for ipv4addr/ipaddr)
++	#	IPv6 address (e.g. 2001:db8::1, for ipv6addr/ipaddr)
++	#	hostname     (radius.example.com,
++	#			A record for ipv4addr,
++	#       		AAAA record for ipv6addr,
++	#			A or AAAA record for ipaddr)
++	#       wildcard     (*)
++	#
++	# ipv4addr = *
++	# ipv6addr = *
+ 	ipaddr = *
+ 
+-	#  OR, you can use an IPv6 address, but not both
+-	#  at the same time.
+-#	ipv6addr = ::	# any.  ::1 == localhost
+-
+ 	#  Port on which to listen.
+ 	#  Allowed values are:
+ 	#	integer port number (1812)
+-- 
+2.1.3
+
diff --git a/freeradius.spec b/freeradius.spec
index 09324c1..1aa1877 100644
--- a/freeradius.spec
+++ b/freeradius.spec
@@ -51,6 +51,7 @@ Patch27: freeradius-dhcpclient-Add-a-short-description-to-help-output.patch
 Patch28: freeradius-raddb-Move-trigger.conf-INCLUDE-before-modules.patch
 Patch29: freeradius-Resolve-to-all-families-on-ip_hton-fallback.patch
 Patch30: freeradius-Don-t-overwrite-ip_hton-af-prefix-in-fr_pton4-6.patch
+Patch31: freeradius-raddb-Comment-on-ipaddr-ipv4addr-ipv6addr-use.patch
 
 %global docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
 
@@ -237,6 +238,7 @@ This plugin provides the unixODBC support for the FreeRADIUS server project.
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
 
 %build
 # Force compile/link options, extra security for network facing daemon