Commit e6721c6e authored by Tom Lane's avatar Tom Lane

Previous patch had no detectable virtue other than being a one-liner.

Try to make the code look self-consistent again, so it doesn't confuse
future developers.
parent 869af50f
...@@ -1956,6 +1956,8 @@ canAcceptConnections(void) ...@@ -1956,6 +1956,8 @@ canAcceptConnections(void)
/* /*
* ConnCreate -- create a local connection data structure * ConnCreate -- create a local connection data structure
*
* Returns NULL on failure, other than out-of-memory which is fatal.
*/ */
static Port * static Port *
ConnCreate(int serverFd) ConnCreate(int serverFd)
...@@ -1977,8 +1979,7 @@ ConnCreate(int serverFd) ...@@ -1977,8 +1979,7 @@ ConnCreate(int serverFd)
ConnFree(port); ConnFree(port);
return NULL; return NULL;
} }
else
{
/* /*
* Precompute password salt values to use for this connection. It's * Precompute password salt values to use for this connection. It's
* slightly annoying to do this long in advance of knowing whether * slightly annoying to do this long in advance of knowing whether
...@@ -1987,7 +1988,6 @@ ConnCreate(int serverFd) ...@@ -1987,7 +1988,6 @@ ConnCreate(int serverFd)
* advanced, and all backends would end up using the same salt... * advanced, and all backends would end up using the same salt...
*/ */
RandomSalt(port->md5Salt); RandomSalt(port->md5Salt);
}
/* /*
* Allocate GSSAPI specific state struct * Allocate GSSAPI specific state struct
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment