github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-25 16:16:29 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

repmgr: truncate version string if necessary

Browse Source 
Some distributions may add extra information to PG_VERSION after
the actual version number (e.g. "10.4 (Debian 10.4-2.pgdg90+1)"), so
copy the version number string up until the first space is found.

GitHub #490.
This commit is contained in:
Ian Barwick
2018-08-14 09:48:46 +09:00
parent d5064bdc02
commit 9ae9d31165
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@@ -1,5 +1,6 @@
4.1.1 2018-??-?? 4.1.1 2018-??-??
repmgr: truncate version string, if necessary; GitHub #490 (Ian)
repmgrd: ensure that sending SIGHUP always results in the log file repmgrd: ensure that sending SIGHUP always results in the log file
being reopened; GitHub #485 (Ian) being reopened; GitHub #485 (Ian)
repmgrd: report version number *after* logger initialisation; GitHub #487 (Ian) repmgrd: report version number *after* logger initialisation; GitHub #487 (Ian)

23
dbutils.c
View File

@@ -1095,7 +1095,28 @@ get_server_version(PGconn *conn, char *server_version)
} }
if (server_version != NULL) if (server_version != NULL)
strncpy(server_version, PQgetvalue(res, 0, 1), MAXVERSIONSTR); {
char server_version_buf[MAXVERSIONSTR];
int i;
memset(server_version_buf, 0, MAXVERSIONSTR);
/*
* Some distributions may add extra info after the actual version number,
* e.g. "10.4 (Debian 10.4-2.pgdg90+1)", so copy everything up until the
* first space.
*/
strncpy(server_version_buf, PQgetvalue(res, 0, 1), MAXVERSIONSTR);
for (i = 0; i < MAXVERSIONSTR; i++)
{
if (server_version_buf[i] == ' ')
break;
*server_version++ = server_version_buf[i];
}
}
server_version_num = atoi(PQgetvalue(res, 0, 0)); server_version_num = atoi(PQgetvalue(res, 0, 0));