From 5fa7ea8434275fe42742424c64060f0773431fa0 Mon Sep 17 00:00:00 2001
From: krstork <36725708+krstork@users.noreply.github.com>
Date: Fri, 23 Feb 2018 17:59:40 -0600
Subject: [PATCH] Update {$mac}.xml (#3006)

Fixed NAT and LDAP settings
---
 .../provision/grandstream/gxp2170/{$mac}.xml  | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
index 0b3c1679a0..294206aef3 100644
--- a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
@@ -3,7 +3,7 @@
 <gs_provision version="1">
 <mac>{$mac|replace:'-':''}</mac>
 <config version="1">
-<!-- ########################################################################################## -->
+<!-- ########################################################################################## -->
 <!-- ## Configuration Template For GXP2130/2140/2160/2170/2135 Firmware Version 1.0.9.26     ## -->
 <!-- ########################################################################################## -->
 
@@ -102,8 +102,8 @@
 <!-- # NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0. -->
 <!-- # Number: 0, 1, 2, 3, 4, 5 -->
 <!-- # Mandatory -->
-{if isset($nat_traversal_1) }
-<P52>{$nat_traversal_1}</P52>
+{if isset($grandstream_nat_traversal_1) }
+<P52>{$grandstream_nat_traversal_1}</P52>
 {else}
 <P52>0</P52>
 {/if}
@@ -935,8 +935,8 @@
 <!-- # NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0 -->
 <!-- # Number: 0, 1, 2, 3, 4, 5 -->
 <!-- # Mandatory -->
-{if isset($nat_traversal_2) }
-<P414>{$nat_traversal_2}</P414>
+{if isset($grandstream_nat_traversal_2) }
+<P414>{$grandstream_nat_traversal_2}</P414>
 {else}
 <P414>0</P414>
 {/if}
@@ -1767,8 +1767,8 @@
 <!-- # NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0 -->
 <!-- # Number: 0, 1, 2, 3, 4, 5 -->
 <!-- # Mandatory -->
-{if isset($nat_traversal_3) }
-<P514>{$nat_traversal_3}</P514>
+{if isset($grandstream_nat_traversal_3) }
+<P514>{$grandstream_nat_traversal_3}</P514>
 {else}
 <P514>0</P514>
 {/if}
@@ -2599,8 +2599,8 @@
 <!-- # NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0 -->
 <!-- # Number: 0, 1, 2, 3, 4, 5 -->
 <!-- # Mandatory -->
-{if isset($nat_traversal_4) }
-<P614>{$nat_traversal_4}</P614>
+{if isset($grandstream_nat_traversal_4) }
+<P614>{$grandstream_nat_traversal_4}</P614>
 {else}
 <P614>0</P614>
 {/if}
@@ -3433,8 +3433,8 @@
 <!-- # NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0 -->
 <!-- # Number: 0, 1, 2, 3, 4, 5 -->
 <!-- # Mandatory -->
-{if isset($nat_traversal_5) }
-<P1714>{$nat_traversal_5}</P1714>
+{if isset($grandstream_nat_traversal_5) }
+<P1714>{$grandstream_nat_traversal_5}</P1714>
 {else}
 <P1714>0</P1714>
 {/if}
@@ -4266,8 +4266,8 @@
 <!-- # NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0 -->
 <!-- # Number: 0, 1, 2, 3, 4, 5 -->
 <!-- # Mandatory -->
-{if isset($nat_traversal_6) }
-<P1814>{$nat_traversal_6}</P1814>
+{if isset($grandstream_nat_traversal_6) }
+<P1814>{$grandstream_nat_traversal_6}</P1814>
 {else}
 <P1814>0</P1814>
 {/if}
@@ -5867,7 +5867,7 @@
 
 <!-- # LDAP Display Name. The entry information to be shown on phone LCD. Grandstream phones will display up to 3 fields -->
 <!-- # String -->
-<P8030>givenName sn title</P8030>
+<P8030>{$grandstream_ldap_display_name}</P8030>
 
 <!-- # Max Hits. The setting specifies the maximum number of results to be returned by the LDAP server -->
 <!-- # If the value is set to 0, server will return all search results. Default is 50 -->