Archives/falk-werner_webfused
1
0
Fork 0
mirror of https://github.com/falk-werner/webfused synced 2024-10-27 20:44:08 +00:00
Code Issues Releases Wiki Activity

updated webfuse to 0.4.0

Browse Source
This commit is contained in:
Falk Werner 2020-07-05 11:19:00 +02:00
parent 6ac93184df
commit 3dbf7c4561
12 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -19,8 +19,8 @@ jansson_dep = dependency('jansson', version: '>=2.11', fallback: ['jansson', 'ja
libfuse_dep = dependency('fuse3', version: '>=3.8.0', fallback: ['fuse3', 'libfuse_dep']) libfuse_dep = dependency('fuse3', version: '>=3.8.0', fallback: ['fuse3', 'libfuse_dep'])
gtest_dep = dependency('gtest', version: '>=1.10.0', fallback: ['gtest', 'gtest_dep']) gtest_dep = dependency('gtest', version: '>=1.10.0', fallback: ['gtest', 'gtest_dep'])
gmock_main_dep = dependency('gmock_main', version: '>=1.10.0', fallback: ['gtest', 'gmock_main_dep']) gmock_main_dep = dependency('gmock_main', version: '>=1.10.0', fallback: ['gtest', 'gmock_main_dep'])
webfuse_adapter_dep = dependency('webfuse_adapter', version: '>=0.3.0', webfuse_adapter_dep = dependency('webfuse', version: '>=0.4.0',
fallback: ['webfuse', 'webfuse_adapter_dep'], default_options: ['without_provider=true']) fallback: ['webfuse', 'webfuse_dep'], default_options: ['without_tests=true'])
inc_dir = include_directories('src') inc_dir = include_directories('src')

2
src/webfused/auth/authenticator.h
View File

@ -1,7 +1,7 @@
#ifndef WFD_AUTH_AUTHENTICATOR_H #ifndef WFD_AUTH_AUTHENTICATOR_H
#define WFD_AUTH_AUTHENTICATOR_H #define WFD_AUTH_AUTHENTICATOR_H
#include "webfuse/adapter/authenticate.h" #include "webfuse/authenticate.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"

4
src/webfused/auth/file_authenticator.c
View File

@ -4,7 +4,7 @@
#include "userdb/userdb.h" #include "userdb/userdb.h"
#include "webfused/log/log.h" #include "webfused/log/log.h"
#include <webfuse/adapter/credentials.h> #include <webfuse/credentials.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -26,7 +26,7 @@ wfd_file_authenticator_dispose(
static bool static bool
wfd_file_authenticator_authenticate( wfd_file_authenticator_authenticate(
struct wf_credentials * credentials, struct wf_credentials const * credentials,
void * user_data) void * user_data)
{ {
bool result = false; bool result = false;

4
src/webfused/auth/pam_authenticator.c
View File

@ -3,7 +3,7 @@
#include "webfused/config/settings.h" #include "webfused/config/settings.h"
#include "webfused/log/log.h" #include "webfused/log/log.h"
#include "webfuse/adapter/credentials.h" #include <webfuse/credentials.h>
#include <security/pam_appl.h> #include <security/pam_appl.h>
#include <stdlib.h> #include <stdlib.h>
@ -73,7 +73,7 @@ wfd_pam_authenticator_dispose(
static bool static bool
wfd_pam_authenticator_authenticate( wfd_pam_authenticator_authenticate(
struct wf_credentials * credentials, struct wf_credentials const * credentials,
void * user_data) void * user_data)
{ {
bool result = false; bool result = false;

3
src/webfused/config/config.c
View File

@ -1,11 +1,12 @@
#include "webfused/config/config.h" #include "webfused/config/config.h"
#include "webfused/config/config_intern.h" #include "webfused/config/config_intern.h"
#include "webfuse/adapter/server_config.h"
#include "webfused/auth/factory.h" #include "webfused/auth/factory.h"
#include "webfused/auth/authenticator.h" #include "webfused/auth/authenticator.h"
#include "webfused/mountpoint_factory.h" #include "webfused/mountpoint_factory.h"
#include "webfused/log/manager.h" #include "webfused/log/manager.h"
#include <webfuse/server_config.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

2
src/webfused/daemon.c
View File

@ -10,7 +10,7 @@
#include <unistd.h> #include <unistd.h>
#include <getopt.h> #include <getopt.h>
#include <webfuse_adapter.h> #include <webfuse/webfuse.h>
#include "webfused/config/config.h" #include "webfused/config/config.h"
#include "webfused/config/factory.h" #include "webfused/config/factory.h"
#include "webfused/log/log.h" #include "webfused/log/log.h"

2
src/webfused/mountpoint_factory.c
View File

@ -1,7 +1,7 @@
#include "webfused/mountpoint_factory.h" #include "webfused/mountpoint_factory.h"
#include "webfused/log/log.h" #include "webfused/log/log.h"
#include <webfuse/adapter/mountpoint.h> #include <webfuse/mountpoint.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <stdlib.h> #include <stdlib.h>

2
src/webfused/mountpoint_factory.h
View File

@ -1,7 +1,7 @@
#ifndef WFD_MOUNTPOINT_FACTORY_H #ifndef WFD_MOUNTPOINT_FACTORY_H
#define WFD_MOUNTPOINT_FACTORY_H #define WFD_MOUNTPOINT_FACTORY_H
#include "webfuse/adapter/mountpoint_factory.h" #include "webfuse/mountpoint_factory.h"
#ifndef __cplusplus #ifndef __cplusplus
#include <stdbool.h> #include <stdbool.h>

8
subprojects/webfuse.wrap
View File

@ -1,7 +1,7 @@
[wrap-file] [wrap-file]
directory = webfuse-0.3.1 directory = webfuse-0.4.0
source_url = https://github.com/falk-werner/webfuse/archive/v0.3.1.tar.gz source_url = https://github.com/falk-werner/webfuse/archive/v0.4.0.tar.gz
source_filename = v0.3.1.tar.gz source_filename = v0.4.0.tar.gz
source_hash = 46624b5f29e8f87dd1aebfce3b13ca87e766bc59546b6e5f49665d2f8c555d62 source_hash = dda1f07ca90839035f31a71a1ac381a0e94f9fd479d13808f1e61fe6ed096ead

2
test/mock/credentials.hpp
View File

@ -2,7 +2,7 @@
#define WFD_MOCK_CREDENTIALS_HPP #define WFD_MOCK_CREDENTIALS_HPP
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include "webfuse/adapter/credentials.h" #include "webfuse/credentials.h"
namespace webfused_test namespace webfused_test
{ {

2
test/mock/server.hpp
View File

@ -1,7 +1,7 @@
#ifndef WFD_MOCK_SERVER_HPP #ifndef WFD_MOCK_SERVER_HPP
#define WFD_MOCK_SERVER_HPP #define WFD_MOCK_SERVER_HPP
#include <webfuse/adapter/server.h> #include <webfuse/server.h>
#include <gmock/gmock.h> #include <gmock/gmock.h>
namespace webfused_test namespace webfused_test

2
test/mountpoint_factory.cc
View File

@ -1,6 +1,6 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "webfused/mountpoint_factory.h" #include "webfused/mountpoint_factory.h"
#include <webfuse/adapter/mountpoint.h> #include <webfuse/mountpoint.h>
#include <cstring> #include <cstring>