summaryrefslogtreecommitdiff
path: root/source3/utils/net_ads.c
diff options
context:
space:
mode:
authorJim McDonough <jmcd@samba.org>2003-10-23 14:33:21 +0000
committerJim McDonough <jmcd@samba.org>2003-10-23 14:33:21 +0000
commit2a09fe6cb4e31e46dd92052bbc134629b4ae8fda (patch)
tree999b17e79142ea876292f92ba815f99edc4bfc4f /source3/utils/net_ads.c
parent8e1dfc52b91f38ab53c8f717cb8b952c49a501bb (diff)
downloadsamba-2a09fe6cb4e31e46dd92052bbc134629b4ae8fda.tar.gz
samba-2a09fe6cb4e31e46dd92052bbc134629b4ae8fda.tar.bz2
samba-2a09fe6cb4e31e46dd92052bbc134629b4ae8fda.zip
Fix bug 451. Stop net -P from prompting for machine account password.
Based on work by Ken Cross (kcross@nssolutions.com). (This used to be commit 32aa749bf1328e43af629ade30b3fdc11dd5e3ec)
Diffstat (limited to 'source3/utils/net_ads.c')
-rw-r--r--source3/utils/net_ads.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 3b955742d8..cad93608dc 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -145,7 +145,7 @@ static ADS_STRUCT *ads_startup(void)
}
retry:
- if (!opt_password && need_password) {
+ if (!opt_password && need_password && !opt_machine_pass) {
char *prompt;
asprintf(&prompt,"%s password: ", opt_user_name);
opt_password = getpass(prompt);