pdb_nds: Fix CID 1273401 Unused value
authorVolker Lendecke <vl@samba.org>
Fri, 6 Apr 2018 13:57:36 +0000 (15:57 +0200)
committerJeremy Allison <jra@samba.org>
Sat, 7 Apr 2018 00:11:20 +0000 (02:11 +0200)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/passdb/pdb_nds.c

index 6245ecbae2db497eb8d39303cb8ff03368b33317..349ea0b6c38f4657b303b69a6b3879e595b93c9d 100644 (file)
@@ -183,15 +183,19 @@ static int berEncodeLoginData(
                err = (ber_printf(requestBer, "}}", 0) < 0) ? LDAP_ENCODING_ERROR : 0;
        }
 
-       if(putData)
-       {
+       if (!err) {
+               if (putData) {
                /* BER Encode the the tag and data */
-               err = (ber_printf(requestBer, "oio}", utf8TagPtr, utf8TagSize, putDataLen, putData, putDataLen) < 0) ? LDAP_ENCODING_ERROR : 0;
-       }
-       else
-       {
+                       err = (ber_printf(requestBer, "oio}", utf8TagPtr,
+                                         utf8TagSize, putDataLen, putData,
+                                         putDataLen) < 0)
+                               ? LDAP_ENCODING_ERROR : 0;
+               } else {
                /* BER Encode the the tag */
-               err = (ber_printf(requestBer, "o}", utf8TagPtr, utf8TagSize) < 0) ? LDAP_ENCODING_ERROR : 0;
+                       err = (ber_printf(requestBer, "o}", utf8TagPtr,
+                                         utf8TagSize) < 0)
+                               ? LDAP_ENCODING_ERROR : 0;
+               }
        }
 
        if (err)