Protocol cleanup from Phil.

diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 74643037288a142af5ae9c93f88c65ac42006708..430b2e22409b65b782f6a24974eccc98c5ae31b3 100644 (file)
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.21 1998/01/26 01:41:04 scrappy Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.22 1998/01/27 03:11:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -72,7 +72,7 @@ static int map_old_to_new(Port *port, UserAuth old, int status);
  * unauthenticated connections.)
  */
 static int
-pg_krb4_recvauth(Port *)
+pg_krb4_recvauth(Port *port)
 {
        long            krbopts = 0;    /* one-way authentication */
        KTEXT_ST        clttkt;
@@ -117,7 +117,7 @@ pg_krb4_recvauth(Port *)
        {
                sprintf(PQerrormsg,
                                "pg_krb4_recvauth: name \"%s\" != \"%s\"\n",
-                               port->username,
+                               port->user,
                                auth_data.pname);
                fputs(PQerrormsg, stderr);
                pqdebug("%s", PQerrormsg);
@@ -296,7 +296,7 @@ pg_krb5_recvauth(Port *port)
        {
                sprintf(PQerrormsg,
                                "pg_krb5_recvauth: name \"%s\" != \"%s\"\n",
-                               port->username, kusername);
+                               port->user, kusername);
                fputs(PQerrormsg, stderr);
                pqdebug("%s", PQerrormsg);
                pfree(kusername);

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 386bd049a6dce60cf50d6305c1e95b0707931430..940047b1e67a34eb08afb309d153e185a38f152b 100644 (file)
--- 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.70 1998/01/26 01:41:15 scrappy Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.71 1998/01/27 03:11:46 momjian Exp $
  *
  * NOTES
  *
@@ -1162,14 +1162,14 @@ DoExec(Port *port)
        argbuf[(2 * ARGV_SIZE)] = '\0';
        split_opts(av, &ac, argbuf);
 
-       StrNCpy(dbbuf, port->database, ARGV_SIZE);
-       av[ac++] = dbbuf;
-
        /* Tell the backend what protocol the frontend is using. */
 
        sprintf(protobuf, "-v %u", port->proto);
        av[ac++] = protobuf;
 
+       StrNCpy(dbbuf, port->database, ARGV_SIZE);
+       av[ac++] = dbbuf;
+
        av[ac] = (char *) NULL;
 
        if (DebugLvl > 1)