database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-18 04:29:09 +03:00
Code Activity

Remove hbaPort type

Browse Source 
This was just a workaround to avoid including the header file that
defines the Port type.  With C11, we can now just re-define the Port
type without the possibility of a conflict.

Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Reviewed-by: Chao Li <li.evan.chao@gmail.com>
Discussion: https://www.postgresql.org/message-id/flat/10d32190-f31b-40a5-b177-11db55597355@eisentraut.org
This commit is contained in:
Peter Eisentraut
2025-09-15 10:48:30 +02:00
parent d4d1fc527b
commit dc41d7415f
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/libpq/auth.c
View File

@@ -70,14 +70,14 @@ static int CheckMD5Auth(Port *port, char *shadow_pass,
/* Standard TCP port number for Ident service. Assigned by IANA */ /* Standard TCP port number for Ident service. Assigned by IANA */
#define IDENT_PORT 113 #define IDENT_PORT 113
static int ident_inet(hbaPort *port); static int ident_inet(Port *port);
/*---------------------------------------------------------------- /*----------------------------------------------------------------
* Peer authentication * Peer authentication
*---------------------------------------------------------------- *----------------------------------------------------------------
*/ */
static int auth_peer(hbaPort *port); static int auth_peer(Port *port);
/*---------------------------------------------------------------- /*----------------------------------------------------------------
@@ -1668,7 +1668,7 @@ interpret_ident_response(const char *ident_response,
* latch was set would improve the responsiveness to timeouts/cancellations. * latch was set would improve the responsiveness to timeouts/cancellations.
*/ */
static int static int
ident_inet(hbaPort *port) ident_inet(Port *port)
{ {
const SockAddr remote_addr = port->raddr; const SockAddr remote_addr = port->raddr;
const SockAddr local_addr = port->laddr; const SockAddr local_addr = port->laddr;
@@ -1853,7 +1853,7 @@ ident_inet_done:
* Iff authorized, return STATUS_OK, otherwise return STATUS_ERROR. * Iff authorized, return STATUS_OK, otherwise return STATUS_ERROR.
*/ */
static int static int
auth_peer(hbaPort *port) auth_peer(Port *port)
{ {
uid_t uid; uid_t uid;
gid_t gid; gid_t gid;

6
src/backend/libpq/hba.c
View File

@@ -1075,7 +1075,7 @@ hostname_match(const char *pattern, const char *actual_hostname)
* Check to see if a connecting IP matches a given host name. * Check to see if a connecting IP matches a given host name.
*/ */
static bool static bool
check_hostname(hbaPort *port, const char *hostname) check_hostname(Port *port, const char *hostname)
{ {
struct addrinfo *gai_result, struct addrinfo *gai_result,
*gai; *gai;
@@ -2528,7 +2528,7 @@ parse_hba_auth_opt(char *name, char *val, HbaLine *hbaline,
* request. * request.
*/ */
static void static void
check_hba(hbaPort *port) check_hba(Port *port)
{ {
Oid roleid; Oid roleid;
ListCell *line; ListCell *line;
@@ -3125,7 +3125,7 @@ load_ident(void)
* method = uaImplicitReject. * method = uaImplicitReject.
*/ */
void void
hba_getauthmethod(hbaPort *port) hba_getauthmethod(Port *port)
{ {
check_hba(port); check_hba(port);
} }

6
src/include/libpq/hba.h
View File

@@ -169,13 +169,13 @@ typedef struct TokenizedAuthLine
char *err_msg; /* Error message if any */ char *err_msg; /* Error message if any */
} TokenizedAuthLine; } TokenizedAuthLine;
/* kluge to avoid including libpq/libpq-be.h here */ /* avoid including libpq/libpq-be.h here */
typedef struct Port hbaPort; typedef struct Port Port;
extern bool load_hba(void); extern bool load_hba(void);
extern bool load_ident(void); extern bool load_ident(void);
extern const char *hba_authname(UserAuth auth_method); extern const char *hba_authname(UserAuth auth_method);
extern void hba_getauthmethod(hbaPort *port); extern void hba_getauthmethod(Port *port);
extern int check_usermap(const char *usermap_name, extern int check_usermap(const char *usermap_name,
const char *pg_user, const char *system_user, const char *pg_user, const char *system_user,
bool case_insensitive); bool case_insensitive);

1
src/tools/pgindent/typedefs.list
View File

@@ -3687,7 +3687,6 @@ gss_key_value_set_desc
gss_name_t gss_name_t
gtrgm_consistent_cache gtrgm_consistent_cache
gzFile gzFile
hbaPort
heap_page_items_state heap_page_items_state
help_handler help_handler
hlCheck hlCheck