X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/53a4a6fdcc52280765216ff019cf77b85ec48c18..e1e3ef08ef3419f4aabcfb3f45ab49a78000cdb7:/lib/configuration.c

diff --git a/lib/configuration.c b/lib/configuration.c
index bd9c65d..17f9ec7 100644
--- a/lib/configuration.c
+++ b/lib/configuration.c
@@ -37,9 +37,6 @@
 # include <langinfo.h>
 #endif
 
-#if HAVE_SHLOBJ_H
-# include <Shlobj.h>
-#endif
 #include <signal.h>
 
 #include "rights.h"
@@ -48,6 +45,7 @@
 #include "log.h"
 #include "split.h"
 #include "syscalls.h"
+#include "home.h"
 #include "table.h"
 #include "inputline.h"
 #include "charset.h"
@@ -1606,7 +1604,7 @@ int config_read(int server,
     xfree(privconf);
 #endif
     /* if we have a password file, read it */
-    if((privconf = config_userconf(0, pw))
+    if((privconf = config_userconf())
        && access(privconf, F_OK) == 0
        && config_include(c, privconf))
       return -1;
@@ -1672,22 +1670,8 @@ char *config_private(void) {
 }
 
 /** @brief Return the path to user's personal configuration file */
-char *config_userconf(const char *home, const struct passwd *pw) {
-  char *s;
-#if _WIN32
-  wchar_t *wpath = 0;
-  char *appdata;
-  if(SHGetKnownFolderPath(&FOLDERID_RoamingAppData, 0, NULL, &wpath) != S_OK)
-    disorder_fatal(0, "error calling SHGetKnownFolderPath");
-  appdata = win_wtomb(wpath);
-  CoTaskMemFree(wpath);
-  byte_xasprintf(&s, "%s\\DisOrder\\passwd", appdata);
-#else
-  if(!home && !pw && !(pw = getpwuid(getuid())))
-    disorder_fatal(0, "cannot determine our username");
-  byte_xasprintf(&s, "%s/.disorder/passwd", home ? home : pw->pw_dir);
-#endif
-  return s;
+char *config_userconf(void) {
+  return profile_filename("passwd");
 }
 
 #if !_WIN32