Author: gs
Date: Fri Nov 13 15:22:20 2009
New Revision: 59533
URL: http://svn.opensuse.org/viewcvs/yast?rev=59533&view=rev
Log:
backport of bug-fixes
2.17.9
Modified:
branches/SuSE-Code-11-SP1-Branch/audit-laf/VERSION
branches/SuSE-Code-11-SP1-Branch/audit-laf/package/yast2-audit-laf.changes
branches/SuSE-Code-11-SP1-Branch/audit-laf/src/AuditLaf.ycp
branches/SuSE-Code-11-SP1-Branch/audit-laf/src/complex.ycp
branches/SuSE-Code-11-SP1-Branch/audit-laf/src/helps.ycp
branches/SuSE-Code-11-SP1-Branch/audit-laf/src/wizards.ycp
Modified: branches/SuSE-Code-11-SP1-Branch/audit-laf/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/audit-laf/VERSION?rev=59533&r1=59532&r2=59533&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/audit-laf/VERSION (original)
+++ branches/SuSE-Code-11-SP1-Branch/audit-laf/VERSION Fri Nov 13 15:22:20 2009
@@ -1 +1 @@
-2.17.8
+2.17.9
Modified: branches/SuSE-Code-11-SP1-Branch/audit-laf/package/yast2-audit-laf.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/audit-laf/package/yast2-audit-laf.changes?rev=59533&r1=59532&r2=59533&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/audit-laf/package/yast2-audit-laf.changes (original)
+++ branches/SuSE-Code-11-SP1-Branch/audit-laf/package/yast2-audit-laf.changes Fri Nov 13 15:22:20 2009
@@ -1,4 +1,14 @@
-------------------------------------------------------------------
+Fri Nov 13 15:13:41 CET 2009 - gs@suse.de
+
+- Backport of bug-fixes:
+- Correct behaviour on "Abort" (bnc #458327)
+- Set LANG=POSIX for command 'auditctl'
+- Several improvements and bug-fixes for help text (bnc #528646,
+ bnc #527803, bnc #510776, bnc #510775)
+- 2.17.9
+
+-------------------------------------------------------------------
Wed Jan 21 11:51:56 CET 2009 - gs@suse.de
- Localize message "Success" (bnc #447169)
Modified: branches/SuSE-Code-11-SP1-Branch/audit-laf/src/AuditLaf.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/audit-laf/src/AuditLaf.ycp?rev=59533&r1=59532&r2=59533&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/audit-laf/src/AuditLaf.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/audit-laf/src/AuditLaf.ycp Fri Nov 13 15:22:20 2009
@@ -44,10 +44,6 @@
import "Service";
-/**
- * Prototypes
- */
-global boolean Modified();
/**
* Data was modified?
@@ -80,9 +76,9 @@
boolean rules_locked = false;
/*
- * The rules have been checked
+ * The rules have been changed (sent to 'autitctl' to check the syntax)
*/
-boolean rules_checked = false;
+boolean rules_changed = false;
global void SetRulesLocked( boolean value ) {
@@ -94,11 +90,11 @@
}
global void SetRulesChanged( boolean value ) {
- rules_checked = value;
+ rules_changed = value;
}
global boolean RulesChanged() {
- return rules_checked;
+ return rules_changed;
}
/**
@@ -134,6 +130,8 @@
modified = value;
}
+
+
global boolean ProposalValid() {
return proposal_valid;
}
@@ -182,7 +180,7 @@
global boolean RulesAlreadyLocked()
{
- map output = (map)SCR::Execute( .target.bash_output, "auditctl -s" );
+ map output = (map)SCR::Execute( .target.bash_output, "LANG=POSIX auditctl -s" );
y2milestone( "auditctl: %1", output );
string audit_status = output["stdout"]:"";
@@ -195,7 +193,7 @@
global string AuditStatus()
{
- map output = (map)SCR::Execute( .target.bash_output, "auditctl -s" );
+ map output = (map)SCR::Execute( .target.bash_output, "LANG=POSIX auditctl -s" );
y2milestone( "auditctl: %1", output );
string audit_status = output["stdout"]:"";
@@ -241,9 +239,15 @@
"disk_error_action" : "SUSPEND"
];
+/*
+ * Save settings initially read from /etc/audit/auditd.conf to be able
+ * to decide whether changes are made
+ */
+map INITIAL_SETTINGS = $[];
+
/**
* Rules for the subsystem audit (passed via auditctl).
- * Iinitially read from /etc/audit/audit.rules and edited in
+ * Initially read from /etc/audit/audit.rules and edited in
* the rules editor.
*/
string RULES = "";
@@ -253,6 +257,16 @@
*/
string INITIAL_RULES = "";
+/*
+ * Set data modified only if really has changed
+ */
+global void SetDataModified() {
+ if ( INITIAL_SETTINGS != SETTINGS || INITIAL_RULES != RULES )
+ modified = true;
+ else
+ modified = false;
+}
+
/**
* Get value of given option from SEETINGS
*/
@@ -311,7 +325,7 @@
if ( rules != nil && rules != "" )
{
RULES = rules;
- // additionally save initial settings
+ // additionally save initial rules
INITIAL_RULES = rules;
return true;
}
@@ -349,6 +363,9 @@
if (val != nil) SETTINGS[key] = val;
});
+ // additionally save initial settings
+ INITIAL_SETTINGS = SETTINGS;
+
y2milestone("%1 has been read: %2", config_file, SETTINGS);
return true;
}
Modified: branches/SuSE-Code-11-SP1-Branch/audit-laf/src/complex.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/audit-laf/src/complex.ycp?rev=59533&r1=59532&r2=59533&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/audit-laf/src/complex.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/audit-laf/src/complex.ycp Fri Nov 13 15:22:20 2009
@@ -50,16 +50,9 @@
}
boolean ReallyAbort() {
- return !AuditLaf::Modified() || Popup::ReallyAbort(true);
+ return Popup::ReallyAbort(AuditLaf::Modified());
}
-boolean ReallyExit () {
- // yes-no popup
- return Popup::YesNo (_("Really exit?
-All changes will be lost."));
-}
-
-
/**
* Read settings dialog
* @return `abort if aborted and `next otherwise
@@ -150,8 +143,6 @@
*/
void StoreLogfileSettingsDialog (string id, map event) {
- AuditLaf::SetModified( true );
-
// Store all values in SETTINGS
AuditLaf::SetAuditdOption( "freq", tostring( (integer)UI::QueryWidget( `id("freq"), `Value ) ) );
AuditLaf::SetAuditdOption( "num_logs", tostring( (integer)UI::QueryWidget( `id("num_logs"), `Value ) ) );
@@ -181,6 +172,8 @@
}
}
+ AuditLaf::SetDataModified();
+
y2milestone( "Store log file settings" );
}
@@ -221,14 +214,14 @@
*/
void StoreDispatcherDialog (string id, map event) {
- AuditLaf::SetModified( true );
-
// Store all values in SETTINGS
foreach (string key, ["dispatcher",
"disp_qos"], {
AuditLaf::SetAuditdOption( key, (string) UI::QueryWidget(`id(key), `Value) );
});
+ AuditLaf::SetDataModified( );
+
y2milestone( "Store dispatcher dialog" );
}
@@ -310,17 +303,17 @@
if ( ! FileUtils::Exists( file ) )
{
- Report::Error( sformat( "%1 doesn't exist.\n", file ) + message );
+ Report::Error( sformat(_("%1 doesn't exist.\n"), file ) + message );
ret = false;
}
else if ( ! FileUtils::IsFile( file ) )
{
- Report::Error( sformat( "%1 is not a regular file.\n", file ) + message );
+ Report::Error( sformat(_("%1 is not a regular file.\n"), file ) + message );
ret = false;
}
else if ( FileUtils::GetOwnerUserID( file ) != 0 )
{
- Report::Error( sformat( "%1 not owned by root.\n", file ) + message );
+ Report::Error( sformat(_("%1 not owned by root.\n"), file ) + message );
ret = false;
}
else
@@ -330,7 +323,7 @@
if ( substring ( output["stdout"]:"", 0, 10 ) != "-rwxr-x---" )
{
- Report::Error( sformat( "File permissiones of %1 NOT set to -rwxr-x---.\n", file ) + message );
+ Report::Error( sformat(_("File permissiones of %1 NOT set to -rwxr-x---.\n"), file ) + message );
ret = false;
}
}
@@ -345,8 +338,6 @@
string option = "";
string exec = "";
- AuditLaf::SetModified( true );
-
foreach ( string key, ["space_left",
"action_mail_acct",
"admin_space_left"
@@ -374,6 +365,8 @@
AuditLaf::SetAuditdOption( key, option );
}
});
+
+ AuditLaf::SetDataModified( );
y2milestone( "Store disk space settings" );
}
@@ -583,12 +576,12 @@
*/
void StoreRulesDialog( string id, map event) {
- AuditLaf::SetModified( true );
-
string rules = (string)UI::QueryWidget( `id("rules"), `Value );
AuditLaf::SetRules( rules );
+ AuditLaf::SetDataModified( );
+
y2debug( "RULES: %1", rules );
y2milestone( "Store rules dialog" );
}
Modified: branches/SuSE-Code-11-SP1-Branch/audit-laf/src/helps.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/audit-laf/src/helps.ycp?rev=59533&r1=59532&r2=59533&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/audit-laf/src/helps.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/audit-laf/src/helps.ycp Fri Nov 13 15:22:20 2009
@@ -57,45 +57,55 @@
</p>
"),
- /* logfile_settings dialog help 1/7 */
+ /* logfile_settings dialog help 1/8 */
"logfile_settings" : _("<p><b><big>Auditd Log File Configuration</big></b><br>
-The audit daemon logs all relevant audit events to the default log file <i>/var/log/audit/audit.log</i>.
-Events may come from the <i>apparmor</i> kernel module, from applications
-which use <i>libaudit</i> (e.g. PAM) or incidents caused by rules (e.g. file watches).</p>") +
- /* logfile_settings dialog help 2/7 */
- _("<p>More information about rules and the possiblity to add rules offers the dialog <b>Rules for auditctl</b>.
-Detailed information about the log file settings can be obtained from 'man auditd.conf'.</p>") +
- /* logfile_settings dialog help 3/7 */
+The audit daemon is the component of the Linux Auditing System which is responsible for writing all relevant audit events to the log file <i>/var/log/audit/audit.log</i> (default).
+Events may come from the <i>apparmor</i> kernel module, from applications which use <i>libaudit</i> (e.g. PAM) or incidents caused by rules (e.g. file watches).</p>") +
+ /* logfile_settings dialog help 2/8 */
+ _("<p>The <b>Rules for auditctl</b> dialog offers more information about rules and the possibility to add rules.
+Detailed information about the log file settings can be obtained from the manual page ('man auditd.conf').</p>") +
+ /* logfile_settings dialog help 3/8 */
_("<p><b>Log File</b>: Enter the full path name to the log file
(or use <b>Select File</b>.)</p>") +
- /* logfile_settings dialog help 4/7 */
- _("<p><b>Format</b>: set <i>RAW</i> to log all data or <i>NOLOG</i>
-to discard all audit information (does not affect data sent to the dispatcher).</p> ") +
- /* logfile_settings dialog help 5/7 */
- _("<p><b>Flush</b>: describes how to write the data to disk. If set to
-<i>INCREMANTAL</i> the <b>Frequency</b> parameter tells how many records to write before
-issuing an explicit flush to disk.</p>" ) +
- /* logfile_settings dialog help 6/7 */
- _("<p>Configure the maximum log file size and the action to take when this
-value is reached in <b>Size and Action</b> frame. If action is set to
-<i>ROTATE</i> the <b>Number of Log Files</b> specifies the number of files to keep.</p>") +
- /* logfile_settings dialog help 7/7 */
+ /* logfile_settings dialog help 4/8 */
+ _("<p><b>Format</b>: set <i>RAW</i> to log all data (store in a format exactly as the kernel
+sends it) or <i>NOLOG</i> to discard all audit information instead of writing it on disk (does not affect
+data sent to the dispatcher).</p> ") +
+ /* logfile_settings dialog help 5/8 */
+ _("<p><b>Flush</b>: describes how to write the data to disk. If set to <i>INCREMANTAL</i> the
+<b>Frequency</b> parameter tells how many records to write before issuing an explicit flush to disk.
+<i>NONE</i> means: no special effort is made to flush data, <i>DATA</i>: keep data portion synced,
+<i>SYNC</i>: keep data and meta-data fully synced.</p>" ) +
+ /* logfile_settings dialog help 6/8 */
+ _("<p>Configure the maximum log file size (in megabytes) and the action to take when this
+value is reached in <b>Size and Action</b> frame.</p>") +
+ /* logfile_settings dialog help 7/8 */
+ _("<p>If the action is set to <i>ROTATE</i> the <b>Number of Log Files</b> specifies the number
+of files to keep. <i>SYSLOG</i> means: the audit daemon will write a warning to /var/log/messages,
+<i>SUSPEND</i>: stop writing records to disk, <i>IGNORE</i>: do nothing, <i>KEEP_LOGS</i>: similar
+to ROTATE, but log files are not overwritten.</p>") +
+ /* logfile_settings dialog help 8/8 */
_("<p><b>Computer Name Format</b> describes how to write the computer name to the log file.
-If <i>User</i> is set the <b>User Defined Name</b> is used.</p> "),
+If <i>USER</i> is set the <b>User Defined Name</b> is used. <i>NONE</i> means: no computer name
+is inserted, <i>HOSTNAME</i>: name returned by the 'gethostname' syscall,
+<i>FQD</i>: fully qualified domain name</p>") ,
/* dispatcher dialog help 1/5 */
"dispatcher" : _("<p><b><big>Auditd Dispatcher Configuration</big></b><br>
-Detailed information about the dispatcher settings can be obtained from 'man auditd.conf'.<br></p>") +
+Detailed information about the dispatcher settings can be obtained from the manual page
+('man auditd.conf').</p>") +
/* dispatcher dialog help 2/5 */
_("<p><b>Dispatcher</b>: The dispatcher program is started by the audit daemon and
gets all audit events on stdin.</p>") +
/* dispatcher dialog help 3/5 */
- _("<p><b>Communication</b>: Controls the communication
-between the daemon and the dispatcher program.</p>") +
+ _("<p><b>Communication</b>: Controls the communication between the daemon and the dispatcher
+program. A <i>lossy</i> communication means that events going to the dispatcher are discarded
+when the queue (a 128kB buffer) is full. Choose <i>lossless</i> if you want a blocking/lossless
+communication.</p>") +
/* dispatcher dialog help 4/5 */
- _("<p>The dispatcher 'audispd' is an audit event multiplexor
-(for more information see 'man audispd' and 'man audispd.conf'.</p>") +
+ _("<p>The dispatcher 'audispd' is an audit event multiplexor.
+For more information see the manual pages ('man audispd' and 'man audispd.conf').</p>") +
/* dispatcher dialog help 5/5 */
_("<p><b>Please note:</b> The dispatcher program must be owned by 'root', have '0750'
@@ -104,26 +114,31 @@
/* disk space dialog help 1/6 */
"diskspace_settings" : _("<p><b><big>Auditd Disk Space Configuration</big></b><br>
The settings made here refer to disk space on log partition.
-Detailed information can be obtained from 'man auditd.conf'</p>
+Detailed information can be obtained from the manual page ('man auditd.conf').</p>
") +
/* disk space dialog help 2/6 */
- _("<p><b>Space Left</b> and <b>Action</b> describe how much disk space (in megabytes)
-to left and which action to perform if the system is starting to run low on space.</p>") +
+ _("<p><b>Space Left</b> (in megabytes) tells the audit daemon when to perform an <b>Action</b> because
+the system is starting to run low on space.</p>") +
/* disk space dialog help 3/6 */
- _("<p><b>Admin Space Left</b> and <b>Action</b> describe how much disk space (in megabytes)
-to left and which action to perform if the system <b>is running low</b>.</p>") +
+ _("<p>The value for <b>Admin Space Left</b> should be lower than above. The system <b>is running
+low</b> on disk space if the value is reached and the specified <b>Action</b> will be performed.</p>") +
- /* disk space dialog help 4/6 */
+ /* disk space dialog hep 4/6 */
_("<p>If an action is set to <i>EMAIL</i> a warning mail will be send to the account specified in
-<b>Action Mail Account</b></p>" ) +
+<b>Action Mail Account</b>.<br>
+ <i>SYSLOG</i> means: the disk space warning will be written to /var/log/messages, <i>IGNORE</i>:
+do nothing, <i>EXEC</i>: execute the script from <b>Path to Script</b>, <i>SUSPEND</i>: stop writing
+records to disk, <i>SINGLE</i>: put the computer system in single user mode, <i>HALT</i>: shutdown
+the system.</p>") +
/* disk space dialog help 5/6 */
_("<p>You can also specify a <b>Disk Full Action</b> (disk has become full already) and
-a <b>Disk Error Action</b> (performed whenever an error is detected while writing to disk).</p>") +
+a <b>Disk Error Action</b> (performed whenever an error is detected while writing to disk).
+Available actions are the same as above (except for <i>EMAIL</i>).</p>") +
- /* disk space dialog help 6/6 */
- _("<p><b>Please note:</b> All scripts specified for <b>Action</b> <i>EXEC</i> must be owned
+ /* disk space dialog help 5/6 */
+ _("<p><b>Please note:</b> All scripts specified for <i>EXEC</i> must be owned
by 'root', have '0750' file permissions and the full path name has to be entered.</p>"),
/* rules dialog help 1/6 */
@@ -137,11 +152,11 @@
_("<p>Enabling auditing whithout additional rules will cause the
applications which use <i>libaudit</i>, e.g. PAM to log to /var/log/audit/audit.log (default).</p> ") +
/* rules dialog help 4/6 */
- _("<p>This module also allows you to edit the rules manually. <br>
-Detailed information about all options gives 'man auditctl'.</p>") +
+ _("<p>The dialog also allows you to edit the rules manually, which is recommended for advanced users only.<br>
+For more information about all options, see 'man auditctl'.</p>") +
/* rules dialog help 5/6 */
- _("<p><b>Check Syntax</b> sends the rules via <i>auditctl</i> to the audit subsystem and tells whether the syntax is correct.<br>
-<b>Restore</b> restores the settings from /etc/audit/audit.rules.</p>") +
+ _("<p><b>Check Syntax</b> sends the rules via <i>auditctl</i> to the audit subsystem and tells
+ whether the syntax is correct.<br><b>Restore</b> restores the settings from /etc/audit/audit.rules.</p>") +
/* rules dialog help 6/6 */
_("<p>Use the <b>Restore and Reset</b> button to restore the rules and reset
the changes (from previous syntax checks) by calling <i>auditctl</i> with it.<br>
Modified: branches/SuSE-Code-11-SP1-Branch/audit-laf/src/wizards.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/audit-laf/src/wizards.ycp?rev=59533&r1=59532&r2=59533&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/audit-laf/src/wizards.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/audit-laf/src/wizards.ycp Fri Nov 13 15:22:20 2009
@@ -141,7 +141,7 @@
Wizard::DisableBackButton ();
Wizard::SetTitleIcon("yast-audit-laf");
- return CWM::Run (w, $[`abort : ReallyExit]);
+ return CWM::Run (w, $[`abort : ReallyAbort]);
}
/**
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
