diff options
| -rw-r--r-- | src/backend/libpq/auth.c | 8 | ||||
| -rw-r--r-- | src/backend/libpq/hba.c | 6 | ||||
| -rw-r--r-- | src/include/libpq/hba.h | 6 | ||||
| -rw-r--r-- | src/tools/pgindent/typedefs.list | 1 |
4 files changed, 10 insertions, 11 deletions
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index 4da46666439..ec4dbacf015 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -70,14 +70,14 @@ static int CheckMD5Auth(Port *port, char *shadow_pass, /* Standard TCP port number for Ident service. Assigned by IANA */ #define IDENT_PORT 113 -static int ident_inet(hbaPort *port); +static int ident_inet(Port *port); /*---------------------------------------------------------------- * 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. */ static int -ident_inet(hbaPort *port) +ident_inet(Port *port) { const SockAddr remote_addr = port->raddr; const SockAddr local_addr = port->laddr; @@ -1853,7 +1853,7 @@ ident_inet_done: * Iff authorized, return STATUS_OK, otherwise return STATUS_ERROR. */ static int -auth_peer(hbaPort *port) +auth_peer(Port *port) { uid_t uid; gid_t gid; diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index fecee8224d0..97a3586000b 100644 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@ -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. */ static bool -check_hostname(hbaPort *port, const char *hostname) +check_hostname(Port *port, const char *hostname) { struct addrinfo *gai_result, *gai; @@ -2528,7 +2528,7 @@ parse_hba_auth_opt(char *name, char *val, HbaLine *hbaline, * request. */ static void -check_hba(hbaPort *port) +check_hba(Port *port) { Oid roleid; ListCell *line; @@ -3125,7 +3125,7 @@ load_ident(void) * method = uaImplicitReject. */ void -hba_getauthmethod(hbaPort *port) +hba_getauthmethod(Port *port) { check_hba(port); } diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h index 3657f182db3..e3748d3c8c9 100644 --- a/src/include/libpq/hba.h +++ b/src/include/libpq/hba.h @@ -169,13 +169,13 @@ typedef struct TokenizedAuthLine char *err_msg; /* Error message if any */ } TokenizedAuthLine; -/* kluge to avoid including libpq/libpq-be.h here */ -typedef struct Port hbaPort; +/* avoid including libpq/libpq-be.h here */ +typedef struct Port Port; extern bool load_hba(void); extern bool load_ident(void); 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, const char *pg_user, const char *system_user, bool case_insensitive); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index a13e8162890..9db8e2424c0 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -3687,7 +3687,6 @@ gss_key_value_set_desc gss_name_t gtrgm_consistent_cache gzFile -hbaPort heap_page_items_state help_handler hlCheck |