aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBryan Henderson <bryanh@giraffe.netgate.net>1996-10-28 09:05:29 +0000
committerBryan Henderson <bryanh@giraffe.netgate.net>1996-10-28 09:05:29 +0000
commit63481f0b9265c9a3d5633c631dbb0df1ecb51601 (patch)
tree1d8c6fc9a9dc3a0b6b0b0fa7af7cc850ff8ae5ec /src
parentaa1eac7979fc4fa1c74813fcdc44b8dbb166317f (diff)
downloadpostgresql-63481f0b9265c9a3d5633c631dbb0df1ecb51601.tar.gz
postgresql-63481f0b9265c9a3d5633c631dbb0df1ecb51601.zip
Use strncpy() and local buffers instead of snprintf(), since not everyone
has snprintf().
Diffstat (limited to 'src')
-rw-r--r--src/backend/postmaster/postmaster.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index d47e27651b4..a21b75d0400 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.16 1996/10/24 07:55:07 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.17 1996/10/28 09:05:29 bryanh Exp $
*
* NOTES
*
@@ -598,20 +598,23 @@ ConnStartup(Port *port, int *status,
(void) strncpy(namebuf, sp.user, NAMEDATALEN);
namebuf[NAMEDATALEN] = '\0';
if (!namebuf[0]) {
- snprintf(errormsg, errormsg_len,
- "No Postgres username specified in startup packet.");
+ strncpy(errormsg,
+ "No Postgres username specified in startup packet.",
+ errormsg_len);
*status = STATUS_ERROR;
} else {
if (be_recvauth(msgType, port, namebuf, &sp) != STATUS_OK) {
- snprintf(errormsg, errormsg_len,
- "Failed to authenticate client as Postgres user '%s' "
- "using authentication scheme %d.",
- namebuf, msgType);
+ char buffer[200 + sizeof(namebuf)];
+ sprintf(buffer,
+ "Failed to authenticate client as Postgres user '%s' "
+ "using authentication scheme %d.",
+ namebuf, msgType);
+ strncpy(errormsg, buffer, errormsg_len);
*status = STATUS_ERROR;
} else {
if (BackendStartup(&sp, port, &pid) != STATUS_OK) {
- snprintf(errormsg, errormsg_len,
- "Startup (fork) of backend failed.");
+ strncpy(errormsg, "Startup (fork) of backend failed.",
+ errormsg_len);
*status = STATUS_ERROR;
} else {
errormsg[0] = '\0'; /* just for robustness */