lib/cmdline: move cli_credentials_set_cmdline_callbacks to the end of POPT_CALLBACK_R...

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15018

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/lib/cmdline/cmdline.c b/lib/cmdline/cmdline.c
index db962146bd27502d5ff91af3ddd09577c12a9222..4b03f0231054f752c96c5d442309779a5ed44ed4 100644 (file)
--- a/lib/cmdline/cmdline.c
+++ b/lib/cmdline/cmdline.c
@@ -803,19 +803,6 @@ static void popt_common_credentials_callback(poptContext popt_ctx,
                                "Unable to read defaults from smb.conf\n");
                }
 
-               (void)cli_credentials_get_password_and_obtained(creds,
-                                                               &password_obtained);
-               if (!skip_password_callback &&
-                   password_obtained < CRED_CALLBACK) {
-                       ok = cli_credentials_set_cmdline_callbacks(creds);
-                       if (!ok) {
-                               fprintf(stderr,
-                                       "Failed to set cmdline password "
-                                       "callback\n");
-                               exit(1);
-                       }
-               }
-
                if (machine_account_pending) {
                        NTSTATUS status;
 
@@ -850,6 +837,19 @@ static void popt_common_credentials_callback(poptContext popt_ctx,
                                                     CRED_SPECIFIED);
                }
 
+               (void)cli_credentials_get_password_and_obtained(creds,
+                                                               &password_obtained);
+               if (!skip_password_callback &&
+                   password_obtained < CRED_CALLBACK) {
+                       ok = cli_credentials_set_cmdline_callbacks(creds);
+                       if (!ok) {
+                               fprintf(stderr,
+                                       "Failed to set cmdline password "
+                                       "callback\n");
+                               exit(1);
+                       }
+               }
+
                return;
        }