summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-12-06 19:15:56 -0800
committerJeremy Allison <jra@samba.org>2007-12-06 19:15:56 -0800
commit9e03d6117a2c3049bdb3e2a7226e7b91283bbc23 (patch)
tree7bfc522794b2ae3db479502425158c4cd4fa6b7b
parente7781bd20ff807019d5f7d116ea0eaf440889e9b (diff)
downloadsamba-9e03d6117a2c3049bdb3e2a7226e7b91283bbc23.tar.gz
samba-9e03d6117a2c3049bdb3e2a7226e7b91283bbc23.tar.bz2
samba-9e03d6117a2c3049bdb3e2a7226e7b91283bbc23.zip
*Really* fix the no password -N opt :-).
Jeremy. (This used to be commit 187d8a94eae87a32432c7c295698517b6ae31523)
-rw-r--r--source3/lib/popt_common.c2
-rw-r--r--source3/lib/util.c7
2 files changed, 1 insertions, 8 deletions
diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c
index 78d81fa530..99c26106af 100644
--- a/source3/lib/popt_common.c
+++ b/source3/lib/popt_common.c
@@ -524,7 +524,7 @@ static void popt_common_credentials_callback(poptContext con,
}
break;
case 'N':
- set_cmdline_auth_info_no_password();
+ set_cmdline_auth_info_password("");
break;
}
}
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 289d8a058f..3d653d9b80 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -367,13 +367,6 @@ bool get_cmdline_auth_info_got_pass(void)
return cmdline_auth_info.got_pass;
}
-/* This should only be used by lib/popt_common.c JRA */
-void set_cmdline_auth_info_no_password(void)
-{
- SAFE_FREE(cmdline_auth_info.password);
- cmdline_auth_info.got_pass = false;
-}
-
bool get_cmdline_auth_info_copy(struct user_auth_info *info)
{
*info = cmdline_auth_info;