*Really* fix the no password -N opt :-).

Jeremy.
(This used to be commit 187d8a94eae87a32432c7c295698517b6ae31523)

diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c
index 78d81fa530d940f1eaba14d7027dc65f745e6d76..99c26106afad7a636590eb0b53c9cd049327ffdb 100644 (file)
--- 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 289d8a058f7049654c389b909b5ee9b31504098b..3d653d9b80c7f9a680ddca1bed0f3cb843192d0a 100644 (file)
--- 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;