You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

78 lines
2.7 KiB

Index: Makefile
--- Makefile.orig 2021-05-16 09:42:24.000000000 +0200
+++ Makefile 2021-05-16 09:47:23.662366000 +0200
@@ -130,7 +130,7 @@
CFLAGS += -I$(MOSQUITTO_SRC)/src/
CFLAGS += -I$(MOSQUITTO_SRC)/lib/
ifneq ($(OS),Windows_NT)
- CFLAGS += -fPIC -Wall -Werror
+ CFLAGS += -fPIC
endif
CFLAGS += $(BACKENDS) $(BE_CFLAGS) -I$(MOSQ)/src -DDEBUG=1 $(OSSLINC)
Index: auth-plug.c
--- auth-plug.c.orig 2021-05-16 09:42:24.000000000 +0200
+++ auth-plug.c 2021-05-16 09:47:23.662540000 +0200
@@ -499,7 +499,7 @@
#if MOSQ_AUTH_PLUGIN_VERSION >=3
-int mosquitto_auth_unpwd_check(void *userdata, const struct mosquitto *client, const char *username, const char *password)
+int mosquitto_auth_unpwd_check(void *userdata, struct mosquitto *client, const char *username, const char *password)
#else
int mosquitto_auth_unpwd_check(void *userdata, const char *username, const char *password)
#endif
@@ -598,7 +598,7 @@
}
#if MOSQ_AUTH_PLUGIN_VERSION >= 3
-int mosquitto_auth_acl_check(void *userdata, int access, const struct mosquitto *client, const struct mosquitto_acl_msg *msg)
+int mosquitto_auth_acl_check(void *userdata, int access, struct mosquitto *client, const struct mosquitto_acl_msg *msg)
#else
int mosquitto_auth_acl_check(void *userdata, const char *clientid, const char *username, const char *topic, int access)
#endif
@@ -749,7 +749,7 @@
#if MOSQ_AUTH_PLUGIN_VERSION >= 3
-int mosquitto_auth_psk_key_get(void *userdata, const struct mosquitto *client, const char *hint, const char *identity, char *key, int max_key_len)
+int mosquitto_auth_psk_key_get(void *userdata, struct mosquitto *client, const char *hint, const char *identity, char *key, int max_key_len)
#else
int mosquitto_auth_psk_key_get(void *userdata, const char *hint, const char *identity, char *key, int max_key_len)
#endif
Index: be-files.c
--- be-files.c.orig 2021-05-16 09:42:24.000000000 +0200
+++ be-files.c 2021-05-16 09:47:35.031929000 +0200
@@ -36,8 +36,8 @@
#include <string.h>
#include <unistd.h>
#include <mosquitto.h>
-#include <mosquitto_plugin.h>
#include <mosquitto_broker.h>
+#include <mosquitto_plugin.h>
#include "log.h"
#include "hash.h"
#include "backends.h"
Index: be-redis.c
--- be-redis.c.orig 2021-05-16 09:42:24.000000000 +0200
+++ be-redis.c 2021-05-16 09:47:23.662645000 +0200
@@ -35,7 +35,7 @@
#include "log.h"
#include "hash.h"
#include "backends.h"
-#include <hiredis/hiredis.h>
+#include "redis/hiredis.h"
struct redis_backend {
redisContext *redis;
Index: log.c
--- log.c.orig 2021-05-16 09:42:24.000000000 +0200
+++ log.c 2021-05-16 09:47:23.662733000 +0200
@@ -33,6 +33,7 @@
#include <string.h>
#include <time.h>
#include <mosquitto.h>
+#include <mosquitto_broker.h>
#include <mosquitto_plugin.h>
#include "log.h"