upstream/postgresql
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-05-16 03:19:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Declare load_hosts() as returning HostsFileLoadResult.

Browse source 
This function returns some value of enum HostsFileLoadResult,
but for reasons lost in the development process was declared to
return "int".  Fix that, for clarity and so that our typedefs
collection tooling sees the typedef as used.  Also fix the
variable that the sole call assigns into.  Move the typedef
to the header file that declares load_hosts() to avoid creating
header dependency problems.

Discussion: https://postgr.es/m/359138.1777922557@sss.pgh.pa.us
This commit is contained in:
Tom Lane 2026-05-04 18:33:06 -04:00
parent f6edd8ed70
commit 93da297366
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/backend/libpq/be-secure-common.c
View file

@ -361,7 +361,7 @@ parse_hosts_line(TokenizedAuthLine *tok_line, int elevel)
* the hosts configuration failed to load, the err_msg variable may have more
* information in case it was passed as non-NULL.
*/
int
HostsFileLoadResult
load_hosts(List **hosts, char **err_msg)
{
FILE *file;

2
src/backend/libpq/be-secure-openssl.c
View file

@ -156,7 +156,7 @@ be_tls_init(bool isServerStart)
MemoryContext host_memcxt = NULL;
MemoryContextCallback *host_memcxt_cb;
char *err_msg = NULL;
int res;
HostsFileLoadResult res;
struct hosts *new_hosts;
SSL_CTX *context = NULL;
int ssl_ver_min = -1;

9
src/include/libpq/hba.h
View file

@ -165,15 +165,6 @@ typedef struct HostsLine
void *ssl_ctx; /* associated SSL_CTX* for the above settings */
} HostsLine;
typedef enum HostsFileLoadResult
{
HOSTSFILE_LOAD_OK = 0,
HOSTSFILE_LOAD_FAILED,
HOSTSFILE_EMPTY,
HOSTSFILE_MISSING,
HOSTSFILE_DISABLED,
} HostsFileLoadResult;
/*
* TokenizedAuthLine represents one line lexed from an authentication
* configuration file. Each item in the "fields" list is a sub-list of

11
src/include/libpq/libpq.h
View file

@ -156,6 +156,15 @@ enum ssl_protocol_versions
PG_TLS1_3_VERSION,
};
typedef enum HostsFileLoadResult
{
HOSTSFILE_LOAD_OK = 0,
HOSTSFILE_LOAD_FAILED,
HOSTSFILE_EMPTY,
HOSTSFILE_MISSING,
HOSTSFILE_DISABLED,
} HostsFileLoadResult;
/*
* prototypes for functions in be-secure-common.c
*/
@ -164,6 +173,6 @@ extern int run_ssl_passphrase_command(const char *cmd, const char *prompt,
char *buf, int size);
extern bool check_ssl_key_file_permissions(const char *ssl_key_file,
bool isServerStart);
extern int load_hosts(List **hosts, char **err_msg);
extern HostsFileLoadResult load_hosts(List **hosts, char **err_msg);
#endif /* LIBPQ_H */