From: Andreas Schneider <asn@samba.org>
Date: Mon, 4 Nov 2019 16:26:48 +0000 (+0100)
Subject: s3:utils: Add weak crypto information to testparm
X-Git-Tag: ldb-2.2.0~1389
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d1ecef173a372474c86d3fe8cd42c2f2e69185d;p=thirdparty%2Fsamba.git

s3:utils: Add weak crypto information to testparm

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

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',