Merge branch 'develop' into 1.2.1-binlog_router_trx

server/include/dbusers.h

@@ -68,4 +68,5 @@ extern char *mysql_users_fetch(USERS *users, MYSQL_USER_HOST *key);
 extern int replace_mysql_users(SERVICE *service);
 extern int dbusers_save(USERS *, char *);
 extern int dbusers_load(USERS *, char *);
+bool check_service_permissions(SERVICE* service);
 #endif

server/include/maxconfig.h

@@ -146,4 +146,5 @@ void config_enable_feedback_task(void);
 void config_disable_feedback_task(void);
 unsigned long  config_get_gateway_id(void);
 GATEWAY_CONF* config_get_global_options();
+bool isInternalService(char *router);
 #endif

server/include/monitor.h

@@ -169,4 +169,5 @@ extern void	monitorList(DCB *);
 extern void     monitorSetInterval (MONITOR *, unsigned long);
 extern void     monitorSetNetworkTimeout(MONITOR *, int, int);
 extern RESULTSET *monitorGetList();
+bool check_monitor_permissions(MONITOR* monitor);
 #endif

server/include/service.h

@@ -128,6 +128,12 @@ enum{
 
 #define DEFAULT_SSL_CERT_VERIFY_DEPTH 100 /*< The default certificate verification depth */
 
+/**
+ * Parameters that are automatically detected but can also be configured by the
+ * user are initially set to this value.
+ */
+#define SERVICE_PARAM_UNINIT -1
+
 /**
  * Defines a service within the gateway.
  *