You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by fa...@apache.org on 2013/06/05 22:01:05 UTC
svn commit: r1490018 - /vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm
Author: fapeeler
Date: Wed Jun 5 20:01:05 2013
New Revision: 1490018
URL: http://svn.apache.org/r1490018
Log:
VCL-701
removing Local edit for krb5.conf settings, didn't intend to commit that
Modified:
vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm
Modified: vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm
URL: http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm?rev=1490018&r1=1490017&r2=1490018&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm Wed Jun 5 20:01:05 2013
@@ -344,35 +344,6 @@ sub post_load {
# Remove commands from rc.local added by previous versions of VCL
$self->configure_rc_local();
- #Local krb5 edit/change
- my $krb5_conf_file_path = '/etc/krb5.conf';
- my @krb5_conf_contents = $self->get_file_contents($krb5_conf_file_path);
- if (@krb5_conf_contents) {
- notify($ERRORS{'DEBUG'}, 0, "retrieved $krb5_conf_file_path contents:\n" . join("\n", @krb5_conf_contents));
-
- my $new_krb5_contents_string;
- for my $line (@krb5_conf_contents) {
- if ($line =~ /(krb4_convert|krb4_use_as_req)/i) {
- next;
- }
-
- $new_krb5_contents_string .= "$line\n";
-
- if ($line =~ /pam\s*=\s*\{/i) {
- $new_krb5_contents_string .= " krb4_convert = false\n";
- $new_krb5_contents_string .= " krb4_use_as_req = false\n";
- $new_krb5_contents_string .= " krb4_convert_524 = false\n";
- }
- }
-
- if ($self->create_text_file("$krb5_conf_file_path", $new_krb5_contents_string)) {
- notify($ERRORS{'DEBUG'}, 0, "updated $krb5_conf_file_path file:\n$new_krb5_contents_string");
- }
- else {
- notify($ERRORS{'WARNING'}, 0, "failed to update $krb5_conf_file_path file");
- }
- }
-
if ($image_os_install_type eq "kickstart") {
notify($ERRORS{'OK'}, 0, "detected kickstart install on $computer_short_name, writing current_image.txt");
if (write_currentimage_txt($self->data)) {