--- a/application/config.h Mon Oct 21 15:45:12 2024 +0200
+++ b/application/config.h Wed Oct 23 10:37:43 2024 +0200
@@ -1,74 +1,73 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2024 Olaf Wintermann. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#include <cx/string.h>
-#include <stdbool.h>
-#include <libidav/webdav.h>
-#include "pwd.h"
-
-#include <libidav/config.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#define HTTP_PROXY 1
-#define HTTPS_PROXY 2
-
-
-int check_config_dir(void);
-
-char* config_file_path(char* name);
-
-cxmutstr config_load_file(const char* path);
-
-int load_config(DavContext* ctx);
-DavConfig* get_config(void);
-int store_config(void);
-void free_config(void);
-
-cxmutstr load_key_file(const char* filename);
-
-PwdStore* get_pwdstore(void);
-int pwdstore_save(PwdStore* pwdstore);
-
-
-int request_auth(DavSession* sn, void* userdata);
-
-DavSession* connect_to_repo(DavContext *ctx, DavCfgRepository *repo, const char *path, dav_auth_func authfunc);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* CONFIG_H */
-
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2018 Olaf Wintermann. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#include <cx/string.h>
+#include <stdbool.h>
+#include <libidav/webdav.h>
+
+#include <libidav/config.h>
+#include <libidav/pwdstore.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#define HTTP_PROXY 1
+#define HTTPS_PROXY 2
+
+
+int check_config_dir(void);
+
+char* config_file_path(char *name);
+
+cxmutstr config_load_file(const char *path);
+
+int load_config(DavContext *ctx);
+DavConfig* get_config(void);
+int store_config(void);
+void free_config(void);
+
+cxmutstr load_key_file(const char *filename);
+
+PwdStore* get_pwdstore(void);
+int pwdstore_save(PwdStore *pwdstore);
+
+int get_stored_credentials(char *credid, char **user, char **password);
+int get_location_credentials(DavCfgRepository *repo, const char *path, char **user, char **password);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CONFIG_H */
+