From 759f55b35b8fc7cbda0d8878bdafbcfd5e680ec9 Mon Sep 17 00:00:00 2001
From: "Thomas B. \"dm8tbr\" Ruecker" <thomas@ruecker.fi>
Date: Fri, 25 Nov 2011 22:41:54 +0000
Subject: [PATCH] Added 'admin' and 'location' to default config, thus fixing
 #1839.

svn path=/icecast/trunk/icecast/; revision=18129
---
 ChangeLog           | 18 ++++++++++++++++--
 conf/icecast.xml.in |  6 ++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 46ee6b38..96cd4c74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2011-11-25 23:17  ph3-der-loewe
+2011-11-25 22:37  dm8tbr
+
+	* trunk/icecast/conf/icecast.xml.in:
+	  Added 'admin' and 'location' to default config, thus fixing
+	  #1839.
+
+2011-11-25 22:17  ph3-der-loewe
 
 	* trunk/icecast/src/cfgfile.c, trunk/icecast/conf/icecast.xml.in,
 	  trunk/icecast/conf/icecast_urlauth.xml.in,
@@ -6,12 +12,20 @@
 	  to use destination="" not dest="". The old dest="" attribute
 	  is still supported.
 
+2011-11-25 22:11  dm8tbr
+
+	* trunk/icecast/src/cfgfile.c trunk/icecast/src/cfgfile.h
+	  trunk/icecast/src/connection.c:
+          Applied justdave's patches, fixing #1717 and #1718.
+	  HTTPS now with better security and support for chained
+          certificates.
+
 2011-11-25 21:20  ph3-der-loewe
 
 	* trunk/icecast/AUTHORS, trunk/icecast/src/cfgfile.c.
 	  trunk/icecast/src/connection.c: Allow the source password
 	  to be undefined. This is to avoid falling back to a default
-	  password which may open security holes.
+	  password which would be a security problem. Fixing #1846
 
 ----------------------------------------------------------------------
 	Everything above is post 2.3.2. The stuff below is incomplete.
diff --git a/conf/icecast.xml.in b/conf/icecast.xml.in
index ac6a8f42..b1255443 100644
--- a/conf/icecast.xml.in
+++ b/conf/icecast.xml.in
@@ -1,4 +1,10 @@
 <icecast>
+    <!-- location and admin are two arbitrary strings that are e.g. visible
+         on the server info page of the icecast web interface
+         (server_version.xsl). -->
+    <location>Earth<location>
+    <admin>icemaster@localhost</admin>
+
     <limits>
         <clients>100</clients>
         <sources>2</sources>