[xiph-cvs] cvs commit: icecast/src connection.c

[Michael Smith]

msmith      02/10/10 04:50:58

  Modified:    src      connection.c
  Log:
  Allow icelogin to coexist with http login. icelogin is still deprecated,
  and now a warning is issued.

Revision  Changes    Path
1.29      +10 -4     icecast/src/connection.c

Index: connection.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/connection.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- connection.c	18 Aug 2002 08:49:25 -0000	1.28
+++ connection.c	10 Oct 2002 08:50:58 -0000	1.29
@@ -404,13 +404,19 @@
 static int _check_source_pass(http_parser_t *parser)
 {
     char *pass = config_get_config()->source_password;
+    int ret;
     if(!pass)
         pass = "";
 
-    if(config_get_config()->ice_login)
-        return _check_pass_ice(parser, pass);
-    else
-        return _check_pass_http(parser, "source", pass);
+    ret = _check_pass_http(parser, "source", pass);
+    if(!ret && config_get_config()->ice_login)
+    {
+        ret = _check_pass_ice(parser, pass);
+        if(ret)
+            WARN0("Source is using deprecated icecast login");
+    }
+
+    return ret;
 }
 
 static void _handle_source_request(connection_t *con, 

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.