Author: gs Date: Thu Nov 19 11:57:45 2009 New Revision: 59613 URL: http://svn.opensuse.org/viewcvs/yast?rev=59613&view=rev Log: add y2milestone logging for auditctl calls 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=59613&r1=59612&r2=59613&view=diff ============================================================================== --- trunk/audit-laf/src/AuditLaf.ycp (original) +++ trunk/audit-laf/src/AuditLaf.ycp Thu Nov 19 11:57:45 2009 @@ -627,6 +627,8 @@ if( write_success) { // call auditctl -R audit.rules + y2milestone( "Calling auditctl -R /etc/audit/audit.rules" ); + map output = (map)SCR::Execute( .target.bash_output, "auditctl -R /etc/audit/audit.rules" ); if ( output["exit"]:0 != 0 ) Modified: trunk/audit-laf/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/complex.ycp?rev=59613&r1=59612&r2=59613&view=diff ============================================================================== --- trunk/audit-laf/src/complex.ycp (original) +++ trunk/audit-laf/src/complex.ycp Thu Nov 19 11:57:45 2009 @@ -420,11 +420,15 @@ } else { + y2milestone( "Calling auditctl -D" ); + integer exit_code = (integer)SCR::Execute( .target.bash, "auditctl -D" ); + y2milestone( "Calling auditctl -R /etc/audit/audit.rules" ); + if ( exit_code == 0 ) exit_code = (integer)SCR::Execute( .target.bash, "auditctl -R /etc/audit/audit.rules" ); - + if ( exit_code == 0 ) { // Report success @@ -541,7 +545,10 @@ boolean success = (boolean)SCR::Write(.target.string, tmpfile, rules ); if ( success ) { + y2milestone( "Calling auditctl -R %1", tmpfile ); + map output = (map)SCR::Execute(.target.bash_output, sformat( "auditctl -R %1", tmpfile ) ); + AuditLaf::SetRulesChanged( true ); if ( output["exit"]:0 != 0 ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org