* fixed problems in AttributeRoster with respect to syntax

  checking (perl -cw)
  

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1476 95ad53e4-c205-0410-b2fa-d234c58c8868

2 files changed, 368 insertions, 354 deletions

diff --git a/config-db/OpenSLX/AttributeRoster.pm b/config-db/OpenSLX/AttributeRoster.pm
index 06dc95db..33644207 100644
--- a/config-db/OpenSLX/AttributeRoster.pm
+++ b/config-db/OpenSLX/AttributeRoster.pm
@@ -20,359 +20,367 @@ use OpenSLX::Basics;
 use OpenSLX::OSPlugin::Roster;
 use OpenSLX::Utils;
 
-################################################################################
-###
-### Integrate info about all known attributes (from core and from the plugins)
-### into one big hash.
-###
-################################################################################
-
-# set core attributes
-my %AttributeInfo = (
-	'automnt_dir' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => '',
-	},
-	'automnt_src' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => '',
-	},
-	'country' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => 'de',
-	},
-	'dm_allow_shutdown' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => 'user',
-	},
-	'hw_graphic' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => '',
-	},
-	'hw_monitor' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => '',
-	},
-	'hw_mouse' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => '',
-	},
-	'netbios_workgroup' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => 'slx-network',
-	},
-	'nis_domain' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => '',
-	},
-	'nis_servers' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => '',
-	},
-	'ramfs_fsmods' => {
-		applies_to_systems => 1,
-		applies_to_clients => 0,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			list of filesystem kernel modules to load
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => '',
-	},
-	'ramfs_miscmods' => {
-		applies_to_systems => 1,
-		applies_to_clients => 0,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			list of miscellaneous kernel modules to load
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => '',
-	},
-	'ramfs_nicmods' => {
-		applies_to_systems => 1,
-		applies_to_clients => 0,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			list of network card modules to load
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => 'forcedeth e1000 e100 tg3 via-rhine r8169 pcnet32',
-	},
-	'ramfs_screen' => {
-		applies_to_systems => 1,
-		applies_to_clients => 0,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			resolution of splash screen to use in stage3
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => '',
-	},
-	'sane_scanner' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => '',
-	},
-	'scratch' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => '',
-	},
-	'slxgrp' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => '',
-	},
-	'start_alsasound' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => 'yes',
-	},
-	'start_atd' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => 'no',
-	},
-	'start_cron' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => 'no',
-	},
-	'start_dreshal' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => 'yes',
-	},
-	'start_ntp' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => 'initial',
-	},
-	'start_nfsv4' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => 'no',
-	},
-	'start_printer' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => 'no',
-	},
-	'start_samba' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => 'may',
-	},
-	'start_snmp' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => 'no',
-	},
-	'start_sshd' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => 'yes',
-	},
-	'start_syslogd' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => 'yes',
-	},
-	'start_x' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => 'yes',
-	},
-	'start_xdmcp' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => 'kdm',
-	},
-	'tex_enable' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => 'no',
-	},
-	'timezone' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			textual timezone (e.g. 'Europe/Berlin')
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => 'Europe/Berlin',
-	},
-	'tvout' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => 'no',
-	},
-	'vmware' => {
-		applies_to_systems => 1,
-		applies_to_clients => 1,
-		description => unshiftHereDoc(<<'		End-of-Here'),
-			!!!descriptive text missing here!!!
-		End-of-Here
-		content_regex => undef,
-		content_descr => undef,
-		default => 'no',
-	},
-);
-
-# and add all plugin attributes, too
-OpenSLX::OSPlugin::Roster->addAllDefaultAttributesToHash(\%AttributeInfo);
+my %AttributeInfo;
+
+#=item C<_init()>
+#
+#Integrates info about all known attributes (from core and from the plugins)
+#into one big hash.
+#Returns info about all attributes.
+#
+#=cut
+#
+sub _init
+{
+	my $class = shift;
+
+	# set core attributes
+	%AttributeInfo = (
+		'automnt_dir' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => '',
+		},
+		'automnt_src' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => '',
+		},
+		'country' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => 'de',
+		},
+		'dm_allow_shutdown' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => 'user',
+		},
+		'hw_graphic' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => '',
+		},
+		'hw_monitor' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => '',
+		},
+		'hw_mouse' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => '',
+		},
+		'netbios_workgroup' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => 'slx-network',
+		},
+		'nis_domain' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => '',
+		},
+		'nis_servers' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => '',
+		},
+		'ramfs_fsmods' => {
+			applies_to_systems => 1,
+			applies_to_clients => 0,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				list of filesystem kernel modules to load
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => '',
+		},
+		'ramfs_miscmods' => {
+			applies_to_systems => 1,
+			applies_to_clients => 0,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				list of miscellaneous kernel modules to load
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => '',
+		},
+		'ramfs_nicmods' => {
+			applies_to_systems => 1,
+			applies_to_clients => 0,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				list of network card modules to load
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => 'forcedeth e1000 e100 tg3 via-rhine r8169 pcnet32',
+		},
+		'ramfs_screen' => {
+			applies_to_systems => 1,
+			applies_to_clients => 0,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				resolution of splash screen to use in stage3
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => '',
+		},
+		'sane_scanner' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => '',
+		},
+		'scratch' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => '',
+		},
+		'slxgrp' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => '',
+		},
+		'start_alsasound' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => 'yes',
+		},
+		'start_atd' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => 'no',
+		},
+		'start_cron' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => 'no',
+		},
+		'start_dreshal' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => 'yes',
+		},
+		'start_ntp' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => 'initial',
+		},
+		'start_nfsv4' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => 'no',
+		},
+		'start_printer' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => 'no',
+		},
+		'start_samba' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => 'may',
+		},
+		'start_snmp' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => 'no',
+		},
+		'start_sshd' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => 'yes',
+		},
+		'start_syslogd' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => 'yes',
+		},
+		'start_x' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => 'yes',
+		},
+		'start_xdmcp' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => 'kdm',
+		},
+		'tex_enable' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => 'no',
+		},
+		'timezone' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				textual timezone (e.g. 'Europe/Berlin')
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => 'Europe/Berlin',
+		},
+		'tvout' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => 'no',
+		},
+		'vmware' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				!!!descriptive text missing here!!!
+			End-of-Here
+			content_regex => undef,
+			content_descr => undef,
+			default => 'no',
+		},
+	);
+	
+	# and add all plugin attributes, too
+	OpenSLX::OSPlugin::Roster->addAllDefaultAttributesToHash(\%AttributeInfo);
+}
 
 =item C<getAttrInfo()>
 
