--- a/dav/config.h Mon Nov 07 19:32:17 2016 +0100 +++ b/dav/config.h Fri Nov 11 15:03:19 2016 +0100 @@ -66,19 +66,12 @@ int ssl_version; unsigned long authmethods; }; - -struct Proxy { - char *url; - char *user; - char *password; - char *no; -}; -void load_config(DavContext *ctx); +int load_config(DavContext *ctx); void free_config(void); -void load_repository(xmlNode *reponode); -void load_key(xmlNode *keynode); -void load_proxy(xmlNode *proxynode, int type); +int load_repository(xmlNode *reponode); +int load_key(xmlNode *keynode); +int load_proxy(DavProxy*, xmlNode *proxynode, int type); sstr_t load_key_file(char *filename); Repository* repository_new(void); @@ -88,8 +81,6 @@ int get_repository_flags(Repository *repo); DavSession *repository_session(Repository *repo); Key* get_key(char *name); -Proxy* get_http_proxy(void); -Proxy* get_https_proxy(void); int add_repository(Repository *repo); int list_repositories(void);