The branch, master has been updated via 3b48274 selftest: Fix typo namerserver -> nameserver. from 8aed0fc s3:smb2_server: protect against integer wrap with "smb2 max credits = 65535"
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 3b482740355c32002f5d653ee022033feb2cdc15 Author: Jelmer Vernooij <jel...@samba.org> Date: Fri Jan 30 02:22:46 2015 +0100 selftest: Fix typo namerserver -> nameserver. Signed-off-by: Jelmer Vernooij <jel...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org> Autobuild-Date(master): Fri Jan 30 19:59:40 CET 2015 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: selftest/selftest.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/selftest/selftest.pl b/selftest/selftest.pl index 2547026..2bbb3c8 100755 --- a/selftest/selftest.pl +++ b/selftest/selftest.pl @@ -400,13 +400,13 @@ if ($opt_socket_wrapper) { $socket_wrapper_dir = SocketWrapper::setup_dir("$prefix_abs/w", $opt_socket_wrapper_pcap); print "SOCKET_WRAPPER_DIR=$socket_wrapper_dir\n"; } elsif (not $opt_list) { - unless ($< == 0) { + unless ($< == 0) { warn("not using socket wrapper, but also not running as root. Will not be able to listen on proper ports"); } } if ($opt_use_dns_faking) { - print "DNS: Faking namerserver\n"; + print "DNS: Faking nameserver\n"; $ENV{SAMBA_DNS_FAKING} = 1; } -- Samba Shared Repository