summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2014-04-29 18:14:35 +0200
committerAndrew Bartlett <abartlet@samba.org>2014-08-08 06:02:34 +0200
commit3d56bcc1de8dcdf00c46218b522e4236cdaec40a (patch)
tree9e35b661355851235ce3071a1e01fed3374e6dab
parent561c74666aa5342a5f819b1af821032fdf1f362b (diff)
downloadsamba-3d56bcc1de8dcdf00c46218b522e4236cdaec40a.tar.gz
samba-3d56bcc1de8dcdf00c46218b522e4236cdaec40a.tar.xz
samba-3d56bcc1de8dcdf00c46218b522e4236cdaec40a.zip
s4-torture: use smb_krb5_get_allowed_weak_crypto() in remote PAC test.
Guenther Signed-off-by: Günther Deschner <gd@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Pair-Programmed-With: Andreas Schneider <asn@samba.org>
-rw-r--r--source4/torture/rpc/remote_pac.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/source4/torture/rpc/remote_pac.c b/source4/torture/rpc/remote_pac.c
index e7e6dfdb46..7ea123b8bd 100644
--- a/source4/torture/rpc/remote_pac.c
+++ b/source4/torture/rpc/remote_pac.c
@@ -476,22 +476,15 @@ static bool test_PACVerify_workstation_des(struct torture_context *tctx,
struct samr_SetUserInfo r;
union samr_UserInfo user_info;
struct dcerpc_pipe *samr_pipe = torture_join_samr_pipe(join_ctx);
-
-#ifdef AD_DC_BUILD_IS_ENABLED
struct smb_krb5_context *smb_krb5_context;
krb5_error_code ret;
ret = cli_credentials_get_krb5_context(cmdline_credentials, tctx->lp_ctx, &smb_krb5_context);
torture_assert_int_equal(tctx, ret, 0, "cli_credentials_get_krb5_context() failed");
- if (krb5_config_get_bool_default(smb_krb5_context->krb5_context, NULL, FALSE,
- "libdefaults",
- "allow_weak_crypto", NULL) == FALSE) {
+ if (smb_krb5_get_allowed_weak_crypto(smb_krb5_context->krb5_context) == FALSE) {
torture_skip(tctx, "Cannot test DES without [libdefaults] allow_weak_crypto = yes");
}
-#else
- torture_skip(tctx, "Skipping DES test in non-AD DC build");
-#endif
/* Mark this workstation with DES-only */
user_info.info16.acct_flags = ACB_USE_DES_KEY_ONLY | ACB_WSTRUST;