From 63481f0b9265c9a3d5633c631dbb0df1ecb51601 Mon Sep 17 00:00:00 2001 From: Bryan Henderson Date: Mon, 28 Oct 1996 09:05:29 +0000 Subject: [PATCH] Use strncpy() and local buffers instead of snprintf(), since not everyone has snprintf(). --- src/backend/postmaster/postmaster.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index d47e27651b..a21b75d040 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 */ -- 2.40.0