# HG changeset patch # User Olaf Wintermann # Date 1660158114 -7200 # Node ID d6d8c86c95c37a6377ebbcd7832210f2e45fee5a # Parent e28ee9875a9081f3790e530910d3d0a27c6e4d55 adjust pg plugin to new dav initialization diff -r e28ee9875a90 -r d6d8c86c95c3 src/server/plugins/postgresql/vfs.c --- a/src/server/plugins/postgresql/vfs.c Wed Aug 10 20:56:24 2022 +0200 +++ b/src/server/plugins/postgresql/vfs.c Wed Aug 10 21:01:54 2022 +0200 @@ -147,11 +147,18 @@ } VFS* pg_vfs_create(Session *sn, Request *rq, pblock *pb, void *initData) { - // resourcepool is required - char *resource_pool = pblock_findval("resourcepool", pb); - if(!resource_pool) { - log_ereport(LOG_MISCONFIG, "pg_vfs_create: missing resourcepool parameter"); - return NULL; + PgRepository *repo = initData; + + char *resource_pool; + if(repo) { + resource_pool = repo->resourcepool.ptr; + } else { + // resourcepool is required + resource_pool = pblock_findval("resourcepool", pb); + if(!resource_pool) { + log_ereport(LOG_MISCONFIG, "pg_vfs_create: missing resourcepool parameter"); + return NULL; + } } // get the resource first (most likely to fail due to misconfig) diff -r e28ee9875a90 -r d6d8c86c95c3 src/server/plugins/postgresql/webdav.c --- a/src/server/plugins/postgresql/webdav.c Wed Aug 10 20:56:24 2022 +0200 +++ b/src/server/plugins/postgresql/webdav.c Wed Aug 10 21:01:54 2022 +0200 @@ -275,11 +275,18 @@ } WebdavBackend* pg_webdav_create(Session *sn, Request *rq, pblock *pb, void *initData) { - // resourcepool is required - char *resource_pool = pblock_findval("resourcepool", pb); - if(!resource_pool) { - log_ereport(LOG_MISCONFIG, "pg_webdav_create: missing resourcepool parameter"); - return NULL; + PgRepository *repo = initData; + + char *resource_pool; + if(repo) { + resource_pool = repo->resourcepool.ptr; + } else { + // resourcepool is required + resource_pool = pblock_findval("resourcepool", pb); + if(!resource_pool) { + log_ereport(LOG_MISCONFIG, "pg_webdav_create: missing resourcepool parameter"); + return NULL; + } } // get the resource first (should only fail in case of misconfig)