From fd8bbba2f02b8bccd69e67c326fd320c0827941d Mon Sep 17 00:00:00 2001 From: Mageia SVN-Git Migration Date: Sun, 6 Feb 2011 22:37:08 +0000 Subject: Synthesized commit during git-svn import combining previous Mandriva history with Mageia. This commit consitsts of the following subversion commits: ------------------------------------------------------------------------ r431 | dmorgan | 2011-02-06 01:58:02 +0000 (Sun, 06 Feb 2011) | 1 line Add drakx structure on the SVN ------------------------------------------------------------------------ r432 | dmorgan | 2011-02-06 01:59:38 +0000 (Sun, 06 Feb 2011) | 1 line Import cleaned advertising ------------------------------------------------------------------------ r446 | dmorgan | 2011-02-06 22:37:08 +0000 (Sun, 06 Feb 2011) | 1 line Import Clean perl-install ------------------------------------------------------------------------ r448 | dmorgan | 2011-02-06 23:02:36 +0000 (Sun, 06 Feb 2011) | 1 line Add cleaned files ------------------------------------------------------------------------ r449 | dmorgan | 2011-02-06 23:03:52 +0000 (Sun, 06 Feb 2011) | 1 line Import cleaned kernel ------------------------------------------------------------------------ r450 | dmorgan | 2011-02-06 23:23:30 +0000 (Sun, 06 Feb 2011) | 1 line Import cleaned tools ------------------------------------------------------------------------ r451 | dmorgan | 2011-02-07 00:01:56 +0000 (Mon, 07 Feb 2011) | 1 line Import stage1 ------------------------------------------------------------------------ r473 | dmorgan | 2011-02-07 11:20:50 +0000 (Mon, 07 Feb 2011) | 1 line Import images ------------------------------------------------------------------------ r497 | ennael | 2011-02-09 21:02:06 +0000 (Wed, 09 Feb 2011) | 2 lines readd missing file ------------------------------------------------------------------------ r502 | pterjan | 2011-02-09 23:30:32 +0000 (Wed, 09 Feb 2011) | 1 line Import rescue ------------------------------------------------------------------------ r603 | ennael | 2011-02-24 13:32:54 +0000 (Thu, 24 Feb 2011) | 2 lines import cleaned rescue for Mageia ------------------------------------------------------------------------ r2061 | tv | 2011-10-20 20:32:19 +0100 (Thu, 20 Oct 2011) | 1 line import (cleaned) doc ------------------------------------------------------------------------ --- perl-install/standalone/draksec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'perl-install/standalone/draksec') diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec index 2c787a5d6..96ce4b3df 100755 --- a/perl-install/standalone/draksec +++ b/perl-install/standalone/draksec @@ -3,7 +3,7 @@ # # Copyright (c) 2002-2008 Christian Belisle # Thierry Vignaud -# Eugeni Dodonov +# Eugeni Dodonov # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2, as @@ -111,7 +111,7 @@ my $common_opts = { col_spacings => 10, row_spacings => 5, mcc => 1 }; ######################## AUTH ################################### my %progs; -my $auth_string = N("Configure authentication required to access Mandriva tools"); +my $auth_string = N("Configure authentication required to access %s tools"); my %auth = ( no_passwd => N("No password"), @@ -122,9 +122,9 @@ my %auth = ( sub default_auth_value { my ($prog) = @_; my $link = readlink("/etc/pam.d/$prog"); - if ($link =~ /mandriva-console-auth/) { + if ($link =~ /mageia-console-auth/) { return $auth{no_passwd}; - } elsif ($link =~ /mandriva-simple-auth/) { + } elsif ($link =~ /mageia-simple-auth/) { my ($user) = cat_("/etc/security/console.apps/$prog") =~ /USER=(.*)/; return $auth{root_passwd} if $user eq 'root'; return $auth{user_passwd} if $user eq ''; @@ -134,9 +134,9 @@ sub default_auth_value { sub set_auth_value { my ($prog, $auth) = @_; if ($auth eq 'no_passwd') { - symlinkf('../../etc/pam.d/mandriva-console-auth', "/etc/pam.d/$prog"); + symlinkf('../../etc/pam.d/mageia-console-auth', "/etc/pam.d/$prog"); } else { - symlinkf('../../etc/pam.d/mandriva-simple-auth', "/etc/pam.d/$prog"); + symlinkf('../../etc/pam.d/mageia-simple-auth', "/etc/pam.d/$prog"); my $value = $auth eq 'user_passwd' ? '' : 'root'; substInFile { s/^USER=.*/USER=$value/; @@ -147,7 +147,7 @@ sub set_auth_value { my %descr = ( rpmdrake => N("Software Management"), - mandrivaupdate => N("Mandriva Update"), + mageiaupdate => N("%s Update"), 'drakrpm-edit-media' => N("Software Media Manager"), drak3d => N("Configure 3D Desktop effects"), xfdrake => N("Graphical Server Configuration"), @@ -201,7 +201,7 @@ gtkpack_($vbox, } split(' ', $progs) ); } ( - [ N("Software Management"), 'rpmdrake mandrivaupdate drakrpm-edit-media' ], + [ N("Software Management"), 'rpmdrake mageiaupdate drakrpm-edit-media' ], [ N("Hardware"), 'drak3d xfdrake drakmouse drakkeyboard drakups' ], [ N("Network"), 'drakconnect drakhosts draknetcenter drakroam drakvpn drakproxy drakgw' ], [ N("System"), 'drakauth drakbackup drakfont draklog drakxservices userdrake drakclock' ], -- cgit v1.2.1