diff options
author | Andris Zeila <andris.zeila@zabbix.com> | 2021-03-09 14:22:15 +0300 |
---|---|---|
committer | Andris Zeila <andris.zeila@zabbix.com> | 2021-03-09 14:22:15 +0300 |
commit | e85a6382c20424c2bc30f7fa35ab1303f9f869c3 (patch) | |
tree | b269a808a2ba2a43086ee8eed70add773df25340 /include/db.h | |
parent | d1f24887c791fa3a39e0e868faeb365b84773034 (diff) | |
parent | 07f0a480c594dd3f7654028c450e354e5a4b9796 (diff) |
.......... [ZBXNEXT-6478] merged branch 'master' of ssh://git.zabbix.lan:7999/zbx/zabbix into feature/ZBXNEXT-6478-5.3
Diffstat (limited to 'include/db.h')
-rw-r--r-- | include/db.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/db.h b/include/db.h index 45a056c4fa2..ba48bb92ceb 100644 --- a/include/db.h +++ b/include/db.h @@ -516,6 +516,10 @@ zbx_uint64_t DBget_maxid_num(const char *tablename, int num); void DBcheck_capabilities(void); +#ifdef HAVE_POSTGRESQL +char *zbx_db_get_schema_esc(void); +#endif + /****************************************************************************** * * * Type: ZBX_GRAPH_ITEMS * @@ -612,7 +616,7 @@ int zbx_check_user_permissions(const zbx_uint64_t *userid, const zbx_uint64_t *r const char *zbx_host_string(zbx_uint64_t hostid); const char *zbx_host_key_string(zbx_uint64_t itemid); const char *zbx_user_string(zbx_uint64_t userid); -int DBget_user_names(zbx_uint64_t userid, char **alias, char **name, char **surname); +int DBget_user_names(zbx_uint64_t userid, char **username, char **name, char **surname); void DBregister_host(zbx_uint64_t proxy_hostid, const char *host, const char *ip, const char *dns, unsigned short port, unsigned int connection_type, const char *host_metadata, unsigned short flag, |