From: Dan Breslau <dbreslau@painless-security.com>
Date: Fri, 5 May 2017 18:29:21 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/upstream_release_3_0_13' into tr-integ-fr-3... 
X-Git-Tag: moonshot_release_3_0_13~11
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=freeradius.git;a=commitdiff_plain;h=838285c175de17f13e9695ffc8c08225c565724d

Merge remote-tracking branch 'origin/upstream_release_3_0_13' into tr-integ-fr-3.0.13-upgrade

Merges the release_3_0_13 tag from upstream freeradius into a copy of the tr-integ branch.
---

838285c175de17f13e9695ffc8c08225c565724d
diff --cc raddb/mods-available/realm
index 5a69e26,36825e0..12073ed
--- a/raddb/mods-available/realm
+++ b/raddb/mods-available/realm
@@@ -32,9 -32,10 +32,10 @@@ realm suffix 
  	# The next 3 configuration items are valid ONLY
  	# for a trust-router.  For all other realms,
  	# they are ignored.
- 	trust_router = "localhost"
- 	rp_realm = "painless-security.com"
- 	default_community = "apc.moonshot.ja.net"
+ #	trust_router = "localhost"
+ #	tr_port = 12309
 -#	rp_realm = "painless-security.com"
 -#	default_community = "apc.moonshot.ja.net"
++#	rp_realm = "realm.example.com"
++#	default_community = "apc.communities.example.com"
  }
  
  #  'username%realm'