- Don't print a bogus warning when reading on empty line in a .host file

- Move acl.c to a more appropriate location

Makefile.am

@@ -431,11 +431,11 @@ SOURCES_libvlc_common = \
 	src/stream_output/stream_output.c \
 	src/stream_output/announce.c \
 	src/stream_output/sap.c \
-	src/stream_output/acl.c \
 	src/osd/osd.c \
 	src/osd/osd_parser.c \
 	src/osd/osd_text.c \
 	src/osd/osd_widgets.c \
+	src/network/acl.c \
 	src/network/getaddrinfo.c \
 	src/network/io.c \
 	src/network/tcp.c \

po/POTFILES.in

@@ -122,6 +122,7 @@ src/misc/variables.c
 src/misc/vlm.c
 src/misc/win32_specific.c
 src/misc/xml.c
+src/network/acl.c
 src/network/getaddrinfo.c
 src/network/httpd.c
 src/network/io.c

src/stream_output/acl.c → src/network/acl.c

@@ -296,6 +296,9 @@ int ACL_LoadFile( vlc_acl_t *p_acl, const char *psz_path )
         while( isspace( *psz_ip ) )
             psz_ip++;
 
+        if( *psz_ip == '\0' ) /* empty/blank line */
+            continue;
+
         ptr = strchr( psz_ip, '\n' );
         if( ptr == NULL )
         {