From 253d3ef35b6b02bf62e6706e4fc38fef8bd038e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Clouard=20=28shikamaru=29?=
 <shikamaru@mageia.org>
Date: Sun, 16 Dec 2012 22:31:39 +0000
Subject: Partially fix #7667 (broken /etc/krb5.conf)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The problem was that the variable $authentication->{AD_domain} was set
in ask_parameters, but we were using $authentication->{DNS_domain} in
configure_krb5_for_AD.
I’m pretty sure winbind is broken as well because in ask_parameters we
set $authentication->{DNS_domain} but use AD_domain 15 lines below.

Please review this, it fixes authentication for me using local file
(LDAP config is broken for me as well, but more on that later)
---
 perl-install/authentication.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/perl-install/authentication.pm b/perl-install/authentication.pm
index 9fc00a78e..22aeab7b0 100644
--- a/perl-install/authentication.pm
+++ b/perl-install/authentication.pm
@@ -693,12 +693,12 @@ sub configure_krb5_for_AD {
  $uc_domain = {
   kdc = $authentication->{AD_server}:88
   admin_server = $authentication->{AD_server}:749
-  default_domain = $authentication->{DNS_domain}
+  default_domain = $authentication->{AD_domain}
  }
 EOF
 		    domain_realm => <<EOF,
- .$authentication->{DNS_domain} = $uc_domain
- $authentication->{DNS_domain} = $uc_domain
+ .$authentication->{AD_domain} = $uc_domain
+ $authentication->{AD_domain} = $uc_domain
 EOF
 		    kdc => <<'EOF',
  profile = /etc/kerberos/krb5kdc/kdc.conf
-- 
cgit v1.2.1