# HG changeset patch
# User Olaf Wintermann <olaf.wintermann@gmail.com>
# Date 1730220847 -3600
# Node ID be77f90ec48e79b4f30155a184c23a7daa4d6963
# Parent  8ac8bf29e2ee85f2ef5ba46bd3fc0197bd1b0d67# Parent  d657b511d51c8b224d44a80a4dfd8a1abc5e883f
merge

diff -r 8ac8bf29e2ee -r be77f90ec48e dav/config.c
--- a/dav/config.c	Tue Oct 29 17:53:47 2024 +0100
+++ b/dav/config.c	Tue Oct 29 17:54:07 2024 +0100
@@ -36,11 +36,11 @@
 #include <libxml/tree.h>
 
 #include "config.h"
-#include "pwd.h"
 #include "system.h"
 
 #include <libidav/utils.h>
 #include <libidav/config.h>
+#include <libidav/pwdstore.h>
 
 #define xstreq(a,b) xmlStrEqual(BAD_CAST a, BAD_CAST b)
 #define xstrEQ(a,b) !xmlStrcasecmp(BAD_CAST a, BAD_CAST b)
diff -r 8ac8bf29e2ee -r be77f90ec48e make/vs/dav/dav.vcxproj
--- a/make/vs/dav/dav.vcxproj	Tue Oct 29 17:53:47 2024 +0100
+++ b/make/vs/dav/dav.vcxproj	Tue Oct 29 17:54:07 2024 +0100
@@ -148,7 +148,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\dav\config.c" />
     <ClCompile Include="..\..\..\dav\main.c" />
     <ClCompile Include="..\..\..\dav\optparser.c" />
   </ItemGroup>
diff -r 8ac8bf29e2ee -r be77f90ec48e make/vs/dav/dav.vcxproj.filters
--- a/make/vs/dav/dav.vcxproj.filters	Tue Oct 29 17:53:47 2024 +0100
+++ b/make/vs/dav/dav.vcxproj.filters	Tue Oct 29 17:54:07 2024 +0100
@@ -15,9 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\dav\config.c">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\dav\main.c">
       <Filter>Quelldateien</Filter>
     </ClCompile>
diff -r 8ac8bf29e2ee -r be77f90ec48e make/vs/davcommon/davcommon.vcxproj
--- a/make/vs/davcommon/davcommon.vcxproj	Tue Oct 29 17:53:47 2024 +0100
+++ b/make/vs/davcommon/davcommon.vcxproj	Tue Oct 29 17:54:07 2024 +0100
@@ -140,11 +140,11 @@
   <ItemGroup>
     <ClCompile Include="..\..\..\dav\assistant.c" />
     <ClCompile Include="..\..\..\dav\config.c" />
+    <ClCompile Include="..\..\..\dav\connect.c" />
     <ClCompile Include="..\..\..\dav\db.c" />
     <ClCompile Include="..\..\..\dav\error.c" />
     <ClCompile Include="..\..\..\dav\finfo.c" />
     <ClCompile Include="..\..\..\dav\libxattr.c" />
-    <ClCompile Include="..\..\..\dav\pwd.c" />
     <ClCompile Include="..\..\..\dav\system.c" />
     <ClCompile Include="..\..\..\dav\tags.c" />
     <ClCompile Include="..\..\..\dav\tar.c" />
@@ -153,11 +153,11 @@
   <ItemGroup>
     <ClInclude Include="..\..\..\dav\assistant.h" />
     <ClInclude Include="..\..\..\dav\config.h" />
+    <ClInclude Include="..\..\..\dav\connect.h" />
     <ClInclude Include="..\..\..\dav\db.h" />
     <ClInclude Include="..\..\..\dav\error.h" />
     <ClInclude Include="..\..\..\dav\finfo.h" />
     <ClInclude Include="..\..\..\dav\libxattr.h" />
-    <ClInclude Include="..\..\..\dav\pwd.h" />
     <ClInclude Include="..\..\..\dav\sopt.h" />
     <ClInclude Include="..\..\..\dav\system.h" />
     <ClInclude Include="..\..\..\dav\tags.h" />
diff -r 8ac8bf29e2ee -r be77f90ec48e make/vs/davcommon/davcommon.vcxproj.filters
--- a/make/vs/davcommon/davcommon.vcxproj.filters	Tue Oct 29 17:53:47 2024 +0100
+++ b/make/vs/davcommon/davcommon.vcxproj.filters	Tue Oct 29 17:54:07 2024 +0100
@@ -33,9 +33,6 @@
     <ClCompile Include="..\..\..\dav\libxattr.c">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\dav\pwd.c">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\dav\system.c">
       <Filter>Quelldateien</Filter>
     </ClCompile>
@@ -48,6 +45,9 @@
     <ClCompile Include="..\..\..\dav\xattrtool.c">
       <Filter>Quelldateien</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\dav\connect.c">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\dav\assistant.h">
