From f0cf8f4a1382a17a6609d17777f94a5d7c569f90 Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@mageia.org>
Date: Tue, 15 May 2012 17:54:13 +0000
Subject: don't update UsePAM option in sshd configuration

---
 perl-install/NEWS              |  2 ++
 perl-install/authentication.pm | 13 -------------
 perl-install/install/NEWS      |  2 ++
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 282930e63..5f03e6081 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- drakauth: don't update UsePAM option in sshd configuration
+
 Version 14.21 - 11 May 2012
 
 - harddrake2: allow writing 0 as module option, and forbid options
diff --git a/perl-install/authentication.pm b/perl-install/authentication.pm
index c0b2dc215..02a88737c 100644
--- a/perl-install/authentication.pm
+++ b/perl-install/authentication.pm
@@ -325,7 +325,6 @@ sub set_raw {
 
     my $pam_modules = $kind2pam_kind{$kind} or log::l("kind2pam_kind does not know $kind");
     $pam_modules ||= [];
-    sshd_config_UsePAM(@$pam_modules > 0);
     set_pam_authentication($pam_modules, $authentication->{ccreds});
 
     my $nsswitch = $kind2nsswitch{$kind} or log::l("kind2nsswitch does not know $kind");
@@ -781,18 +780,6 @@ sub krb5_conf_update {
 
 }
 
-sub sshd_config_UsePAM {
-    my ($UsePAM) = @_;
-    my $sshd = "$::prefix/etc/ssh/sshd_config";
-    -e $sshd or return;
-
-    my $val = "UsePAM " . bool2yesno($UsePAM);
-    substInFile {
-	$val = '' if s/^#?UsePAM.*/$val/;
-	$_ .= "$val\n" if eof && $val;
-    } $sshd;
-}
-
 sub query_srv_names {
     my ($domain) = @_;
 
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index a63cbbc77..b9a70986f 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,7 @@
 - final banner
 - fix detecting if adding update media succeeded
+- authentication:
+  o don't update UsePAM option in sshd configuration
 
 Version 14.21 - 11 May 2012
 
-- 
cgit v1.2.1