1 files changed, 29 insertions, 4 deletions
diff --git a/po/ru.po b/po/ru.po
index be10818d..b022cbb2 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-03 16:04+0200\n"
+"POT-Creation-Date: 2008-10-06 16:14+0200\n"
 "PO-Revision-Date: 2008-08-13 22:29+0500\n"
 "Last-Translator: akdengi <kazancas@gmail.com>\n"
 "Language-Team:  <ru@li.org>\n"
@@ -146,17 +146,42 @@ msgstr "Запускается drakconnect\n"
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr "Служба Mandriva Online была переустановлена. Апплет перезагружается..."
 
-#: ../mdkapplet:353
+#: ../mdkapplet:374
+#, c-format
+msgid "Distribution Upgrade"
+msgstr ""
+
+#: ../mdkapplet:376
 #, fuzzy, c-format
 msgid "A new stable distribution has been released."
 msgstr "Появилась новая стабильная версия дистрибутива"
 
-#: ../mdkapplet:354
+#: ../mdkapplet:378
+#, c-format
+msgid "More info about this new version"
+msgstr ""
+
+#: ../mdkapplet:380
 #, fuzzy, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Вы хотите выполнить обновление?"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:381
+#, c-format
+msgid "Do not ask me next time"
+msgstr ""
+
+#: ../mdkapplet:382
+#, c-format
+msgid "Yes"
+msgstr ""
+
+#: ../mdkapplet:382
+#, c-format
+msgid "No"
+msgstr ""
+
+#: ../mdkapplet:448
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Запускается Mandriva Update\n"
diff --git a/perl-install/authentication.pm b/perl-install/authentication.pm
index a66ddf51e..2d0415a38 100644
--- a/perl-install/authentication.pm
+++ b/perl-install/authentication.pm
@@ -147,7 +147,9 @@ sub set {
 
     sshd_config_UsePAM($kind ne 'local');
 
-    if ($kind eq 'SmartCard') {
+    if ($kind eq 'local') {
+	set_pam_authentication();
+    } elsif ($kind eq 'SmartCard') {
 	$in->do_pkgs->install('castella-pam');
 	set_pam_authentication('castella');
     } elsif ($kind eq 'LDAP') {
@@ -349,14 +351,20 @@ sub set_pam_authentication {
 		#- first removing previous config
 		$_ = '';
 	    }
-	    if ($module eq 'pam_unix' && $special{$type} && @{$special{$type}}) {
+	    if ($module eq 'pam_unix' && $special{$type}) {
 		my @para_for_last = 
-		  $type eq 'auth' ? qw(likeauth nullok use_first_pass) :
-		  $type eq 'account' ? qw(use_first_pass) : @{[]};
+		    $type eq 'auth' ? qw(likeauth nullok use_first_pass) :
+		    $type eq 'account' ? qw(use_first_pass) : @{[]};
 		@para = difference2(\@para, \@para_for_last);
 
-		my ($before, $after) = partition { member($_, 'krb5', 'castella') } @{$special{$type}};
-		my @l = ((map { [ "pam_$_" ] } @$before),
+		my ($before_noask, $ask) = partition { $_ eq 'castella' } @{$special{$type}};
+		my ($before, $after) = partition { $_ eq 'krb5' } @$ask;
+
+		if (!@$ask) {
+		    @para_for_last = grep { $_ ne 'use_first_pass' } @para_for_last;
+		}
+
+		my @l = ((map { [ "pam_$_" ] } @$before_noask, @$before),
 			 [ 'pam_unix', @para ],
 			 (map { [ "pam_$_" ] } @$after),
 			 );