From e157de232137674292af4b4abbb4f6f47c7ad5bc Mon Sep 17 00:00:00 2001
From: Philipp Schafft <lion@lion.leolix.org>
Date: Fri, 25 Nov 2011 22:22:48 +0000
Subject: [PATCH] Updated <alias> to use destination="" not dest="". The old
 dest="" attribute is still supported.

svn path=/icecast/trunk/icecast/; revision=18128
---
 ChangeLog                   | 8 ++++++++
 conf/icecast.xml.in         | 4 ++--
 conf/icecast_minimal.xml.in | 2 +-
 conf/icecast_urlauth.xml.in | 2 +-
 src/cfgfile.c               | 4 +++-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 90a85ffa..46ee6b38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-11-25 23:17  ph3-der-loewe
+
+	* trunk/icecast/src/cfgfile.c, trunk/icecast/conf/icecast.xml.in,
+	  trunk/icecast/conf/icecast_urlauth.xml.in,
+	  trunk/icecast/conf/icecast_minimal.xml.in: Updated <alias>
+	  to use destination="" not dest="". The old dest="" attribute
+	  is still supported.
+
 2011-11-25 21:20  ph3-der-loewe
 
 	* trunk/icecast/AUTHORS, trunk/icecast/src/cfgfile.c.
diff --git a/conf/icecast.xml.in b/conf/icecast.xml.in
index 4e50a9e5..ac6a8f42 100644
--- a/conf/icecast.xml.in
+++ b/conf/icecast.xml.in
@@ -139,13 +139,13 @@
              and "bind-address" attributes.
           -->
         <!--
-        <alias source="/foo" dest="/bar"/>
+        <alias source="/foo" destination="/bar"/>
           -->
         <!-- Aliases: can also be used for simple redirections as well,
              this example will redirect all requests for http://server:port/ to
              the status page
           -->
-        <alias source="/" dest="/status.xsl"/>
+        <alias source="/" destination="/status.xsl"/>
     </paths>
 
     <logging>
diff --git a/conf/icecast_minimal.xml.in b/conf/icecast_minimal.xml.in
index dc584c08..df2ad551 100644
--- a/conf/icecast_minimal.xml.in
+++ b/conf/icecast_minimal.xml.in
@@ -25,7 +25,7 @@
         <logdir>@localstatedir@/log/@PACKAGE@</logdir>
         <webroot>@pkgdatadir@/web</webroot>
         <adminroot>@pkgdatadir@/admin</adminroot>
-        <alias source="/" dest="/status.xsl"/>
+        <alias source="/" destination="/status.xsl"/>
     </paths>
     <logging>
         <accesslog>access.log</accesslog>
diff --git a/conf/icecast_urlauth.xml.in b/conf/icecast_urlauth.xml.in
index 9a1044d1..ef4a4fde 100644
--- a/conf/icecast_urlauth.xml.in
+++ b/conf/icecast_urlauth.xml.in
@@ -34,7 +34,7 @@
         <logdir>@localstatedir@/log/@PACKAGE@</logdir>
         <webroot>@pkgdatadir@/web</webroot>
         <adminroot>@pkgdatadir@/admin</adminroot>
-        <alias source="/" dest="/status.xsl"/>
+        <alias source="/" destination="/status.xsl"/>
     </paths>
     <logging>
         <accesslog>access.log</accesslog>
diff --git a/src/cfgfile.c b/src/cfgfile.c
index 730f51d2..8a0c959d 100644
--- a/src/cfgfile.c
+++ b/src/cfgfile.c
@@ -986,7 +986,9 @@ static void _parse_paths(xmlDocPtr doc, xmlNodePtr node,
                 free(alias);
                 continue;
             }
-            alias->destination = (char *)xmlGetProp(node, XMLSTR("dest"));
+            alias->destination = (char *)xmlGetProp(node, XMLSTR("destination"));
+            if (!alias->destination)
+                alias->destination = (char *)xmlGetProp(node, XMLSTR("dest"));
             if(alias->destination == NULL) {
                 xmlFree(alias->source);
                 free(alias);