Fix SSPI login when multiple roundtrips are required

This fixes SSPI login failures showing "The function
requested is not supported", often showing up when connecting
to localhost. The reason was not properly updating the SSPI
handle when multiple roundtrips were required to complete the
authentication sequence.

Report and analysis by Ahmed Shinwari, patch by Magnus Hagander

diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 74e61a4b636c776202f9277d577d655415a741b1..c749139eed60eea39143b9eb723877801e6aa555 100644 (file)
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -1366,16 +1366,22 @@ pg_SSPI_recvauth(Port *port)
                          _("could not accept SSPI security context"), r);
        }
 
+       /*
+        * Overwrite the current context with the one we just received.
+        * If sspictx is NULL it was the first loop and we need to allocate
+        * a buffer for it. On subsequent runs, we can just overwrite the
+        * buffer contents since the size does not change.
+        */
        if (sspictx == NULL)
        {
            sspictx = malloc(sizeof(CtxtHandle));
            if (sspictx == NULL)
                ereport(ERROR,
                        (errmsg("out of memory")));
-
-           memcpy(sspictx, &newctx, sizeof(CtxtHandle));
        }
 
+       memcpy(sspictx, &newctx, sizeof(CtxtHandle));
+
        if (r == SEC_I_CONTINUE_NEEDED)
            elog(DEBUG4, "SSPI continue needed");