aboutsummaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/commands/user.c10
-rw-r--r--src/backend/libpq/auth.c10
-rw-r--r--src/backend/libpq/crypt.c32
-rw-r--r--src/backend/libpq/hba.c51
-rw-r--r--src/backend/libpq/ip.c103
-rw-r--r--src/backend/libpq/md5.c14
-rw-r--r--src/backend/libpq/pqcomm.c8
-rw-r--r--src/backend/postmaster/pgstat.c20
-rw-r--r--src/backend/postmaster/postmaster.c22
-rw-r--r--src/backend/utils/adt/network.c34
-rw-r--r--src/backend/utils/adt/pgstatfuncs.c20
-rw-r--r--src/backend/utils/adt/varlena.c6
12 files changed, 167 insertions, 163 deletions
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index 706e85dea5b..3a2eb01af70 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.161 2005/10/15 02:49:16 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.162 2005/10/17 16:24:18 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -313,8 +313,8 @@ CreateRole(CreateRoleStmt *stmt)
DirectFunctionCall1(textin, CStringGetDatum(password));
else
{
- if (!EncryptMD5(password, stmt->role, strlen(stmt->role),
- encrypted_password))
+ if (!pg_md5_encrypt(password, stmt->role, strlen(stmt->role),
+ encrypted_password))
elog(ERROR, "password encryption failed");
new_record[Anum_pg_authid_rolpassword - 1] =
DirectFunctionCall1(textin, CStringGetDatum(encrypted_password));
@@ -642,8 +642,8 @@ AlterRole(AlterRoleStmt *stmt)
DirectFunctionCall1(textin, CStringGetDatum(password));
else
{
- if (!EncryptMD5(password, stmt->role, strlen(stmt->role),
- encrypted_password))
+ if (!pg_md5_encrypt(password, stmt->role, strlen(stmt->role),
+ encrypted_password))
elog(ERROR, "password encryption failed");
new_record[Anum_pg_authid_rolpassword - 1] =
DirectFunctionCall1(textin, CStringGetDatum(encrypted_password));
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 8fc8a915ebd..b409b0a55c3 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.131 2005/10/15 21:27:19 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.132 2005/10/17 16:24:19 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -376,10 +376,10 @@ ClientAuthentication(Port *port)
{
char hostinfo[NI_MAXHOST];
- getnameinfo_all(&port->raddr.addr, port->raddr.salen,
- hostinfo, sizeof(hostinfo),
- NULL, 0,
- NI_NUMERICHOST);
+ pg_getnameinfo_all(&port->raddr.addr, port->raddr.salen,
+ hostinfo, sizeof(hostinfo),
+ NULL, 0,
+ NI_NUMERICHOST);
#ifdef USE_SSL
ereport(FATAL,
diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c
index b0a17aea53b..5e99cc6cddc 100644
--- a/src/backend/libpq/crypt.c
+++ b/src/backend/libpq/crypt.c
@@ -9,7 +9,7 @@
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/backend/libpq/crypt.c,v 1.66 2005/10/15 02:49:17 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/libpq/crypt.c,v 1.67 2005/10/17 16:24:19 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -76,9 +76,9 @@ md5_crypt_verify(const Port *port, const char *role, char *client_pass)
if (isMD5(shadow_pass))
{
/* stored password already encrypted, only do salt */
- if (!EncryptMD5(shadow_pass + strlen("md5"),
- (char *) port->md5Salt,
- sizeof(port->md5Salt), crypt_pwd))
+ if (!pg_md5_encrypt(shadow_pass + strlen("md5"),
+ (char *) port->md5Salt,
+ sizeof(port->md5Salt), crypt_pwd))
{
pfree(crypt_pwd);
return STATUS_ERROR;
@@ -89,19 +89,19 @@ md5_crypt_verify(const Port *port, const char *role, char *client_pass)
/* stored password is plain, double-encrypt */
char *crypt_pwd2 = palloc(MD5_PASSWD_LEN + 1);
- if (!EncryptMD5(shadow_pass,
- port->user_name,
- strlen(port->user_name),
- crypt_pwd2))
+ if (!pg_md5_encrypt(shadow_pass,
+ port->user_name,
+ strlen(port->user_name),
+ crypt_pwd2))
{
pfree(crypt_pwd);
pfree(crypt_pwd2);
return STATUS_ERROR;
}
- if (!EncryptMD5(crypt_pwd2 + strlen("md5"),
- port->md5Salt,
- sizeof(port->md5Salt),
- crypt_pwd))
+ if (!pg_md5_encrypt(crypt_pwd2 + strlen("md5"),
+ port->md5Salt,
+ sizeof(port->md5Salt),
+ crypt_pwd))
{
pfree(crypt_pwd);
pfree(crypt_pwd2);
@@ -123,10 +123,10 @@ md5_crypt_verify(const Port *port, const char *role, char *client_pass)
{
/* Encrypt user-supplied password to match stored MD5 */
crypt_client_pass = palloc(MD5_PASSWD_LEN + 1);
- if (!EncryptMD5(client_pass,
- port->user_name,
- strlen(port->user_name),
- crypt_client_pass))
+ if (!pg_md5_encrypt(client_pass,
+ port->user_name,
+ strlen(port->user_name),
+ crypt_client_pass))
{
pfree(crypt_client_pass);
return STATUS_ERROR;
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 734a4568d2a..b7209536085 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.148 2005/10/15 02:49:17 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.149 2005/10/17 16:24:19 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -756,7 +756,7 @@ parse_hba(List *line, int line_num, hbaPort *port,
hints.ai_addr = NULL;
hints.ai_next = NULL;
- ret = getaddrinfo_all(token, NULL, &hints, &gai_result);
+ ret = pg_getaddrinfo_all(token, NULL, &hints, &gai_result);
if (ret || !gai_result)
{
ereport(LOG,
@@ -767,7 +767,7 @@ parse_hba(List *line, int line_num, hbaPort *port,
if (cidr_slash)
*cidr_slash = '/';
if (gai_result)
- freeaddrinfo_all(hints.ai_family, gai_result);
+ pg_freeaddrinfo_all(hints.ai_family, gai_result);
goto hba_other_error;
}
@@ -775,12 +775,13 @@ parse_hba(List *line, int line_num, hbaPort *port,
*cidr_slash = '/';
memcpy(&addr, gai_result->ai_addr, gai_result->ai_addrlen);
- freeaddrinfo_all(hints.ai_family, gai_result);
+ pg_freeaddrinfo_all(hints.ai_family, gai_result);
/* Get the netmask */
if (cidr_slash)
{
- if (SockAddr_cidr_mask(&mask, cidr_slash + 1, addr.ss_family) < 0)
+ if (pg_sockaddr_cidr_mask(&mask, cidr_slash + 1,
+ addr.ss_family) < 0)
goto hba_syntax;
}
else
@@ -791,7 +792,7 @@ parse_hba(List *line, int line_num, hbaPort *port,
goto hba_syntax;
token = lfirst(line_item);
- ret = getaddrinfo_all(token, NULL, &hints, &gai_result);
+ ret = pg_getaddrinfo_all(token, NULL, &hints, &gai_result);
if (ret || !gai_result)
{
ereport(LOG,
@@ -800,12 +801,12 @@ parse_hba(List *line, int line_num, hbaPort *port,
token, HbaFileName, line_num,
gai_strerror(ret))));
if (gai_result)
- freeaddrinfo_all(hints.ai_family, gai_result);
+ pg_freeaddrinfo_all(hints.ai_family, gai_result);
goto hba_other_error;
}
memcpy(&mask, gai_result->ai_addr, gai_result->ai_addrlen);
- freeaddrinfo_all(hints.ai_family, gai_result);
+ pg_freeaddrinfo_all(hints.ai_family, gai_result);
if (addr.ss_family != mask.ss_family)
{
@@ -828,8 +829,8 @@ parse_hba(List *line, int line_num, hbaPort *port,
if (addr.ss_family == AF_INET &&
port->raddr.addr.ss_family == AF_INET6)
{
- promote_v4_to_v6_addr(&addr);
- promote_v4_to_v6_mask(&mask);
+ pg_promote_v4_to_v6_addr(&addr);
+ pg_promote_v4_to_v6_mask(&mask);
}
else
#endif /* HAVE_IPV6 */
@@ -840,7 +841,7 @@ parse_hba(List *line, int line_num, hbaPort *port,
}
/* Ignore line if client port is not in the matching addr range. */
- if (!rangeSockAddr(&port->raddr.addr, &addr, &mask))
+ if (!pg_range_sockaddr(&port->raddr.addr, &addr, &mask))
return;
/* Read the rest of the line. */
@@ -1296,14 +1297,14 @@ ident_inet(const SockAddr remote_addr,
* Might look a little weird to first convert it to text and then back to
* sockaddr, but it's protocol independent.
*/
- getnameinfo_all(&remote_addr.addr, remote_addr.salen,
- remote_addr_s, sizeof(remote_addr_s),
- remote_port, sizeof(remote_port),
- NI_NUMERICHOST | NI_NUMERICSERV);
- getnameinfo_all(&local_addr.addr, local_addr.salen,
- local_addr_s, sizeof(local_addr_s),
- local_port, sizeof(local_port),
- NI_NUMERICHOST | NI_NUMERICSERV);
+ pg_getnameinfo_all(&remote_addr.addr, remote_addr.salen,
+ remote_addr_s, sizeof(remote_addr_s),
+ remote_port, sizeof(remote_port),
+ NI_NUMERICHOST | NI_NUMERICSERV);
+ pg_getnameinfo_all(&local_addr.addr, local_addr.salen,
+ local_addr_s, sizeof(local_addr_s),
+ local_port, sizeof(local_port),
+ NI_NUMERICHOST | NI_NUMERICSERV);
snprintf(ident_port, sizeof(ident_port), "%d", IDENT_PORT);
hints.ai_flags = AI_NUMERICHOST;
@@ -1314,11 +1315,11 @@ ident_inet(const SockAddr remote_addr,
hints.ai_canonname = NULL;
hints.ai_addr = NULL;
hints.ai_next = NULL;
- rc = getaddrinfo_all(remote_addr_s, ident_port, &hints, &ident_serv);
+ rc = pg_getaddrinfo_all(remote_addr_s, ident_port, &hints, &ident_serv);
if (rc || !ident_serv)
{
if (ident_serv)
- freeaddrinfo_all(hints.ai_family, ident_serv);
+ pg_freeaddrinfo_all(hints.ai_family, ident_serv);
return false; /* we don't expect this to happen */
}
@@ -1330,11 +1331,11 @@ ident_inet(const SockAddr remote_addr,
hints.ai_canonname = NULL;
hints.ai_addr = NULL;
hints.ai_next = NULL;
- rc = getaddrinfo_all(local_addr_s, NULL, &hints, &la);
+ rc = pg_getaddrinfo_all(local_addr_s, NULL, &hints, &la);
if (rc || !la)
{
if (la)
- freeaddrinfo_all(hints.ai_family, la);
+ pg_freeaddrinfo_all(hints.ai_family, la);
return false; /* we don't expect this to happen */
}
@@ -1422,8 +1423,8 @@ ident_inet(const SockAddr remote_addr,
ident_inet_done:
if (sock_fd >= 0)
closesocket(sock_fd);
- freeaddrinfo_all(remote_addr.addr.ss_family, ident_serv);
- freeaddrinfo_all(local_addr.addr.ss_family, la);
+ pg_freeaddrinfo_all(remote_addr.addr.ss_family, ident_serv);
+ pg_freeaddrinfo_all(local_addr.addr.ss_family, la);
return ident_return;
}
diff --git a/src/backend/libpq/ip.c b/src/backend/libpq/ip.c
index 14123c2fe03..e1b26e5da8e 100644
--- a/src/backend/libpq/ip.c
+++ b/src/backend/libpq/ip.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/libpq/ip.c,v 1.31 2004/12/31 21:59:50 pgsql Exp $
+ * $PostgreSQL: pgsql/src/backend/libpq/ip.c,v 1.32 2005/10/17 16:24:19 tgl Exp $
*
* This file and the IPV6 implementation were initially provided by
* Nigel Kukard <nkukard@lbsd.net>, Linux Based Systems Design
@@ -38,22 +38,22 @@
#include "libpq/ip.h"
-static int rangeSockAddrAF_INET(const struct sockaddr_in * addr,
- const struct sockaddr_in * netaddr,
- const struct sockaddr_in * netmask);
+static int range_sockaddr_AF_INET(const struct sockaddr_in *addr,
+ const struct sockaddr_in *netaddr,
+ const struct sockaddr_in *netmask);
#ifdef HAVE_IPV6
-static int rangeSockAddrAF_INET6(const struct sockaddr_in6 * addr,
- const struct sockaddr_in6 * netaddr,
- const struct sockaddr_in6 * netmask);
+static int range_sockaddr_AF_INET6(const struct sockaddr_in6 *addr,
+ const struct sockaddr_in6 *netaddr,
+ const struct sockaddr_in6 *netmask);
#endif
#ifdef HAVE_UNIX_SOCKETS
static int getaddrinfo_unix(const char *path,
- const struct addrinfo * hintsp,
- struct addrinfo ** result);
+ const struct addrinfo *hintsp,
+ struct addrinfo **result);
-static int getnameinfo_unix(const struct sockaddr_un * sa, int salen,
+static int getnameinfo_unix(const struct sockaddr_un *sa, int salen,
char *node, int nodelen,
char *service, int servicelen,
int flags);
@@ -61,11 +61,11 @@ static int getnameinfo_unix(const struct sockaddr_un * sa, int salen,
/*
- * getaddrinfo_all - get address info for Unix, IPv4 and IPv6 sockets
+ * pg_getaddrinfo_all - get address info for Unix, IPv4 and IPv6 sockets
*/
int
-getaddrinfo_all(const char *hostname, const char *servname,
- const struct addrinfo * hintp, struct addrinfo ** result)
+pg_getaddrinfo_all(const char *hostname, const char *servname,
+ const struct addrinfo *hintp, struct addrinfo **result)
{
/* not all versions of getaddrinfo() zero *result on failure */
*result = NULL;
@@ -82,7 +82,7 @@ getaddrinfo_all(const char *hostname, const char *servname,
/*
- * freeaddrinfo_all - free addrinfo structures for IPv4, IPv6, or Unix
+ * pg_freeaddrinfo_all - free addrinfo structures for IPv4, IPv6, or Unix
*
* Note: the ai_family field of the original hint structure must be passed
* so that we can tell whether the addrinfo struct was built by the system's
@@ -91,12 +91,12 @@ getaddrinfo_all(const char *hostname, const char *servname,
* not safe to look at ai_family in the addrinfo itself.
*/
void
-freeaddrinfo_all(int hint_ai_family, struct addrinfo * ai)
+pg_freeaddrinfo_all(int hint_ai_family, struct addrinfo *ai)
{
#ifdef HAVE_UNIX_SOCKETS
if (hint_ai_family == AF_UNIX)
{
- /* struct was built by getaddrinfo_unix (see getaddrinfo_all) */
+ /* struct was built by getaddrinfo_unix (see pg_getaddrinfo_all) */
while (ai != NULL)
{
struct addrinfo *p = ai;
@@ -117,7 +117,7 @@ freeaddrinfo_all(int hint_ai_family, struct addrinfo * ai)
/*
- * getnameinfo_all - get name info for Unix, IPv4 and IPv6 sockets
+ * pg_getnameinfo_all - get name info for Unix, IPv4 and IPv6 sockets
*
* The API of this routine differs from the standard getnameinfo() definition
* in two ways: first, the addr parameter is declared as sockaddr_storage
@@ -125,10 +125,10 @@ freeaddrinfo_all(int hint_ai_family, struct addrinfo * ai)
* guaranteed to be filled with something even on failure return.
*/
int
-getnameinfo_all(const struct sockaddr_storage * addr, int salen,
- char *node, int nodelen,
- char *service, int servicelen,
- int flags)
+pg_getnameinfo_all(const struct sockaddr_storage *addr, int salen,
+ char *node, int nodelen,
+ char *service, int servicelen,
+ int flags)
{
int rc;
@@ -168,8 +168,8 @@ getnameinfo_all(const struct sockaddr_storage * addr, int salen,
* -------
*/
static int
-getaddrinfo_unix(const char *path, const struct addrinfo * hintsp,
- struct addrinfo ** result)
+getaddrinfo_unix(const char *path, const struct addrinfo *hintsp,
+ struct addrinfo **result)
{
struct addrinfo hints;
struct addrinfo *aip;
@@ -234,7 +234,7 @@ getaddrinfo_unix(const char *path, const struct addrinfo * hintsp,
* Convert an address to a hostname.
*/
static int
-getnameinfo_unix(const struct sockaddr_un * sa, int salen,
+getnameinfo_unix(const struct sockaddr_un *sa, int salen,
char *node, int nodelen,
char *service, int servicelen,
int flags)
@@ -267,38 +267,39 @@ getnameinfo_unix(const struct sockaddr_un * sa, int salen,
return 0;
}
+
#endif /* HAVE_UNIX_SOCKETS */
/*
- * rangeSockAddr - is addr within the subnet specified by netaddr/netmask ?
+ * pg_range_sockaddr - is addr within the subnet specified by netaddr/netmask ?
*
* Note: caller must already have verified that all three addresses are
* in the same address family; and AF_UNIX addresses are not supported.
*/
int
-rangeSockAddr(const struct sockaddr_storage * addr,
- const struct sockaddr_storage * netaddr,
- const struct sockaddr_storage * netmask)
+pg_range_sockaddr(const struct sockaddr_storage *addr,
+ const struct sockaddr_storage *netaddr,
+ const struct sockaddr_storage *netmask)
{
if (addr->ss_family == AF_INET)
- return rangeSockAddrAF_INET((struct sockaddr_in *) addr,
- (struct sockaddr_in *) netaddr,
- (struct sockaddr_in *) netmask);
+ return range_sockaddr_AF_INET((struct sockaddr_in *) addr,
+ (struct sockaddr_in *) netaddr,
+ (struct sockaddr_in *) netmask);
#ifdef HAVE_IPV6
else if (addr->ss_family == AF_INET6)
- return rangeSockAddrAF_INET6((struct sockaddr_in6 *) addr,
- (struct sockaddr_in6 *) netaddr,
- (struct sockaddr_in6 *) netmask);
+ return range_sockaddr_AF_INET6((struct sockaddr_in6 *) addr,
+ (struct sockaddr_in6 *) netaddr,
+ (struct sockaddr_in6 *) netmask);
#endif
else
return 0;
}
static int
-rangeSockAddrAF_INET(const struct sockaddr_in * addr,
- const struct sockaddr_in * netaddr,
- const struct sockaddr_in * netmask)
+range_sockaddr_AF_INET(const struct sockaddr_in *addr,
+ const struct sockaddr_in *netaddr,
+ const struct sockaddr_in *netmask)
{
if (((addr->sin_addr.s_addr ^ netaddr->sin_addr.s_addr) &
netmask->sin_addr.s_addr) == 0)
@@ -309,10 +310,11 @@ rangeSockAddrAF_INET(const struct sockaddr_in * addr,
#ifdef HAVE_IPV6
+
static int
-rangeSockAddrAF_INET6(const struct sockaddr_in6 * addr,
- const struct sockaddr_in6 * netaddr,
- const struct sockaddr_in6 * netmask)
+range_sockaddr_AF_INET6(const struct sockaddr_in6 *addr,
+ const struct sockaddr_in6 *netaddr,
+ const struct sockaddr_in6 *netmask)
{
int i;
@@ -325,10 +327,11 @@ rangeSockAddrAF_INET6(const struct sockaddr_in6 * addr,
return 1;
}
-#endif
+
+#endif /* HAVE_IPV6 */
/*
- * SockAddr_cidr_mask - make a network mask of the appropriate family
+ * pg_sockaddr_cidr_mask - make a network mask of the appropriate family
* and required number of significant bits
*
* The resulting mask is placed in *mask, which had better be big enough.
@@ -336,7 +339,7 @@ rangeSockAddrAF_INET6(const struct sockaddr_in6 * addr,
* Return value is 0 if okay, -1 if not.
*/
int
-SockAddr_cidr_mask(struct sockaddr_storage * mask, char *numbits, int family)
+pg_sockaddr_cidr_mask(struct sockaddr_storage *mask, char *numbits, int family)
{
long bits;
char *endptr;
@@ -403,15 +406,15 @@ SockAddr_cidr_mask(struct sockaddr_storage * mask, char *numbits, int family)
#ifdef HAVE_IPV6
/*
- * promote_v4_to_v6_addr --- convert an AF_INET addr to AF_INET6, using
+ * pg_promote_v4_to_v6_addr --- convert an AF_INET addr to AF_INET6, using
* the standard convention for IPv4 addresses mapped into IPv6 world
*
* The passed addr is modified in place; be sure it is large enough to
* hold the result! Note that we only worry about setting the fields
- * that rangeSockAddr will look at.
+ * that pg_range_sockaddr will look at.
*/
void
-promote_v4_to_v6_addr(struct sockaddr_storage * addr)
+pg_promote_v4_to_v6_addr(struct sockaddr_storage *addr)
{
struct sockaddr_in addr4;
struct sockaddr_in6 addr6;
@@ -435,18 +438,18 @@ promote_v4_to_v6_addr(struct sockaddr_storage * addr)
}
/*
- * promote_v4_to_v6_mask --- convert an AF_INET netmask to AF_INET6, using
+ * pg_promote_v4_to_v6_mask --- convert an AF_INET netmask to AF_INET6, using
* the standard convention for IPv4 addresses mapped into IPv6 world
*
- * This must be different from promote_v4_to_v6_addr because we want to
+ * This must be different from pg_promote_v4_to_v6_addr because we want to
* set the high-order bits to 1's not 0's.
*
* The passed addr is modified in place; be sure it is large enough to
* hold the result! Note that we only worry about setting the fields
- * that rangeSockAddr will look at.
+ * that pg_range_sockaddr will look at.
*/
void
-promote_v4_to_v6_mask(struct sockaddr_storage * addr)
+pg_promote_v4_to_v6_mask(struct sockaddr_storage *addr)
{
struct sockaddr_in addr4;
struct sockaddr_in6 addr6;
diff --git a/src/backend/libpq/md5.c b/src/backend/libpq/md5.c
index f73d38795a6..753cba772e1 100644
--- a/src/backend/libpq/md5.c
+++ b/src/backend/libpq/md5.c
@@ -14,7 +14,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/libpq/md5.c,v 1.29 2005/10/15 02:49:18 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/libpq/md5.c,v 1.30 2005/10/17 16:24:19 tgl Exp $
*/
@@ -272,12 +272,12 @@ bytesToHex(uint8 b[16], char *s)
*/
/*
- * md5_hash
+ * pg_md5_hash
*
* Calculates the MD5 sum of the bytes in a buffer.
*
* SYNOPSIS #include "crypt.h"
- * int md5_hash(const void *buff, size_t len, char *hexsum)
+ * int pg_md5_hash(const void *buff, size_t len, char *hexsum)
*
* INPUT buff the buffer containing the bytes that you want
* the MD5 sum of.
@@ -298,7 +298,7 @@ bytesToHex(uint8 b[16], char *s)
*
*/
bool
-md5_hash(const void *buff, size_t len, char *hexsum)
+pg_md5_hash(const void *buff, size_t len, char *hexsum)
{
uint8 sum[16];
@@ -321,8 +321,8 @@ md5_hash(const void *buff, size_t len, char *hexsum)
* Returns TRUE if okay, FALSE on error (out of memory).
*/
bool
-EncryptMD5(const char *passwd, const char *salt, size_t salt_len,
- char *buf)
+pg_md5_encrypt(const char *passwd, const char *salt, size_t salt_len,
+ char *buf)
{
size_t passwd_len = strlen(passwd);
char *crypt_buf = palloc(passwd_len + salt_len);
@@ -336,7 +336,7 @@ EncryptMD5(const char *passwd, const char *salt, size_t salt_len,
memcpy(crypt_buf + passwd_len, salt, salt_len);
strcpy(buf, "md5");
- ret = md5_hash(crypt_buf, passwd_len + salt_len, buf + 3);
+ ret = pg_md5_hash(crypt_buf, passwd_len + salt_len, buf + 3);
pfree(crypt_buf);
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index ccb4bcf2b51..12be7e2c5da 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -30,7 +30,7 @@
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/backend/libpq/pqcomm.c,v 1.181 2005/10/15 02:49:18 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/libpq/pqcomm.c,v 1.182 2005/10/17 16:24:19 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -262,7 +262,7 @@ StreamServerPort(int family, char *hostName, unsigned short portNumber,
service = portNumberStr;
}
- ret = getaddrinfo_all(hostName, service, &hint, &addrs);
+ ret = pg_getaddrinfo_all(hostName, service, &hint, &addrs);
if (ret || !addrs)
{
if (hostName)
@@ -274,7 +274,7 @@ StreamServerPort(int family, char *hostName, unsigned short portNumber,
(errmsg("could not translate service \"%s\" to address: %s",
service, gai_strerror(ret))));
if (addrs)
- freeaddrinfo_all(hint.ai_family, addrs);
+ pg_freeaddrinfo_all(hint.ai_family, addrs);
return STATUS_ERROR;
}
@@ -425,7 +425,7 @@ StreamServerPort(int family, char *hostName, unsigned short portNumber,
added++;
}
- freeaddrinfo_all(hint.ai_family, addrs);
+ pg_freeaddrinfo_all(hint.ai_family, addrs);
if (!added)
return STATUS_ERROR;
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
index 8d767a0b4c8..4fea8e0e2f7 100644
--- a/src/backend/postmaster/pgstat.c
+++ b/src/backend/postmaster/pgstat.c
@@ -13,7 +13,7 @@
*
* Copyright (c) 2001-2005, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.110 2005/10/15 02:49:23 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.111 2005/10/17 16:24:19 tgl Exp $
* ----------
*/
#include "postgres.h"
@@ -255,7 +255,7 @@ pgstat_init(void)
hints.ai_addr = NULL;
hints.ai_canonname = NULL;
hints.ai_next = NULL;
- ret = getaddrinfo_all("localhost", NULL, &hints, &addrs);
+ ret = pg_getaddrinfo_all("localhost", NULL, &hints, &addrs);
if (ret || !addrs)
{
ereport(LOG,
@@ -265,12 +265,12 @@ pgstat_init(void)
}
/*
- * On some platforms, getaddrinfo_all() may return multiple addresses only
- * one of which will actually work (eg, both IPv6 and IPv4 addresses when
- * kernel will reject IPv6). Worse, the failure may occur at the bind()
- * or perhaps even connect() stage. So we must loop through the results
- * till we find a working combination. We will generate LOG messages, but
- * no error, for bogus combinations.
+ * On some platforms, pg_getaddrinfo_all() may return multiple addresses
+ * only one of which will actually work (eg, both IPv6 and IPv4 addresses
+ * when kernel will reject IPv6). Worse, the failure may occur at the
+ * bind() or perhaps even connect() stage. So we must loop through the
+ * results till we find a working combination. We will generate LOG
+ * messages, but no error, for bogus combinations.
*/
for (addr = addrs; addr; addr = addr->ai_next)
{
@@ -433,7 +433,7 @@ pgstat_init(void)
goto startup_failed;
}
- freeaddrinfo_all(hints.ai_family, addrs);
+ pg_freeaddrinfo_all(hints.ai_family, addrs);
return;
@@ -442,7 +442,7 @@ startup_failed:
(errmsg("disabling statistics collector for lack of working socket")));
if (addrs)
- freeaddrinfo_all(hints.ai_family, addrs);
+ pg_freeaddrinfo_all(hints.ai_family, addrs);
if (pgStatSock >= 0)
closesocket(pgStatSock);
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index fd7b27193c2..527677e0e75 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.469 2005/10/15 02:49:23 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.470 2005/10/17 16:24:19 tgl Exp $
*
* NOTES
*
@@ -2663,20 +2663,20 @@ BackendRun(Port *port)
*/
remote_host[0] = '\0';
remote_port[0] = '\0';
- if (getnameinfo_all(&port->raddr.addr, port->raddr.salen,
- remote_host, sizeof(remote_host),
- remote_port, sizeof(remote_port),
- (log_hostname ? 0 : NI_NUMERICHOST) | NI_NUMERICSERV))
+ if (pg_getnameinfo_all(&port->raddr.addr, port->raddr.salen,
+ remote_host, sizeof(remote_host),
+ remote_port, sizeof(remote_port),
+ (log_hostname ? 0 : NI_NUMERICHOST) | NI_NUMERICSERV))
{
- int ret = getnameinfo_all(&port->raddr.addr, port->raddr.salen,
- remote_host, sizeof(remote_host),
- remote_port, sizeof(remote_port),
- NI_NUMERICHOST | NI_NUMERICSERV);
+ int ret = pg_getnameinfo_all(&port->raddr.addr, port->raddr.salen,
+ remote_host, sizeof(remote_host),
+ remote_port, sizeof(remote_port),
+ NI_NUMERICHOST | NI_NUMERICSERV);
if (ret)
ereport(WARNING,
- (errmsg("getnameinfo_all() failed: %s",
- gai_strerror(ret))));
+ (errmsg_internal("pg_getnameinfo_all() failed: %s",
+ gai_strerror(ret))));
}
snprintf(remote_ps_data, sizeof(remote_ps_data),
remote_port[0] == '\0' ? "%s" : "%s(%s)",
diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c
index 17403c5f33c..3b526d0655b 100644
--- a/src/backend/utils/adt/network.c
+++ b/src/backend/utils/adt/network.c
@@ -1,7 +1,7 @@
/*
* PostgreSQL type definitions for the INET and CIDR types.
*
- * $PostgreSQL: pgsql/src/backend/utils/adt/network.c,v 1.55 2005/10/15 02:49:29 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/network.c,v 1.56 2005/10/17 16:24:19 tgl Exp $
*
* Jon Postel RIP 16 Oct 1998
*/
@@ -1013,10 +1013,10 @@ inet_client_addr(PG_FUNCTION_ARGS)
remote_host[0] = '\0';
- ret = getnameinfo_all(&port->raddr.addr, port->raddr.salen,
- remote_host, sizeof(remote_host),
- NULL, 0,
- NI_NUMERICHOST | NI_NUMERICSERV);
+ ret = pg_getnameinfo_all(&port->raddr.addr, port->raddr.salen,
+ remote_host, sizeof(remote_host),
+ NULL, 0,
+ NI_NUMERICHOST | NI_NUMERICSERV);
if (ret)
PG_RETURN_NULL();
@@ -1050,10 +1050,10 @@ inet_client_port(PG_FUNCTION_ARGS)
remote_port[0] = '\0';
- ret = getnameinfo_all(&port->raddr.addr, port->raddr.salen,
- NULL, 0,
- remote_port, sizeof(remote_port),
- NI_NUMERICHOST | NI_NUMERICSERV);
+ ret = pg_getnameinfo_all(&port->raddr.addr, port->raddr.salen,
+ NULL, 0,
+ remote_port, sizeof(remote_port),
+ NI_NUMERICHOST | NI_NUMERICSERV);
if (ret)
PG_RETURN_NULL();
@@ -1087,10 +1087,10 @@ inet_server_addr(PG_FUNCTION_ARGS)
local_host[0] = '\0';
- ret = getnameinfo_all(&port->laddr.addr, port->laddr.salen,
- local_host, sizeof(local_host),
- NULL, 0,
- NI_NUMERICHOST | NI_NUMERICSERV);
+ ret = pg_getnameinfo_all(&port->laddr.addr, port->laddr.salen,
+ local_host, sizeof(local_host),
+ NULL, 0,
+ NI_NUMERICHOST | NI_NUMERICSERV);
if (ret)
PG_RETURN_NULL();
@@ -1124,10 +1124,10 @@ inet_server_port(PG_FUNCTION_ARGS)
local_port[0] = '\0';
- ret = getnameinfo_all(&port->laddr.addr, port->laddr.salen,
- NULL, 0,
- local_port, sizeof(local_port),
- NI_NUMERICHOST | NI_NUMERICSERV);
+ ret = pg_getnameinfo_all(&port->laddr.addr, port->laddr.salen,
+ NULL, 0,
+ local_port, sizeof(local_port),
+ NI_NUMERICHOST | NI_NUMERICSERV);
if (ret)
PG_RETURN_NULL();
diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c
index 8c10bf387d4..1d68b32e526 100644
--- a/src/backend/utils/adt/pgstatfuncs.c
+++ b/src/backend/utils/adt/pgstatfuncs.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/adt/pgstatfuncs.c,v 1.25 2005/10/15 02:49:29 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/pgstatfuncs.c,v 1.26 2005/10/17 16:24:19 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -417,10 +417,10 @@ pg_stat_get_backend_client_addr(PG_FUNCTION_ARGS)
}
remote_host[0] = '\0';
- ret = getnameinfo_all(&beentry->clientaddr.addr, beentry->clientaddr.salen,
- remote_host, sizeof(remote_host),
- NULL, 0,
- NI_NUMERICHOST | NI_NUMERICSERV);
+ ret = pg_getnameinfo_all(&beentry->clientaddr.addr, beentry->clientaddr.salen,
+ remote_host, sizeof(remote_host),
+ NULL, 0,
+ NI_NUMERICHOST | NI_NUMERICSERV);
if (ret)
PG_RETURN_NULL();
@@ -462,11 +462,11 @@ pg_stat_get_backend_client_port(PG_FUNCTION_ARGS)
}
remote_port[0] = '\0';
- ret = getnameinfo_all(&beentry->clientaddr.addr,
- beentry->clientaddr.salen,
- NULL, 0,
- remote_port, sizeof(remote_port),
- NI_NUMERICHOST | NI_NUMERICSERV);
+ ret = pg_getnameinfo_all(&beentry->clientaddr.addr,
+ beentry->clientaddr.salen,
+ NULL, 0,
+ remote_port, sizeof(remote_port),
+ NI_NUMERICHOST | NI_NUMERICSERV);
if (ret)
PG_RETURN_NULL();
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index 07ba4dc6848..5fc3128360c 100644
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.136 2005/10/15 02:49:30 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.137 2005/10/17 16:24:19 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -2613,7 +2613,7 @@ md5_text(PG_FUNCTION_ARGS)
len = VARSIZE(in_text) - VARHDRSZ;
/* get the hash result */
- if (md5_hash(VARDATA(in_text), len, hexsum) == false)
+ if (pg_md5_hash(VARDATA(in_text), len, hexsum) == false)
ereport(ERROR,
(errcode(ERRCODE_OUT_OF_MEMORY),
errmsg("out of memory")));
@@ -2636,7 +2636,7 @@ md5_bytea(PG_FUNCTION_ARGS)
text *result_text;
len = VARSIZE(in) - VARHDRSZ;
- if (md5_hash(VARDATA(in), len, hexsum) == false)
+ if (pg_md5_hash(VARDATA(in), len, hexsum) == false)
ereport(ERROR,
(errcode(ERRCODE_OUT_OF_MEMORY),
errmsg("out of memory")));
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 00:42:41 +0000