diff --git a/src/Makefile.am b/src/Makefile.am index 6ebabe2c463ef50bf49fa6363fe700c0fd778765..977d932817e360f2b08b7ed22a3f42ab145b8b41 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,7 +12,7 @@ noinst_HEADERS = admin.h cfgfile.h logging.h sighandler.h connection.h \ global.h util.h slave.h source.h stats.h refbuf.h client.h \ compat.h fserve.h xslt.h yp.h md5.h \ event.h event_log.h event_exec.h event_url.h \ - acl.h auth.h auth_htpasswd.h auth_url.h auth_anonymous.h auth_static.h \ + acl.h auth.h \ format.h format_ogg.h format_mp3.h format_ebml.h \ format_vorbis.h format_theora.h format_flac.h format_speex.h format_midi.h \ format_kate.h format_skeleton.h format_opus.h diff --git a/src/auth.c b/src/auth.c index c597e4f94e480cbd0848949f0f67f1329ca34d53..40caea9677ab83a9fd8f7ea4fe21fcb49683dacb 100644 --- a/src/auth.c +++ b/src/auth.c @@ -25,10 +25,6 @@ #include #include "auth.h" -#include "auth_htpasswd.h" -#include "auth_url.h" -#include "auth_anonymous.h" -#include "auth_static.h" #include "source.h" #include "client.h" #include "cfgfile.h" diff --git a/src/auth.h b/src/auth.h index 9c086f17480806354321584fd9d590e5ef2350d3..20399c08fb66703975ae0edd61d4be4296f2b3b9 100644 --- a/src/auth.h +++ b/src/auth.h @@ -117,6 +117,13 @@ typedef struct auth_tag typedef struct auth_stack_tag auth_stack_t; +/* prototypes for auths that do not need own header file */ +int auth_get_anonymous_auth (auth_t *auth, config_options_t *options); +int auth_get_static_auth (auth_t *auth, config_options_t *options); +int auth_get_url_auth (auth_t *authenticator, config_options_t *options); +int auth_get_htpasswd_auth(auth_t *auth, config_options_t *options); + +/* prototypes for auth.c */ void auth_initialise (void); void auth_shutdown (void); diff --git a/src/auth_anonymous.h b/src/auth_anonymous.h deleted file mode 100644 index 216e34f059dafd7e905ffdd89f199547d4fa6af1..0000000000000000000000000000000000000000 --- a/src/auth_anonymous.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Icecast - * - * This program is distributed under the GNU General Public License, version 2. - * A copy of this license is included with this source. - * - * Copyright 2014, Philipp "ph3-der-loewe" Schafft , - */ - -#ifndef __AUTH_ANONYMOUS_H__ -#define __AUTH_ANONYMOUS_H__ - -#ifdef HAVE_CONFIG_H -#include -#endif - -int auth_get_anonymous_auth (auth_t *auth, config_options_t *options); - -#endif diff --git a/src/auth_htpasswd.h b/src/auth_htpasswd.h deleted file mode 100644 index c7267d60b87701edfa7ce3243c5e325b2b51694e..0000000000000000000000000000000000000000 --- a/src/auth_htpasswd.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Icecast - * - * This program is distributed under the GNU General Public License, version 2. - * A copy of this license is included with this source. - * - * Copyright 2000-2004, Jack Moffitt , - * oddsock , - * Karl Heyes - * and others (see AUTHORS for details). - */ - -#ifndef __AUTH_HTPASSWD_H__ -#define __AUTH_HTPASSWD_H__ - -#ifdef HAVE_CONFIG_H -#include -#endif - -int auth_get_htpasswd_auth(auth_t *auth, config_options_t *options); - -#endif - - diff --git a/src/auth_static.h b/src/auth_static.h deleted file mode 100644 index 4f8ba009a9c1e6f284d9d4f1768ad754f878513e..0000000000000000000000000000000000000000 --- a/src/auth_static.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Icecast - * - * This program is distributed under the GNU General Public License, version 2. - * A copy of this license is included with this source. - * - * Copyright 2014, Philipp "ph3-der-loewe" Schafft , - */ - -#ifndef __AUTH_STATIC_H__ -#define __AUTH_STATIC_H__ - -#ifdef HAVE_CONFIG_H -#include -#endif - -int auth_get_static_auth (auth_t *auth, config_options_t *options); - -#endif diff --git a/src/auth_url.h b/src/auth_url.h deleted file mode 100644 index 4ddec631a713cb36fc8e5e76f02392b790c04df8..0000000000000000000000000000000000000000 --- a/src/auth_url.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Icecast - * - * This program is distributed under the GNU General Public License, version 2. - * A copy of this license is included with this source. - * - * Copyright 2000-2004, Jack Moffitt , - * oddsock , - * Karl Heyes - * and others (see AUTHORS for details). - */ - -#ifndef __AUTH_URL_H__ -#define __AUTH_URL_H__ - -#ifdef HAVE_CONFIG_H -#include -#endif - -int auth_get_url_auth (auth_t *authenticator, config_options_t *options); - -#endif - -