From: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Date: Tue, 20 Jan 2026 03:53:30 +0000 (+1300)
Subject: selftest: Set the ‘report_canonical_client_name’ option in krb5.conf
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1bfd99303ba6a80d530c3ca56a0c4de9e1f9dff;p=thirdparty%2Fsamba.git

selftest: Set the ‘report_canonical_client_name’ option in krb5.conf

This will do something later when MIT Kerberos supports this option. For Heimdal
it shouldn’t make a difference.

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

Autobuild-User(master): Douglas Bagnall <dbagnall@samba.org>
Autobuild-Date(master): Wed Jan 21 04:46:43 UTC 2026 on atb-devel-224
---

diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index 075609c61f6..338bf6bdee0 100644
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -370,6 +370,9 @@ $ctx->{krb5_conf_extra_options}
  clockskew = 5
  # To allow the FL 2000 DC to still work for now
  allow_rc4 = yes
+
+ # Report the canonical client name by default
+ report_canonical_client_name = yes
     ";
 	}
 
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index b0e9e3a0ef6..546c9c70db7 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1895,6 +1895,9 @@ sub provision_fl2008r2dc($$$)
 	krb5 acceptor report canonical client name = no
 ";
 	my $extra_provision_options = ["--base-schema=2008_R2"];
+	my $extra_krb5_conf_options = "
+ report_canonical_client_name = no
+";
 	my $ret = $self->provision($prefix,
 				   "domain controller",
 				   "dc7",
@@ -1907,7 +1910,8 @@ sub provision_fl2008r2dc($$$)
 				   undef,
 				   $extra_conf_options,
 				   "",
-				   $extra_provision_options);
+				   $extra_provision_options,
+				   $extra_krb5_conf_options);
 	unless (defined $ret) {
 		return undef;
 	}