[PATCH v3 2/4] libs/ldap: sasl_encode() should construct output buffer as data + token.

[Dmitry Timoshkov]

From: Dmitry Timoshkov

Cyrus SASL GSSAPI plugin does it this way:
https://github.com/cyrusimap/cyrus-sasl/blob/master/plugins/gssapi.c

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55304
Signed-off-by: Dmitry Timoshkov 
---
 libs/ldap/libldap/sasl_w.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/libs/ldap/libldap/sasl_w.c b/libs/ldap/libldap/sasl_w.c
index 8dda8420613..61b68de7e26 100644
--- a/libs/ldap/libldap/sasl_w.c
+++ b/libs/ldap/libldap/sasl_w.c
@@ -109,21 +109,24 @@ int sasl_encode( sasl_conn_t *handle, const char *input, unsigned int inputlen,
     unsigned int len;
     int ret;

+    ldap_log_printf( NULL, LDAP_DEBUG_TRACE, "sasl_encode: %p,%u\n", input, inputlen );
+
     if ((ret = grow_buffer( conn, sizeof(len) + inputlen + conn->trailer_size )) < 0) return ret;
-    memcpy( conn->buf + sizeof(len) + conn->trailer_size, input, inputlen );
-    bufs[0].pvBuffer = conn->buf + sizeof(len) + conn->trailer_size;
-    bufs[1].pvBuffer = conn->buf + sizeof(len);
+    memcpy( conn->buf + sizeof(len), input, inputlen );
+    bufs[0].pvBuffer = conn->buf + sizeof(len);
+    bufs[1].pvBuffer = conn->buf + sizeof(len) + inputlen;

-    status = EncryptMessage( &conn->ctxt_handle, 0, &buf_desc, 0 );
+    status = EncryptMessage( &conn->ctxt_handle, (conn->qop & ISC_RET_CONFIDENTIALITY) ? 0 : SECQOP_WRAP_NO_ENCRYPT, &buf_desc, 0 );
     if (status == SEC_E_OK)
     {
         len = htonl( bufs[0].cbBuffer + bufs[1].cbBuffer );
         memcpy( conn->buf, &len, sizeof(len) );
         *output = conn->buf;
         *outputlen = sizeof(len) + bufs[0].cbBuffer + bufs[1].cbBuffer;
+        return SASL_OK;
     }

-    return (status == SEC_E_OK) ? SASL_OK : SASL_FAIL;
+    return SASL_FAIL;
 }

const char *sasl_errstring( int saslerr, const char *langlist, const char **outlang )