libsmb: Avoid an "else", we return in the "true" branch

Reduce indentation

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/source3/libsmb/passchange.c b/source3/libsmb/passchange.c
index c3ab30849ab8634956f553eb378cf61fb456dc6a..998b7cfd9a5d73ab11a90b073173f0e0100c95a1 100644 (file)
--- a/source3/libsmb/passchange.c
+++ b/source3/libsmb/passchange.c
@@ -310,23 +310,27 @@ NTSTATUS remote_password_change(const char *remote_machine,
                        }
                        cli_shutdown(cli);
                        return NT_STATUS_UNSUCCESSFUL;
-               } else {
-                       /* Use the old RAP method. */
-                       if (cli_oem_change_password(cli, user_name, new_passwd, old_passwd)) {
-                               /* SAMR failed, but the old LanMan protocol worked! */
+               }
 
-                               cli_shutdown(cli);
-                               return NT_STATUS_OK;
-                       }
+               /* Use the old RAP method. */
+               if (cli_oem_change_password(
+                           cli, user_name, new_passwd, old_passwd)) {
+                       /* SAMR failed, but the old LanMan protocol worked! */
 
-                       result = cli_nt_error(cli);
-                       if (asprintf(err_str, "machine %s rejected the password "
-                                "change: Error was : %s.\n",
-                                remote_machine, nt_errstr(result)) == -1) {
-                               *err_str = NULL;
-                       }
                        cli_shutdown(cli);
-                       return result;
+                       return NT_STATUS_OK;
                }
+
+               result = cli_nt_error(cli);
+               if (asprintf(err_str,
+                            "machine %s rejected the password "
+                            "change: Error was : %s.\n",
+                            remote_machine,
+                            nt_errstr(result)) == -1)
+               {
+                       *err_str = NULL;
+               }
+               cli_shutdown(cli);
+               return result;
        }
 }