diff options
| author | Andreas Schneider <asn@samba.org> | 2019-11-04 17:26:48 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2020-03-19 20:46:41 +0000 |
| commit | 3d1ecef173a372474c86d3fe8cd42c2f2e69185d (patch) | |
| tree | e24ba1a013eb601576c67d71240ddea07965533e /source3/utils | |
| parent | cb034a9f60189806d5def2502ed39b06f002ed4a (diff) | |
| download | samba-3d1ecef173a372474c86d3fe8cd42c2f2e69185d.tar.gz | |
s3:utils: Add weak crypto information to testparm
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/testparm.c | 9 | ||||
| -rw-r--r-- | source3/utils/wscript_build | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c index e4c805da9a3..2d717f19756 100644 --- a/source3/utils/testparm.c +++ b/source3/utils/testparm.c @@ -35,6 +35,7 @@ #include "system/filesys.h" #include "popt_common.h" #include "lib/param/loadparm.h" +#include "lib/crypto/gnutls_helpers.h" #include "cmdline_contexts.h" #include <regex.h> @@ -653,6 +654,7 @@ static void do_per_share_checks(int s) const char *caddr; static int show_defaults; static int skip_logic_checks = 0; + const char *weak_crypo_str = ""; struct poptOption long_options[] = { POPT_AUTOHELP @@ -758,6 +760,13 @@ static void do_per_share_checks(int s) fprintf(stderr,"Loaded services file OK.\n"); + if (samba_gnutls_weak_crypto_allowed()) { + weak_crypo_str = "allowed"; + } else { + weak_crypo_str = "disallowed"; + } + fprintf(stderr, "Weak crypto is %s\n", weak_crypo_str); + if (skip_logic_checks == 0) { ret = do_global_checks(); } diff --git a/source3/utils/wscript_build b/source3/utils/wscript_build index 2e6d61d4cd4..4dbc0234b04 100644 --- a/source3/utils/wscript_build +++ b/source3/utils/wscript_build @@ -175,6 +175,7 @@ bld.SAMBA3_BINARY('testparm', smbconf popt_samba3 cmdline_contexts + GNUTLS_HELPERS ''') bld.SAMBA3_BINARY('net', |