@@ -393,6 +401,8 @@ sub getAttrInfo
 	my $class = shift;
 	my $name  = shift;
 
+	$class->_init() if !%AttributeInfo;
+
 	if (defined $name) {
 		my $attrInfo = $AttributeInfo{$name};
 		return if !defined $attrInfo;
@@ -420,6 +430,8 @@ sub getSystemAttrs
 {
 	my $class = shift;
 
+	$class->_init() if !%AttributeInfo;
+
 	return 
 		grep { $AttributeInfo{$_}->{"applies_to_systems"} }
 		keys %AttributeInfo
@@ -443,6 +455,8 @@ sub getClientAttrs
 {
 	my $class = shift;
 
+	$class->_init() if !%AttributeInfo;
+
 	return 
 		grep { $AttributeInfo{$_}->{"applies_to_clients"} }
 		keys %AttributeInfo
diff --git a/config-db/OpenSLX/DBSchema.pm b/config-db/OpenSLX/DBSchema.pm
index 195649b9..aa6ef1c1 100644
--- a/config-db/OpenSLX/DBSchema.pm
+++ b/config-db/OpenSLX/DBSchema.pm
@@ -311,7 +311,7 @@ sub synchronizeAttributesWithDefaultSystem
 
 	# fetch all known attributes from attribute roster and merge these 
 	# into the existing attributes of the default system
-	my $attrInfo = OpenSLX::AttributeRoster::getAttrInfo();
+	my $attrInfo = OpenSLX::AttributeRoster->getAttrInfo();
 	foreach my $attr (keys %$attrInfo) {
 		next if exists $defaultSystem->{attrs}->{$attr};
 		$defaultSystem->{attrs}->{$attr} = $attrInfo->{$attr}->{default};