Skip to content
Snippets Groups Projects
Commit 27c27291 authored by Bruce Momjian's avatar Bruce Momjian
Browse files

Add \n to libpq print output where needed.

parent 95504094
No related branches found
No related tags found
No related merge requests found
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes). * exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.52 2001/08/17 03:09:31 momjian Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.53 2001/08/17 15:02:18 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -285,7 +285,7 @@ pg_krb5_init(char *PQerrormsg) ...@@ -285,7 +285,7 @@ pg_krb5_init(char *PQerrormsg)
if (retval) if (retval)
{ {
snprintf(PQerrormsg, PQERRORMSG_LENGTH, snprintf(PQerrormsg, PQERRORMSG_LENGTH,
"pg_krb5_init: krb5_init_context: %s", "pg_krb5_init: krb5_init_context: %s\n",
error_message(retval)); error_message(retval));
return STATUS_ERROR; return STATUS_ERROR;
} }
...@@ -294,7 +294,7 @@ pg_krb5_init(char *PQerrormsg) ...@@ -294,7 +294,7 @@ pg_krb5_init(char *PQerrormsg)
if (retval) if (retval)
{ {
snprintf(PQerrormsg, PQERRORMSG_LENGTH, snprintf(PQerrormsg, PQERRORMSG_LENGTH,
"pg_krb5_init: krb5_cc_default: %s", "pg_krb5_init: krb5_cc_default: %s\n",
error_message(retval)); error_message(retval));
krb5_free_context(pg_krb5_context); krb5_free_context(pg_krb5_context);
return STATUS_ERROR; return STATUS_ERROR;
...@@ -305,7 +305,7 @@ pg_krb5_init(char *PQerrormsg) ...@@ -305,7 +305,7 @@ pg_krb5_init(char *PQerrormsg)
if (retval) if (retval)
{ {
snprintf(PQerrormsg, PQERRORMSG_LENGTH, snprintf(PQerrormsg, PQERRORMSG_LENGTH,
"pg_krb5_init: krb5_cc_get_principal: %s", "pg_krb5_init: krb5_cc_get_principal: %s\n",
error_message(retval)); error_message(retval));
krb5_cc_close(pg_krb5_context, pg_krb5_ccache); krb5_cc_close(pg_krb5_context, pg_krb5_ccache);
krb5_free_context(pg_krb5_context); krb5_free_context(pg_krb5_context);
...@@ -316,7 +316,7 @@ pg_krb5_init(char *PQerrormsg) ...@@ -316,7 +316,7 @@ pg_krb5_init(char *PQerrormsg)
if (retval) if (retval)
{ {
snprintf(PQerrormsg, PQERRORMSG_LENGTH, snprintf(PQerrormsg, PQERRORMSG_LENGTH,
"pg_krb5_init: krb5_unparse_name: %s", "pg_krb5_init: krb5_unparse_name: %s\n",
error_message(retval)); error_message(retval));
krb5_free_principal(pg_krb5_context, pg_krb5_client); krb5_free_principal(pg_krb5_context, pg_krb5_client);
krb5_cc_close(pg_krb5_context, pg_krb5_ccache); krb5_cc_close(pg_krb5_context, pg_krb5_ccache);
...@@ -371,7 +371,7 @@ pg_krb5_sendauth(char *PQerrormsg, int sock, ...@@ -371,7 +371,7 @@ pg_krb5_sendauth(char *PQerrormsg, int sock,
if (retval) if (retval)
{ {
snprintf(PQerrormsg, PQERRORMSG_LENGTH, snprintf(PQerrormsg, PQERRORMSG_LENGTH,
"pg_krb5_sendauth: krb5_sname_to_principal: %s", "pg_krb5_sendauth: krb5_sname_to_principal: %s\n",
error_message(retval)); error_message(retval));
return STATUS_ERROR; return STATUS_ERROR;
} }
...@@ -385,7 +385,7 @@ pg_krb5_sendauth(char *PQerrormsg, int sock, ...@@ -385,7 +385,7 @@ pg_krb5_sendauth(char *PQerrormsg, int sock,
if (flags < 0 || fcntl(sock, F_SETFL, (long) (flags & ~O_NONBLOCK))) if (flags < 0 || fcntl(sock, F_SETFL, (long) (flags & ~O_NONBLOCK)))
{ {
snprintf(PQerrormsg, PQERRORMSG_LENGTH, snprintf(PQerrormsg, PQERRORMSG_LENGTH,
libpq_gettext("could not set socket to blocking mode: %s"), strerror(errno)); libpq_gettext("could not set socket to blocking mode: %s\n"), strerror(errno));
krb5_free_principal(pg_krb5_context, server); krb5_free_principal(pg_krb5_context, server);
return STATUS_ERROR; return STATUS_ERROR;
} }
...@@ -401,14 +401,13 @@ pg_krb5_sendauth(char *PQerrormsg, int sock, ...@@ -401,14 +401,13 @@ pg_krb5_sendauth(char *PQerrormsg, int sock,
if (retval == KRB5_SENDAUTH_REJECTED && err_ret) if (retval == KRB5_SENDAUTH_REJECTED && err_ret)
{ {
snprintf(PQerrormsg, PQERRORMSG_LENGTH, snprintf(PQerrormsg, PQERRORMSG_LENGTH,
libpq_gettext("Kerberos 5 authentication rejected: %*s"), libpq_gettext("Kerberos 5 authentication rejected: %*s\n"),
err_ret->text.length, err_ret->text.data); err_ret->text.length, err_ret->text.data);
} }
else else
{ {
snprintf(PQerrormsg, PQERRORMSG_LENGTH, snprintf(PQerrormsg, PQERRORMSG_LENGTH,
"krb5_sendauth: %s", "krb5_sendauth: %s\n", error_message(retval));
error_message(retval));
} }
if (err_ret) if (err_ret)
...@@ -422,7 +421,7 @@ pg_krb5_sendauth(char *PQerrormsg, int sock, ...@@ -422,7 +421,7 @@ pg_krb5_sendauth(char *PQerrormsg, int sock,
if (fcntl(sock, F_SETFL, (long) flags)) if (fcntl(sock, F_SETFL, (long) flags))
{ {
snprintf(PQerrormsg, PQERRORMSG_LENGTH, snprintf(PQerrormsg, PQERRORMSG_LENGTH,
libpq_gettext("could not restore non-blocking mode on socket: %s"), libpq_gettext("could not restore non-blocking mode on socket: %s\n"),
strerror(errno)); strerror(errno));
ret = STATUS_ERROR; ret = STATUS_ERROR;
} }
...@@ -594,7 +593,7 @@ fe_setauthsvc(const char *name, char *PQerrormsg) ...@@ -594,7 +593,7 @@ fe_setauthsvc(const char *name, char *PQerrormsg)
if (i == n_authsvcs) if (i == n_authsvcs)
{ {
snprintf(PQerrormsg, PQERRORMSG_LENGTH, snprintf(PQerrormsg, PQERRORMSG_LENGTH,
libpq_gettext("invalid authentication service name \"%s\", ignored"), libpq_gettext("invalid authentication service name \"%s\", ignored\n"),
name); name);
} }
return; return;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment