Merge from 3.0

(This used to be commit c8db2f7cdbe280ad3c3d35c0640d19b0f664bd36)

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 24ae9a8811fd5557b74d5e0f96f881e731c3dad1..6eec71aedf34615aaa92a3a726884b7aa260f66d 100644 (file)
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -147,7 +147,7 @@ static ADS_STRUCT *ads_startup(void)
 retry:
        if (!opt_password && need_password && !opt_machine_pass) {
                char *prompt;
-               asprintf(&prompt,"%s password: ", opt_user_name);
+               asprintf(&prompt,"%s's password: ", opt_user_name);
                opt_password = getpass(prompt);
                free(prompt);
        }