s4:ldap_server: remove an useless indentation level from gensec_update_ev()
authorStefan Metzmacher <metze@samba.org>
Thu, 11 May 2017 17:13:49 +0000 (19:13 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 15 Jun 2017 07:13:23 +0000 (09:13 +0200)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
source4/ldap_server/ldap_bind.c

index 4913629cfcc118901d3de4c267d4631c66f88921..fb4593de95f4243c236473eb6f0bcb38fd30b3ca 100644 (file)
@@ -374,6 +374,8 @@ static NTSTATUS ldapsrv_BindSASL(struct ldapsrv_call *call)
        int result = 0;
        const char *errstr=NULL;
        NTSTATUS status = NT_STATUS_OK;
+       DATA_BLOB input = data_blob_null;
+       DATA_BLOB output = data_blob_null;
 
        DEBUG(10, ("BindSASL dn: %s\n",req->dn));
 
@@ -410,20 +412,14 @@ static NTSTATUS ldapsrv_BindSASL(struct ldapsrv_call *call)
                }
        }
 
-       if (NT_STATUS_IS_OK(status)) {
-               DATA_BLOB input = data_blob(NULL, 0);
-               DATA_BLOB output = data_blob(NULL, 0);
-
-               if (req->creds.SASL.secblob) {
-                       input = *req->creds.SASL.secblob;
-               }
-
-               status = gensec_update_ev(conn->gensec, reply, conn->connection->event.ctx,
-                                         input, &output);
-
-               *resp->SASL.secblob = output;
+       if (req->creds.SASL.secblob) {
+               input = *req->creds.SASL.secblob;
        }
 
+       status = gensec_update_ev(conn->gensec, reply, conn->connection->event.ctx,
+                                 input, &output);
+       *resp->SASL.secblob = output;
+
        if (NT_STATUS_EQUAL(NT_STATUS_MORE_PROCESSING_REQUIRED, status)) {
                result = LDAP_SASL_BIND_IN_PROGRESS;
                errstr = NULL;