From 5252a14068e5fbfaa4e5a298ec6339d6f70a7248 Mon Sep 17 00:00:00 2001
From: Michael Smith <msmith@xiph.org>
Date: Sun, 2 Mar 2003 10:36:24 +0000
Subject: [PATCH] Fix various minor bugs in per-mountpoint configs.

svn path=/trunk/icecast/; revision=4385
---
 src/config.c     | 2 ++
 src/connection.c | 7 ++++---
 src/source.c     | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/config.c b/src/config.c
index 52c9f006..c65525cc 100644
--- a/src/config.c
+++ b/src/config.c
@@ -361,6 +361,8 @@ static void _parse_mount(xmlDocPtr doc, xmlNodePtr node)
     else
         _configuration.mounts = mount;
 
+    mount->max_listeners = -1;
+
 	do {
 		if (node == NULL) break;
 		if (xmlIsBlankNode(node)) continue;
diff --git a/src/connection.c b/src/connection.c
index 52f1e14f..d5355ab0 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -434,8 +434,10 @@ static int _check_source_pass(http_parser_t *parser, char *mount)
     mount_proxy *mountinfo = config_get_config()->mounts;
     while(mountinfo) {
         if(!strcmp(mountinfo->mountname, mount)) {
-            pass = mountinfo->password;
-            user = mountinfo->username;
+            if(mountinfo->password)
+                pass = mountinfo->password;
+            if(mountinfo->username)
+                user = mountinfo->username;
             break;
         }
         mountinfo = mountinfo->next;
@@ -803,7 +805,6 @@ static void _handle_get_request(connection_t *con,
             return;
         }
 		global.clients++;
-        source->listeners++;
 		global_unlock();
 						
         client->format_data = source->format->create_client_data(
diff --git a/src/source.c b/src/source.c
index b8274cab..ad96bbb3 100644
--- a/src/source.c
+++ b/src/source.c
@@ -74,6 +74,7 @@ source_t *source_create(client_t *client, connection_t *con,
     src->running = 1;
 	src->num_yp_directories = 0;
 	src->listeners = 0;
+    src->max_listeners = -1;
     src->send_return = 0;
     src->dumpfilename = NULL;
     src->dumpfile = NULL;