diff -r 21274e5950af -r ddfead6ea863 src/server/config/serverconf.h --- a/src/server/config/serverconf.h Tue Aug 13 22:14:32 2019 +0200 +++ b/src/server/config/serverconf.h Sun Aug 23 22:02:01 2020 +0200 @@ -51,47 +51,6 @@ ServerConfigObject *obj; } ServerConfig; -// server.conf objects - -typedef struct _cfg_listener { - ServerConfigObject *cfgobj; - sstr_t name; - sstr_t vs; - sstr_t threadpool; - sstr_t address; - int port; - int nacceptors; - int cfg_correct; -} CfgListener; - -typedef struct _cfg_keyfile_authdb { - sstr_t file; -} CfgKeyfileAuthDB; - -typedef struct _cfg_ldap_authdb { - sstr_t host; - int port; - sstr_t basedn; - sstr_t binddn; - sstr_t bindpw; -} CfgLDAPAuthDB; - -union authdb { - CfgKeyfileAuthDB keyfile; - CfgLDAPAuthDB ldap; -}; - -enum authdb_type { - AUTHDB_TYPE_KEYFILE, - AUTHDB_TYPE_LDAP -}; - -typedef struct _cfg_authdb { - sstr_t name; - enum authdb_type type; - union authdb cfg; - int cfg_correct; -} CfgAuthDB; /* @@ -110,7 +69,7 @@ int serverconf_parse(void *p, ConfigLine *begin, ConfigLine *end, sstr_t line); -UcxList* srvcfg_get_listeners(ServerConfig *cfg, UcxAllocator *mp, int *error); + #ifdef __cplusplus