From ac73dff07a84b6532f67511828a72973b3817e62 Mon Sep 17 00:00:00 2001
From: Karl Heyes <karl@xiph.org>
Date: Sat, 21 Aug 2004 12:56:24 +0000
Subject: [PATCH] Add a couple of warnings, YP code not built and failed
 streamlist from master server

svn path=/icecast/trunk/icecast/; revision=7599
---
 src/slave.c | 8 ++++++++
 src/yp.h    | 4 +---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/slave.c b/src/slave.c
index dd6aece8..fb0e715b 100644
--- a/src/slave.c
+++ b/src/slave.c
@@ -358,6 +358,14 @@ static int update_from_master(ice_config_t *config)
         free(authheader);
         free(data);
 
+        if (sock_read_line(mastersock, buf, sizeof(buf)) == 0 ||
+                strncmp (buf, "HTTP/1.0 200", 12) != 0)
+        {
+            sock_close (mastersock);
+            WARN0 ("Master rejected streamlist request");
+            break;
+        }
+
         while (sock_read_line(mastersock, buf, sizeof(buf)))
         {
             if (!strlen(buf))
diff --git a/src/yp.h b/src/yp.h
index 87d590d9..25fddaf5 100644
--- a/src/yp.h
+++ b/src/yp.h
@@ -14,8 +14,6 @@
 #ifndef __YP_H__
 #define __YP_H__
 
-#include <stdio.h>
-
 #define  YP_SERVER_NAME 1
 #define  YP_SERVER_DESC 2
 #define  YP_SERVER_GENRE 3
@@ -43,7 +41,7 @@ void yp_shutdown();
 #define yp_remove(x)            do{}while(0)
 #define yp_touch(x)             do{}while(0)
 #define yp_recheck_config(x)    do{}while(0)
-#define yp_initialize()         do{}while(0)
+#define yp_initialize()         WARN0("YP server handling has been disabled")
 #define yp_shutdown()           do{}while(0)
 
 #endif /* USE_YP */