Author: gs Date: Wed Oct 29 14:25:04 2008 New Revision: 52664 URL: http://svn.opensuse.org/viewcvs/yast?rev=52664&view=rev Log: remove obsolete comments, add new ones, add package 'audit' to install list for AutoYasT Modified: trunk/audit-laf/src/AuditLaf.ycp trunk/audit-laf/src/complex.ycp Modified: trunk/audit-laf/src/AuditLaf.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/AuditLaf.ycp?rev=52... ============================================================================== --- trunk/audit-laf/src/AuditLaf.ycp (original) +++ trunk/audit-laf/src/AuditLaf.ycp Wed Oct 29 14:25:04 2008 @@ -243,9 +243,9 @@ ]; /** - * Rules for the subsystem audit (passed via auditctl) - * (initially read from /etc/audit/audit.rules and edited in - * rules editor) + * Rules for the subsystem audit (passed via auditctl). + * Iinitially read from /etc/audit/audit.rules and edited in + * the rules editor. */ string RULES = ""; @@ -484,7 +484,7 @@ if ( ! FileUtils::Exists ( config_file ) ) return false; - // list all options set in auditd.conf + // write all options to auditd.conf foreach (string key, list <string> value, SETTINGS, { // and write each value success = (boolean)SCR::Write(add(.auditd, key), value ); @@ -556,7 +556,6 @@ write_success = WriteAuditdSettings(); - /* Error message */ if ( write_success ) { // restart auditd @@ -564,12 +563,14 @@ y2milestone( "'auditd restart' returned: %1", exit_code ); if ( exit_code != 0 ) + // Error message Report::Error ( _("Restart of the audit daemon failed" ) ); else go_on = true; } else { + // Error message Report::Error (_("Cannot write settings to auditd.conf.") ); } @@ -593,6 +594,7 @@ { Report::Error( sformat( "%1\n%2", output["stderr"]:"", + // Error message, rules cannot be set _("Please start yast2-audit-laf again and check the rules") ) ); } } @@ -672,8 +674,7 @@ * @return map with 2 lists. */ global map AutoPackages() { - // TODO FIXME: your code here... - return $[ "install":[], "remove":[] ]; + return $[ "install":[audit], "remove":[] ]; } /* EOF */ Modified: trunk/audit-laf/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/complex.ycp?rev=526... ============================================================================== --- trunk/audit-laf/src/complex.ycp (original) +++ trunk/audit-laf/src/complex.ycp Wed Oct 29 14:25:04 2008 @@ -346,8 +346,6 @@ if ( AuditLaf::RulesAlreadyLocked() ) { - // FIXME - does it make sense to call SCR::Execute( .target.bash, "auditctl -D" ) ??? - // Warning - the audit configuration is locked, reset impossible Report::Warning( _("The rules are already locked, a reset is impossible.\n If you want to unlock, set the enabled flag accordingly and -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org