@@ -68,9 +68,6 @@
     <ClInclude Include="..\..\..\dav\libxattr.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\dav\pwd.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\dav\sopt.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
@@ -86,5 +83,8 @@
     <ClInclude Include="..\..\..\dav\version.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\dav\connect.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff -r 8ac8bf29e2ee -r be77f90ec48e make/vs/libidav/libidav.vcxproj
--- a/make/vs/libidav/libidav.vcxproj	Tue Oct 29 17:53:47 2024 +0100
+++ b/make/vs/libidav/libidav.vcxproj	Tue Oct 29 17:54:07 2024 +0100
@@ -149,6 +149,7 @@
     <ClCompile Include="..\..\..\libidav\davqlexec.c" />
     <ClCompile Include="..\..\..\libidav\davqlparser.c" />
     <ClCompile Include="..\..\..\libidav\methods.c" />
+    <ClCompile Include="..\..\..\libidav\pwdstore.c" />
     <ClCompile Include="..\..\..\libidav\resource.c" />
     <ClCompile Include="..\..\..\libidav\session.c" />
     <ClCompile Include="..\..\..\libidav\utils.c" />
@@ -162,6 +163,7 @@
     <ClInclude Include="..\..\..\libidav\davqlexec.h" />
     <ClInclude Include="..\..\..\libidav\davqlparser.h" />
     <ClInclude Include="..\..\..\libidav\methods.h" />
+    <ClInclude Include="..\..\..\libidav\pwdstore.h" />
     <ClInclude Include="..\..\..\libidav\resource.h" />
     <ClInclude Include="..\..\..\libidav\session.h" />
     <ClInclude Include="..\..\..\libidav\utils.h" />
diff -r 8ac8bf29e2ee -r be77f90ec48e make/vs/libidav/libidav.vcxproj.filters
--- a/make/vs/libidav/libidav.vcxproj.filters	Tue Oct 29 17:53:47 2024 +0100
+++ b/make/vs/libidav/libidav.vcxproj.filters	Tue Oct 29 17:54:07 2024 +0100
@@ -48,6 +48,9 @@
     <ClCompile Include="..\..\..\libidav\config.c">
       <Filter>Quelldateien</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\libidav\pwdstore.c">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\libidav\crypto.h">
@@ -83,5 +86,8 @@
     <ClInclude Include="..\..\..\libidav\config.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\libidav\pwdstore.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff -r 8ac8bf29e2ee -r be77f90ec48e make/vs/ucx/ucx.vcxproj
--- a/make/vs/ucx/ucx.vcxproj	Tue Oct 29 17:53:47 2024 +0100
+++ b/make/vs/ucx/ucx.vcxproj	Tue Oct 29 17:54:07 2024 +0100
@@ -140,12 +140,14 @@
     <ClCompile Include="..\..\..\ucx\compare.c" />
     <ClCompile Include="..\..\..\ucx\hash_key.c" />
     <ClCompile Include="..\..\..\ucx\hash_map.c" />
+    <ClCompile Include="..\..\..\ucx\iterator.c" />
     <ClCompile Include="..\..\..\ucx\linked_list.c" />
     <ClCompile Include="..\..\..\ucx\list.c" />
     <ClCompile Include="..\..\..\ucx\map.c" />
     <ClCompile Include="..\..\..\ucx\mempool.c" />
     <ClCompile Include="..\..\..\ucx\printf.c" />
     <ClCompile Include="..\..\..\ucx\string.c" />
+    <ClCompile Include="..\..\..\ucx\tree.c" />
     <ClCompile Include="..\..\..\ucx\utils.c" />
   </ItemGroup>
   <ItemGroup>
@@ -164,6 +166,7 @@
     <ClInclude Include="..\..\..\ucx\cx\mempool.h" />
     <ClInclude Include="..\..\..\ucx\cx\printf.h" />
     <ClInclude Include="..\..\..\ucx\cx\string.h" />
+    <ClInclude Include="..\..\..\ucx\cx\tree.h" />
     <ClInclude Include="..\..\..\ucx\cx\utils.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff -r 8ac8bf29e2ee -r be77f90ec48e make/vs/ucx/ucx.vcxproj.filters
--- a/make/vs/ucx/ucx.vcxproj.filters	Tue Oct 29 17:53:47 2024 +0100
+++ b/make/vs/ucx/ucx.vcxproj.filters	Tue Oct 29 17:54:07 2024 +0100
@@ -54,6 +54,12 @@
     <ClCompile Include="..\..\..\ucx\mempool.c">
       <Filter>Quelldateien</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\ucx\iterator.c">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ucx\tree.c">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\ucx\cx\allocator.h">
@@ -104,5 +110,8 @@
     <ClInclude Include="..\..\..\ucx\cx\utils.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\ucx\cx\tree.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file