diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-08-11 18:31:27 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:01:39 -0500 |
| commit | f1f4f665b01aec093de9e93f399070f44f65a551 (patch) | |
| tree | b296d9762c3ca0e3b33341c00e9f62f1dfef43ee | |
| parent | a43b026ef0e9c1ffd24130c35275f02326bfc9c7 (diff) | |
| download | samba-f1f4f665b01aec093de9e93f399070f44f65a551.tar.gz samba-f1f4f665b01aec093de9e93f399070f44f65a551.tar.bz2 samba-f1f4f665b01aec093de9e93f399070f44f65a551.zip | |
r24335: Fix -N support.
(This used to be commit 18ea767d396bf6d956fd83ee3d2687d98897ae36)
| -rw-r--r-- | source4/lib/cmdline/popt_credentials.c | 2 | ||||
| -rwxr-xr-x | testprogs/blackbox/test_smbclient.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source4/lib/cmdline/popt_credentials.c b/source4/lib/cmdline/popt_credentials.c index e4931cd1ce..259dbf8ee1 100644 --- a/source4/lib/cmdline/popt_credentials.c +++ b/source4/lib/cmdline/popt_credentials.c @@ -132,7 +132,7 @@ static void popt_common_credentials_callback(poptContext con, struct poptOption popt_common_credentials[] = { { NULL, 0, POPT_ARG_CALLBACK|POPT_CBFLAG_PRE|POPT_CBFLAG_POST, (void *)popt_common_credentials_callback }, { "user", 'U', POPT_ARG_STRING, NULL, 'U', "Set the network username", "[DOMAIN/]USERNAME[%PASSWORD]" }, - { "no-pass", 'N', POPT_ARG_NONE, &dont_ask, True, "Don't ask for a password" }, + { "no-pass", 'N', POPT_ARG_NONE, &dont_ask, 'N', "Don't ask for a password" }, { "password", 0, POPT_ARG_STRING, NULL, OPT_PASSWORD, "Password" }, { "authentication-file", 'A', POPT_ARG_STRING, NULL, 'A', "Get the credentials from a file", "FILE" }, { "signing", 'S', POPT_ARG_STRING, NULL, 'S', "Set the client signing state", "on|off|required" }, diff --git a/testprogs/blackbox/test_smbclient.sh b/testprogs/blackbox/test_smbclient.sh index f92445d64a..b2787e5260 100755 --- a/testprogs/blackbox/test_smbclient.sh +++ b/testprogs/blackbox/test_smbclient.sh @@ -51,6 +51,8 @@ runcmd() { testit "share and server list" $VALGRIND bin/smbclient -L $SERVER $CONFIGURATION -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1` +testit "share and server list anonymously" $VALGRIND bin/smbclient -N -L $SERVER $CONFIGURATION $@ || failed=`expr $failed + 1` + testit "domain join" $VALGRIND bin/net join $DOMAIN $CONFIGURATION -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1` # Generate random file |