Hello community,
here is the log from the commit of package yast2-audit-laf for openSUSE:Factory
checked in at Sat Jul 11 02:13:54 CEST 2009.
--------
--- yast2-audit-laf/yast2-audit-laf.changes 2009-05-27 12:41:58.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-audit-laf/yast2-audit-laf.changes 2009-07-09 14:37:01.000000000 +0200
@@ -1,0 +2,14 @@
+Thu Jul 2 14:13:54 CEST 2009 - gs@suse.de
+
+- Add information about all option settings to the help text
+ (bnc #510776),
+- Add command line support for settings in /etc/audit/auditd.conf
+- 2.18.3
+
+-------------------------------------------------------------------
+Wed Jun 10 11:55:41 CEST 2009 - gs@suse.de
+
+- Add information about action 'SYSLOG' to the 'Disk Space' help
+ (bnc #510775)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-audit-laf-2.18.2.tar.bz2
New:
----
yast2-audit-laf-2.18.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-audit-laf.spec ++++++
--- /var/tmp/diff_new_pack.cRIgvh/_old 2009-07-11 02:13:25.000000000 +0200
+++ /var/tmp/diff_new_pack.cRIgvh/_new 2009-07-11 02:13:25.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-audit-laf (Version 2.18.2)
+# spec file for package yast2-audit-laf (Version 2.18.3)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,13 +19,13 @@
Name: yast2-audit-laf
-Version: 2.18.2
+Version: 2.18.3
Release: 1
-License: GPL v2 or later
-Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-audit-laf-2.18.2.tar.bz2
+Source0: yast2-audit-laf-2.18.3.tar.bz2
Prefix: /usr
+Group: System/YaST
+License: GPL v2 or later
Requires: yast2
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
BuildArch: noarch
@@ -35,14 +35,8 @@
This module allows the configuration of the audit daemon as well as to
add rules for the audit subsystem.
-
-
-Authors:
---------
- Gabriele Mohr
-
%prep
-%setup -n yast2-audit-laf-2.18.2
+%setup -n yast2-audit-laf-2.18.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -52,7 +46,9 @@
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
-make %{?jobs:-j%jobs}
+# V=1: verbose build in case we used AM_SILENT_RULES(yes)
+# so that RPM_OPT_FLAGS check works
+make %{?jobs:-j%jobs} V=1
%install
make install DESTDIR="$RPM_BUILD_ROOT"
@@ -81,50 +77,3 @@
%doc %{prefix}/share/doc/packages/yast2-audit-laf
/usr/share/YaST2/schema/autoyast/rnc/audit-laf.rnc
%changelog
-* Thu Mar 12 2009 gs@suse.de
-- Set LANG=POSIX for command 'auditctl'
-- 2.18.2
-* Mon Feb 02 2009 gs@suse.de
-- Correct behaviour on "Abort" (bnc #458327)
-- 2.18.1
-* Wed Jan 21 2009 gs@suse.de
-- Localize message "Success" (bnc #447169)
-- 2.18.0
-* Thu Nov 13 2008 gs@suse.de
-- audit-laf.rnc added (for AutoYaST)
-- 2.17.7
-* Tue Nov 04 2008 gs@suse.de
-- Additional checks added (audit daemon really running,
- correct script specified for option EXEC)
-- 2.17.6
-* Tue Oct 28 2008 gs@suse.de
-- Allow to enter any log file name (replace AskForExistingFile
- by AskForSaveFileName)
-- Add input fields to specify a script (for option EXEC)
-- Better arrangement of some input fields
-- Enable input field for user defined name only if computer name
- format is set to USER, check for empty computer name
-- internal change: replace list of option values by string value
-- 2.17.5
-* Tue Oct 07 2008 gs@suse.de
-- Fixed typos and grammatical errors (bnc #432378, bcn #415719)
-- Additional checks added, reset rules if user aborts the
- configuration
-- 2.17.4
-* Wed Oct 01 2008 gs@suse.de
-- Basic command line support, fixed typos in help text
- (bnc #430521), add Summary() for AutoYaST
-- 2.17.3
-* Wed Sep 24 2008 gs@suse.de
-- fixed typos, improved help text, set title icon,
- prepare for AutoYaST
-- 2.17.2
-* Wed Sep 10 2008 gs@suse.de
-- @scrconfdir@ added in spec file
-- 2.17.1
-* Tue Sep 02 2008 gs@suse.de
-- Initial version
-- Allows to set the configuration for the audit daemon
- (auditd.conf), to enable/disable the syscall auditing
- and to add rules for the audit subsystem (auditctl)
-- 2.17.0
++++++ yast2-audit-laf-2.18.2.tar.bz2 -> yast2-audit-laf-2.18.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-audit-laf-2.18.2/VERSION new/yast2-audit-laf-2.18.3/VERSION
--- old/yast2-audit-laf-2.18.2/VERSION 2009-05-27 12:20:48.000000000 +0200
+++ new/yast2-audit-laf-2.18.3/VERSION 2009-07-09 14:36:20.000000000 +0200
@@ -1 +1 @@
-2.18.2
+2.18.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-audit-laf-2.18.2/audit-laf.pot new/yast2-audit-laf-2.18.3/audit-laf.pot
--- old/yast2-audit-laf-2.18.2/audit-laf.pot 2009-02-05 12:43:04.000000000 +0100
+++ new/yast2-audit-laf-2.18.3/audit-laf.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,685 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-05 12:43+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/AuditLaf.ycp:202
-msgid "The rules for auditctl are locked"
-msgstr ""
-
-#. combo box item
-#: src/AuditLaf.ycp:204 src/dialogs.ycp:262
-msgid "Auditing enabled"
-msgstr ""
-
-#. combo box item
-#: src/AuditLaf.ycp:206 src/dialogs.ycp:264
-msgid "Auditing disabled"
-msgstr ""
-
-#: src/AuditLaf.ycp:379
-msgid ""
-"Cannot start the audit daemon.\n"
-"Please check /var/log/messages for auditd errors.\n"
-"You can use the module 'System Log' from group\n"
-"'Miscellaneous' in YaST2 Control Center."
-msgstr ""
-
-#. AuditLaf read dialog caption
-#: src/AuditLaf.ycp:397
-msgid "Initializing Audit Configuration"
-msgstr ""
-
-#. Progress stage 1/4
-#: src/AuditLaf.ycp:408
-msgid "Read the configuration for auditd"
-msgstr ""
-
-#. Progress stage 2/4
-#: src/AuditLaf.ycp:410
-msgid "Read the rules file"
-msgstr ""
-
-#. Progress stage 3/4
-#: src/AuditLaf.ycp:412
-msgid "Check status of auditd"
-msgstr ""
-
-#. Progress step 1/3
-#: src/AuditLaf.ycp:416
-msgid "Reading the configuration..."
-msgstr ""
-
-#. Progress step 2/3
-#: src/AuditLaf.ycp:418
-msgid "Reading the rules file..."
-msgstr ""
-
-#. Progress step 3/3
-#: src/AuditLaf.ycp:420
-msgid "Checking status..."
-msgstr ""
-
-#. Report error
-#: src/AuditLaf.ycp:437
-msgid "Cannot read auditd.conf."
-msgstr ""
-
-#. Error message
-#: src/AuditLaf.ycp:447
-msgid "Cannot read audit.rules."
-msgstr ""
-
-#: src/AuditLaf.ycp:467
-msgid ""
-"The audit daemon doesn't run.\n"
-"Do you want to start it now?"
-msgstr ""
-
-#: src/AuditLaf.ycp:471
-msgid ""
-" The 'apparmor' kernel module is loaded\n"
-"which needs the audit daemon to log events. \n"
-"Do you want to start the daemon now?"
-msgstr ""
-
-#: src/AuditLaf.ycp:475
-msgid "Audit daemon not running"
-msgstr ""
-
-#: src/AuditLaf.ycp:482
-msgid "Cannot start the audit daemon"
-msgstr ""
-
-#: src/AuditLaf.ycp:483
-msgid ""
-"The reason might be that the rules are locked.\n"
-"Continue to check the rules. You can change\n"
-"the 'Enabled Flag' but to make the change\n"
-"active a reboot is required afterwards."
-msgstr ""
-
-#. Auditd read dialog caption
-#: src/AuditLaf.ycp:544
-msgid "Saving Audit Configuration"
-msgstr ""
-
-#. Progress stage 1/2
-#: src/AuditLaf.ycp:556
-msgid "Write the settings"
-msgstr ""
-
-#. Progress stage 2/2
-#: src/AuditLaf.ycp:558
-msgid "Write the rules"
-msgstr ""
-
-#. Progress step 1/2
-#: src/AuditLaf.ycp:561
-msgid "Writing the settings..."
-msgstr ""
-
-#. Progress step 2/2
-#: src/AuditLaf.ycp:563
-msgid "Writing the rules..."
-msgstr ""
-
-#: src/AuditLaf.ycp:576
-msgid "The rules are already locked."
-msgstr ""
-
-#: src/AuditLaf.ycp:577
-msgid ""
-"Do you want to change the 'Enabled Flag'?\n"
-"If yes, the new rules will be written to /etc/audit/audit.rules.\n"
-"After that you have to reboot the system."
-msgstr ""
-
-#. Error message
-#: src/AuditLaf.ycp:601
-msgid "Restart of the audit daemon failed"
-msgstr ""
-
-#. Error message
-#: src/AuditLaf.ycp:608
-msgid "Cannot write settings to auditd.conf."
-msgstr ""
-
-#. Error message, rules cannot be set
-#: src/AuditLaf.ycp:632
-msgid "Please start yast2-audit-laf again and check the rules"
-msgstr ""
-
-#: src/AuditLaf.ycp:637
-msgid "Cannot write settings to auditd.rules."
-msgstr ""
-
-#: src/AuditLaf.ycp:688
-msgid "Log file"
-msgstr ""
-
-#. Command line help text for the Xaudit-laf module
-#. Initialization dialog caption
-#: src/audit-laf.ycp:54 src/wizards.ycp:131 src/wizards.ycp:197
-msgid "Configuration of Linux Audit Framework (LAF)"
-msgstr ""
-
-#. Rich text title for AuditLaf in proposals
-#: src/audit-laf_proposal.ycp:84
-msgid "AuditLaf"
-msgstr ""
-
-#. Menu title for AuditLaf in proposals
-#: src/audit-laf_proposal.ycp:86
-msgid "&AuditLaf"
-msgstr ""
-
-#: src/complex.ycp:124
-msgid "Select the log file"
-msgstr ""
-
-#: src/complex.ycp:164
-msgid ""
-"The 'User Defined Name' is NOT set although\n"
-"the 'Computer Name Format' is set to 'USER'.\n"
-"Setting the format to 'NONE' (default)."
-msgstr ""
-
-#: src/complex.ycp:204
-msgid "Select the dispatcher program"
-msgstr ""
-
-#. Second part of an error message: the value won't be changed because of previous error
-#: src/complex.ycp:302
-#, ycp-format
-msgid "Value of '%1' remains unchanged."
-msgstr ""
-
-#: src/complex.ycp:306
-#, ycp-format
-msgid "%1 doesn't exist.\n"
-msgstr ""
-
-#: src/complex.ycp:311
-#, ycp-format
-msgid "%1 is not a regular file.\n"
-msgstr ""
-
-#: src/complex.ycp:316
-#, ycp-format
-msgid "%1 not owned by root.\n"
-msgstr ""
-
-#: src/complex.ycp:326
-#, ycp-format
-msgid "File permissiones of %1 NOT set to -rwxr-x---.\n"
-msgstr ""
-
-#. Warning - the audit configuration is locked, reset impossible
-#: src/complex.ycp:417
-msgid ""
-"The rules are already locked, a reset is impossible.\n"
-"\n"
-"If you want to unlock, set the enabled flag accordingly and\n"
-"finish the configuration. Afterwards a reboot is required."
-msgstr ""
-
-#. Report success
-#: src/complex.ycp:431
-msgid "Rules successfully restored"
-msgstr ""
-
-#. Report error - error during reset
-#: src/complex.ycp:436
-msgid "Cannot reset rules. Please check /etc/audit/audit.rules."
-msgstr ""
-
-#: src/complex.ycp:518
-msgid ""
-"The rules are already locked.\n"
-"\n"
-"A test isn't possible because sending new rules\n"
-"will cause an error."
-msgstr ""
-
-#: src/complex.ycp:529
-msgid ""
-"Lock is set in audit.rules (-e 2).\n"
-"\n"
-"It doesn't make sense to continue, because the rules would\n"
-"be locked until next boot."
-msgstr ""
-
-#: src/complex.ycp:553
-msgid "Success"
-msgstr ""
-
-#: src/complex.ycp:558
-msgid "Cannot create tmp file for rules"
-msgstr ""
-
-#: src/complex.ycp:564
-msgid "Select an example"
-msgstr ""
-
-#: src/complex.ycp:615
-msgid "Lock set"
-msgstr ""
-
-#: src/complex.ycp:615
-msgid ""
-"The audit configuration is locked (option -e 2).\n"
-"This means the rules are locked until next boot!\n"
-"If you really want this, make sure '-e 2' is the last entry\n"
-"in the rules file. If not, either enable or disable auditing.\n"
-"To check or to change the rules, please go back to rules editor."
-msgstr ""
-
-#. Frame label
-#: src/dialogs.ycp:48
-msgid "General Settings"
-msgstr ""
-
-#. InputField label
-#. Header of tab in tab widget
-#: src/dialogs.ycp:54 src/wizards.ycp:85
-msgid "&Log File"
-msgstr ""
-
-#. PushButton label
-#: src/dialogs.ycp:59 src/dialogs.ycp:152
-msgid "Select Fi&le"
-msgstr ""
-
-#. ComboBox label - select format of logging
-#: src/dialogs.ycp:65
-msgid "&Format"
-msgstr ""
-
-#. ComboBox label - select how to flush data on disk
-#: src/dialogs.ycp:76
-msgid "Fl&ush"
-msgstr ""
-
-#. InputField label - enter how many records to write before flush data to disk
-#: src/dialogs.ycp:85
-msgid "Fre&quency (Number of Records)"
-msgstr ""
-
-#. Frame label - data regarding size of log file and action to perform
-#: src/dialogs.ycp:93
-msgid "Size and Action"
-msgstr ""
-
-#. InputField label
-#: src/dialogs.ycp:96
-msgid "Ma&x File Size (MB)"
-msgstr ""
-
-#. ComboBox label
-#: src/dialogs.ycp:99
-msgid "M&aximum File Size Action"
-msgstr ""
-
-#. InputField label
-#: src/dialogs.ycp:109
-msgid "&Number of Log Files"
-msgstr ""
-
-#. Frame label - data regarding how to write computer names to the log file
-#: src/dialogs.ycp:115
-msgid "Computer Names"
-msgstr ""
-
-#: src/dialogs.ycp:119
-msgid "&Computer Name Format"
-msgstr ""
-
-#. InputField label
-#: src/dialogs.ycp:128
-msgid "User Defined Name"
-msgstr ""
-
-#. Frame label - settings of the dispatcher program
-#: src/dialogs.ycp:142
-msgid "Dispatcher Settings"
-msgstr ""
-
-#. InputField label
-#: src/dialogs.ycp:147
-msgid "Dispatcher Program"
-msgstr ""
-
-#. ComboBox label - communication between the audit daemon and the dispatcher program
-#: src/dialogs.ycp:157
-msgid "C&ommunication"
-msgstr ""
-
-#. Frame label - keep it short!
-#: src/dialogs.ycp:192
-msgid "Value and Action for Space is Starting to Run Low"
-msgstr ""
-
-#. InputField label - space on disk is starting to run low if the entered value is reached
-#: src/dialogs.ycp:195
-msgid "&Space Left on Disk (MB)"
-msgstr ""
-
-#. ComboBox label - select an action which is performed if space on disk is low
-#: src/dialogs.ycp:199
-msgid "&Action"
-msgstr ""
-
-#. InputField label - enter the path to a script (which will be executed)
-#: src/dialogs.ycp:203 src/dialogs.ycp:220 src/dialogs.ycp:236
-#: src/dialogs.ycp:244
-msgid "Path to Script"
-msgstr ""
-
-#. Frame label - keep it short!
-#: src/dialogs.ycp:209
-msgid "Value and Action for Space is Running Low"
-msgstr ""
-
-#. InputField label - space on disk is running low if the entered value is reached
-#: src/dialogs.ycp:212
-msgid "&Admin Space Left (MB) "
-msgstr ""
-
-#. ComboBox label - select an action which is performed if space on disk is running low
-#: src/dialogs.ycp:216
-msgid "Ac&tion"
-msgstr ""
-
-#: src/dialogs.ycp:224
-msgid "Action Mail Account"
-msgstr ""
-
-#. Frame label - keep it short!
-#: src/dialogs.ycp:228
-msgid "Action on Error or Disk Full"
-msgstr ""
-
-#. ComboBox label - select an action which is performed if disk is full
-#: src/dialogs.ycp:233
-msgid "Disk &Full Action"
-msgstr ""
-
-#. ComboBox label - select an action which is performed on error
-#: src/dialogs.ycp:241
-msgid "Disk &Error Action"
-msgstr ""
-
-#. label of a combo box with the possibilitiy to enable/disable auditing or lock the rules
-#: src/dialogs.ycp:260
-msgid "&Set Enabled Flag"
-msgstr ""
-
-#. combo box item
-#: src/dialogs.ycp:266
-msgid "Rules are locked (until next boot)"
-msgstr ""
-
-#. Label - describes what can be done in the editor
-#: src/dialogs.ycp:274
-msgid "Edit the rules for the audit subsystem here:"
-msgstr ""
-
-#. label of a push button (please keep it short)
-#: src/dialogs.ycp:280
-msgid "&Check Syntax"
-msgstr ""
-
-#. label of push button (please keep it short)
-#: src/dialogs.ycp:283
-msgid "&Restore 'audit.rules'"
-msgstr ""
-
-#. label of push button (please keep it short)
-#: src/dialogs.ycp:286
-msgid "R&estore and Reset"
-msgstr ""
-
-#. label of a push button
-#: src/dialogs.ycp:289
-msgid "&Load "
-msgstr ""
-
-#. Read dialog help 1/2
-#: src/helps.ycp:39
-msgid ""
-"<p><b><big>Initializing Configuration of Linux Audit Framework</big></b><br>\n"
-"Please wait...<br></p>\n"
-msgstr ""
-
-#. Read dialog help 2/2
-#: src/helps.ycp:44
-msgid ""
-"<p><b><big>Aborting Initialization:</big></b><br>\n"
-"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>\n"
-msgstr ""
-
-#. Write dialog help 1/2
-#: src/helps.ycp:49
-msgid ""
-"<p><b><big>Saving auditd Configuration and Rules</big></b><br>\n"
-"Please wait...<br></p>\n"
-msgstr ""
-
-#. Write dialog help 2/2
-#: src/helps.ycp:54
-msgid ""
-"<p><b><big>Aborting Saving:</big></b><br>\n"
-"Abort the save procedure by pressing <b>Abort</b>.\n"
-"An additional dialog informs whether it is safe to do so.\n"
-"</p>\n"
-msgstr ""
-
-#. logfile_settings dialog help 1/7
-#: src/helps.ycp:61
-msgid ""
-"<p><b><big>Auditd Log File Configuration</big></b><br>\n"
-"The audit daemon logs all relevant audit events to the default log file <i>/var/log/audit/audit.log</i>.\n"
-"Events may come from the <i>apparmor</i> kernel module, from applications\n"
-"which use <i>libaudit</i> (e.g. PAM) or incidents caused by rules (e.g. file watches).</p>"
-msgstr ""
-
-#. logfile_settings dialog help 2/7
-#: src/helps.ycp:66
-msgid ""
-"<p>More information about rules and the possiblity to add rules offers the dialog <b>Rules for auditctl</b>.\n"
-"Detailed information about the log file settings can be obtained from 'man auditd.conf'.</p>"
-msgstr ""
-
-#. logfile_settings dialog help 3/7
-#: src/helps.ycp:69
-msgid ""
-"<p><b>Log File</b>: Enter the full path name to the log file\n"
-"(or use <b>Select File</b>.)</p>"
-msgstr ""
-
-#. logfile_settings dialog help 4/7
-#: src/helps.ycp:72
-msgid ""
-"<p><b>Format</b>: set <i>RAW</i> to log all data or <i>NOLOG</i>\n"
-"to discard all audit information (does not affect data sent to the dispatcher).</p> "
-msgstr ""
-
-#. logfile_settings dialog help 5/7
-#: src/helps.ycp:75
-msgid ""
-"<p><b>Flush</b>: describes how to write the data to disk. If set to\n"
-"<i>INCREMANTAL</i> the <b>Frequency</b> parameter tells how many records to write before\n"
-"issuing an explicit flush to disk.</p>"
-msgstr ""
-
-#. logfile_settings dialog help 6/7
-#: src/helps.ycp:79
-msgid ""
-"<p>Configure the maximum log file size and the action to take when this\n"
-"value is reached in <b>Size and Action</b> frame. If action is set to\n"
-"<i>ROTATE</i> the <b>Number of Log Files</b> specifies the number of files to keep.</p>"
-msgstr ""
-
-#. logfile_settings dialog help 7/7
-#: src/helps.ycp:83
-msgid ""
-"<p><b>Computer Name Format</b> describes how to write the computer name to the log file.\n"
-"If <i>User</i> is set the <b>User Defined Name</b> is used.</p> "
-msgstr ""
-
-#. dispatcher dialog help 1/5
-#: src/helps.ycp:87
-msgid ""
-"<p><b><big>Auditd Dispatcher Configuration</big></b><br>\n"
-"Detailed information about the dispatcher settings can be obtained from 'man auditd.conf'.<br></p>"
-msgstr ""
-
-#. dispatcher dialog help 2/5
-#: src/helps.ycp:90
-msgid ""
-"<p><b>Dispatcher</b>: The dispatcher program is started by the audit daemon and\n"
-"gets all audit events on stdin.</p>"
-msgstr ""
-
-#. dispatcher dialog help 3/5
-#: src/helps.ycp:93
-msgid ""
-"<p><b>Communication</b>: Controls the communication\n"
-"between the daemon and the dispatcher program.</p>"
-msgstr ""
-
-#. dispatcher dialog help 4/5
-#: src/helps.ycp:97
-msgid ""
-"<p>The dispatcher 'audispd' is an audit event multiplexor\n"
-"(for more information see 'man audispd' and 'man audispd.conf'.</p>"
-msgstr ""
-
-#. dispatcher dialog help 5/5
-#: src/helps.ycp:101
-msgid ""
-"<p><b>Please note:</b> The dispatcher program must be owned by 'root', have '0750'\n"
-" file permissions and the full path name has to be entered.</p>"
-msgstr ""
-
-#. disk space dialog help 1/6
-#: src/helps.ycp:105
-msgid ""
-"<p><b><big>Auditd Disk Space Configuration</big></b><br>\n"
-"The settings made here refer to disk space on log partition.\n"
-"Detailed information can be obtained from 'man auditd.conf'</p>\n"
-msgstr ""
-
-#. disk space dialog help 2/6
-#: src/helps.ycp:110
-msgid ""
-"<p><b>Space Left</b> and <b>Action</b> describe how much disk space (in megabytes)\n"
-"to left and which action to perform if the system is starting to run low on space.</p>"
-msgstr ""
-
-#. disk space dialog help 3/6
-#: src/helps.ycp:114
-msgid ""
-"<p><b>Admin Space Left</b> and <b>Action</b> describe how much disk space (in megabytes)\n"
-"to left and which action to perform if the system <b>is running low</b>.</p>"
-msgstr ""
-
-#. disk space dialog help 4/6
-#: src/helps.ycp:118
-msgid ""
-"<p>If an action is set to <i>EMAIL</i> a warning mail will be send to the account specified in\n"
-"<b>Action Mail Account</b></p>"
-msgstr ""
-
-#. disk space dialog help 5/6
-#: src/helps.ycp:122
-msgid ""
-"<p>You can also specify a <b>Disk Full Action</b> (disk has become full already) and\n"
-"a <b>Disk Error Action</b> (performed whenever an error is detected while writing to disk).</p>"
-msgstr ""
-
-#. disk space dialog help 6/6
-#: src/helps.ycp:126
-msgid ""
-"<p><b>Please note:</b> All scripts specified for <b>Action</b> <i>EXEC</i> must be owned\n"
-"by 'root', have '0750' file permissions and the full path name has to be entered.</p>"
-msgstr ""
-
-#. rules dialog help 1/6
-#: src/helps.ycp:130
-msgid ""
-"<p><b><big>Rules for auditctl</big></b><br>\n"
-"This dialog offers the possibiltiy to enable or to disable the syscall\n"
-"auditing as well as to lock the audit configuration.\n"
-"The selected flag from <b>Set Enabled Flag</b> will be added to the rules.</p>"
-msgstr ""
-
-#. rules dialog help 2/6
-#: src/helps.ycp:135
-msgid "<p><b>Please note:</b><br>Locking the rules means they cannot be changed until next reboot! </p>"
-msgstr ""
-
-#. rules dialog help 3/6
-#: src/helps.ycp:137
-msgid ""
-"<p>Enabling auditing whithout additional rules will cause the\n"
-" applications which use <i>libaudit</i>, e.g. PAM to log to /var/log/audit/audit.log (default).</p> "
-msgstr ""
-
-#. rules dialog help 4/6
-#: src/helps.ycp:140
-msgid ""
-"<p>This module also allows you to edit the rules manually. <br>\n"
-"Detailed information about all options gives 'man auditctl'.</p>"
-msgstr ""
-
-#. rules dialog help 5/6
-#: src/helps.ycp:143
-msgid ""
-"<p><b>Check Syntax</b> sends the rules via <i>auditctl</i> to the audit subsystem and tells whether the syntax is correct.<br>\n"
-"<b>Restore</b> restores the settings from /etc/audit/audit.rules.</p>"
-msgstr ""
-
-#. rules dialog help 6/6
-#: src/helps.ycp:146
-msgid ""
-"<p>Use the <b>Restore and Reset</b> button to restore the rules and reset\n"
-"the changes (from previous syntax checks) by calling <i>auditctl</i> with it.<br>\n"
-"The <b>Load</b> button opens a file selection dialog and you are able to load\n"
-"an example rules file.</p>"
-msgstr ""
-
-#. Header of tab in tab widget
-#: src/wizards.ycp:91
-msgid "&Dispatcher"
-msgstr ""
-
-#. Header of tab in tab widget
-#: src/wizards.ycp:97
-msgid "Disk &Space"
-msgstr ""
-
-#. Header of tab in tab widget
-#. (auditctl is a program which sends the rules to the audit subsystem)
-#: src/wizards.ycp:104
-msgid "&Rules for 'auditctl'"
-msgstr ""
-
-#. Initialization dialog contents
-#: src/wizards.ycp:199
-msgid "Initializing..."
-msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-audit-laf-2.18.2/autodocs-ycp.ami new/yast2-audit-laf-2.18.3/autodocs-ycp.ami
--- old/yast2-audit-laf-2.18.2/autodocs-ycp.ami 2009-05-27 11:30:05.000000000 +0200
+++ new/yast2-audit-laf-2.18.3/autodocs-ycp.ami 2009-07-09 14:36:31.000000000 +0200
@@ -1,5 +1,5 @@
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
+# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $
# Builds source documentation for YCP sources
# Uses ycpdoc
@@ -8,20 +8,25 @@
# Optional - the default is $(srcdir)/../../src/*.ycp
# AUTODOCS_PM: Files that the perl autodocs is built from
# Optional - the default is $(srcdir)/../../src/*.pm
+# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs
+# Optional - the default is no subdir, $(docdir)/autodocs
+# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __
+# Optional - the default is $(srcdir)/../../src
-htmldir = $(docdir)/autodocs
+htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
-html_DATA = index.html $(wildcard *.html)
+html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
CLEANFILES = $(html_DATA) pod2htm*.tmp
AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+AUTODOCS_STRIP ?= $(srcdir)/../../src
index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
#including *.pm, for the index
- ${YCPDOC} -d. $^
+ ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP)
for i in $(AUTODOCS_PM); do \
- b=`basename $$i`; b=$${b%.pm}; \
+ b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \
pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
- echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
+ echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \
done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-audit-laf-2.18.2/configure new/yast2-audit-laf-2.18.3/configure
--- old/yast2-audit-laf-2.18.2/configure 2009-05-27 11:30:12.000000000 +0200
+++ new/yast2-audit-laf-2.18.3/configure 2009-07-09 14:36:36.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-audit-laf 2.18.1.
+# Generated by GNU Autoconf 2.63 for yast2-audit-laf 2.18.3.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-audit-laf'
PACKAGE_TARNAME='yast2-audit-laf'
-PACKAGE_VERSION='2.18.1'
-PACKAGE_STRING='yast2-audit-laf 2.18.1'
+PACKAGE_VERSION='2.18.3'
+PACKAGE_STRING='yast2-audit-laf 2.18.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1274,7 +1274,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-audit-laf 2.18.1 to adapt to many kinds of systems.
+\`configure' configures yast2-audit-laf 2.18.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1345,7 +1345,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-audit-laf 2.18.1:";;
+ short | recursive ) echo "Configuration of yast2-audit-laf 2.18.3:";;
esac
cat <<\_ACEOF
@@ -1425,7 +1425,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-audit-laf configure 2.18.1
+yast2-audit-laf configure 2.18.3
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1439,7 +1439,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-audit-laf $as_me 2.18.1, which was
+It was created by yast2-audit-laf $as_me 2.18.3, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2286,7 +2286,7 @@
# Define the identity of the package.
PACKAGE='yast2-audit-laf'
- VERSION='2.18.1'
+ VERSION='2.18.3'
cat >>confdefs.h <<_ACEOF
@@ -2510,7 +2510,7 @@
-VERSION="2.18.1"
+VERSION="2.18.3"
RPMNAME="yast2-audit-laf"
MAINTAINER="Gabriele Mohr "
@@ -3451,7 +3451,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-audit-laf $as_me 2.18.1, which was
+This file was extended by yast2-audit-laf $as_me 2.18.3, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3501,7 +3501,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-audit-laf config.status 2.18.1
+yast2-audit-laf config.status 2.18.3
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-audit-laf-2.18.2/configure.in new/yast2-audit-laf-2.18.3/configure.in
--- old/yast2-audit-laf-2.18.2/configure.in 2009-05-27 11:30:05.000000000 +0200
+++ new/yast2-audit-laf-2.18.3/configure.in 2009-07-09 14:36:31.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-audit-laf
dnl
-dnl -- This file is generated by y2autoconf 2.18.5 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-audit-laf, 2.18.1, http://bugs.opensuse.org/, yast2-audit-laf)
+AC_INIT(yast2-audit-laf, 2.18.3, http://bugs.opensuse.org/, yast2-audit-laf)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.18.1"
+VERSION="2.18.3"
RPMNAME="yast2-audit-laf"
MAINTAINER="Gabriele Mohr "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-audit-laf-2.18.2/doc/autodocs/Makefile.in new/yast2-audit-laf-2.18.3/doc/autodocs/Makefile.in
--- old/yast2-audit-laf-2.18.2/doc/autodocs/Makefile.in 2009-05-27 11:30:15.000000000 +0200
+++ new/yast2-audit-laf-2.18.3/doc/autodocs/Makefile.in 2009-07-09 14:36:37.000000000 +0200
@@ -17,7 +17,7 @@
# Makefile.am for audit-laf/doc/autodocs
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
+# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $
# Builds source documentation for YCP sources
# Uses ycpdoc
@@ -26,6 +26,10 @@
# Optional - the default is $(srcdir)/../../src/*.ycp
# AUTODOCS_PM: Files that the perl autodocs is built from
# Optional - the default is $(srcdir)/../../src/*.pm
+# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs
+# Optional - the default is no subdir, $(docdir)/autodocs
+# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __
+# Optional - the default is $(srcdir)/../../src
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
@@ -142,7 +146,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
-htmldir = $(docdir)/autodocs
+htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
imagedir = @imagedir@
includedir = @includedir@
infodir = @infodir@
@@ -183,7 +187,7 @@
ydatadir = @ydatadir@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
-html_DATA = index.html $(wildcard *.html)
+html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
CLEANFILES = $(html_DATA) pod2htm*.tmp
all: all-am
@@ -369,14 +373,15 @@
AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+AUTODOCS_STRIP ?= $(srcdir)/../../src
index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
#including *.pm, for the index
- ${YCPDOC} -d. $^
+ ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP)
for i in $(AUTODOCS_PM); do \
- b=`basename $$i`; b=$${b%.pm}; \
+ b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \
pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
- echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
+ echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \
done
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-audit-laf-2.18.2/src/AuditLaf.ycp new/yast2-audit-laf-2.18.3/src/AuditLaf.ycp
--- old/yast2-audit-laf-2.18.2/src/AuditLaf.ycp 2009-02-24 12:14:57.000000000 +0100
+++ new/yast2-audit-laf-2.18.3/src/AuditLaf.ycp 2009-07-09 14:36:20.000000000 +0200
@@ -468,8 +468,9 @@
Do you want to start it now?");
if (apparmor_stat == 0 )
- message = _(" The 'apparmor' kernel module is loaded
-which needs the audit daemon to log events.
+ message = _(" The 'apparmor' kernel module is loaded.
+The kernel uses a running audit daemon to log audit
+events to /var/log/audit/audit.log (default).
Do you want to start the daemon now?" );
boolean start = Popup::YesNoHeadline( _("Audit daemon not running"),
@@ -537,9 +538,9 @@
* @return true on success
*/
global boolean Write() {
- boolean write_success = true;
boolean go_on = false;
-
+ boolean ret = true;
+
/* Auditd read dialog caption */
string caption = _("Saving Audit Configuration");
@@ -579,7 +580,7 @@
After that you have to reboot the system.") );
if ( write_rules )
WriteAuditRules();
-
+
// don't try to restart the daemon - daemon will stop
return false;
}
@@ -588,7 +589,7 @@
if ( PollAbort() ) return false;
Progress::NextStage();
- write_success = WriteAuditdSettings();
+ boolean write_success = WriteAuditdSettings();
if ( write_success )
{
@@ -597,8 +598,11 @@
y2milestone( "'auditd restart' returned: %1", exit_code );
if ( exit_code != 0 )
+ {
// Error message
Report::Error ( _("Restart of the audit daemon failed" ) );
+ ret = false;
+ }
else
go_on = true;
}
@@ -606,6 +610,7 @@
{
// Error message
Report::Error (_("Cannot write settings to auditd.conf.") );
+ ret = false;
}
sleep(sl);
@@ -614,7 +619,7 @@
Progress::NextStage ();
- if ( go_on && !locked )
+ if ( go_on )
{
write_success = WriteAuditRules();
@@ -630,22 +635,26 @@
output["stderr"]:"",
// Error message, rules cannot be set
_("Please start yast2-audit-laf again and check the rules") ) );
+ ret = false;
}
}
else
{
Report::Error ( _("Cannot write settings to auditd.rules.") );
+ ret = false;
}
sleep(sl);
}
// Finally check status of auditd (if restart has worked but daemon exited afterwards)
- CheckAuditdStatus();
+ if ( !CheckAuditdStatus() )
+ ret = false;
if ( PollAbort() ) return false;
-
- return true;
+
+ y2milestone( "Auditd::Write() returns: %1", ret );
+ return ret;
}
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-audit-laf-2.18.2/src/Makefile.am new/yast2-audit-laf-2.18.3/src/Makefile.am
--- old/yast2-audit-laf-2.18.2/src/Makefile.am 2008-11-13 13:38:56.000000000 +0100
+++ new/yast2-audit-laf-2.18.3/src/Makefile.am 2009-07-06 14:17:12.000000000 +0200
@@ -11,7 +11,8 @@
helps.ycp \
wizards.ycp \
dialogs.ycp \
- complex.ycp
+ complex.ycp \
+ cmdline.ycp
desktop_DATA = \
audit-laf.desktop
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-audit-laf-2.18.2/src/Makefile.in new/yast2-audit-laf-2.18.3/src/Makefile.in
--- old/yast2-audit-laf-2.18.2/src/Makefile.in 2009-05-27 11:30:16.000000000 +0200
+++ new/yast2-audit-laf-2.18.3/src/Makefile.in 2009-07-09 14:36:37.000000000 +0200
@@ -192,7 +192,8 @@
helps.ycp \
wizards.ycp \
dialogs.ycp \
- complex.ycp
+ complex.ycp \
+ cmdline.ycp
desktop_DATA = \
audit-laf.desktop
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-audit-laf-2.18.2/src/audit-laf.ycp new/yast2-audit-laf-2.18.3/src/audit-laf.ycp
--- old/yast2-audit-laf-2.18.2/src/audit-laf.ycp 2008-10-01 13:10:23.000000000 +0200
+++ new/yast2-audit-laf-2.18.3/src/audit-laf.ycp 2009-07-09 14:36:20.000000000 +0200
@@ -47,24 +47,176 @@
import "CommandLine";
include "audit-laf/wizards.ycp";
+include "audit-laf/cmdline.ycp";
-map cmdline_description = $[
- "id" : "audit-laf",
- /* Command line help text for the Xaudit-laf module */
- "help" : _("Configuration of Linux Audit Framework (LAF)"),
- "guihandler" : AuditLafSequence,
- "initialize" : AuditLaf::Read,
- "finish" : AuditLaf::Write,
- "actions" : $[
- // FIXME TODO: fill the functionality description here
- ],
- "options" : $[
- // FIXME TODO: fill the option descriptions here
- ],
- "mappings" : $[
- // FIXME TODO: fill the mappings of actions and options here
- ]
-];
+map cmdline_description =
+ $[
+ "id" : "audit-laf",
+ /* Command line help text for the audit-laf module */
+ "help" : _("Configuration of Linux Audit Framework (LAF)"),
+ "guihandler": AuditLafSequence,
+ "initialize": AuditLaf::Read,
+ "finish" : AuditLaf::Write,
+ "actions" : $[
+ "show" :$[
+ "handler" : ShowHandler,
+ // translators: command line help text for show action
+ "help" : _("Show information about audit settings")
+
+ ],
+ "set" :$[
+ "handler" : SettingsHandler,
+ // translators: command line help text for set action
+ "help" : _("Set the specified option"),
+ //"options" : ["non_strict"],
+ //"non_strict_help": _("Use keywords and values specified in 'man auditd.conf'")
+ ]
+ ],
+ "options" : $[
+ "logfile" :$[
+ // translators: command line help text for 'show logfile'
+ "help" : _("Show log file settings")
+ ],
+ "diskspace" :$[
+ // translators: command line help text for 'show diskspace'
+ "help" : _("Show disk space settings")
+ ],
+ "disp" :$[
+ // translators: command line help text for 'show dispatcher'
+ "help" : _("Show dispatcher settings")
+ ],
+
+ "log_file" :$[
+ // translators: command line help text for log_file option
+ "help" : _("Name of the log file (full path name)"),
+ "type" : "string"
+ ],
+ "log_format":$[
+ // translators: command line help text for log_format option
+ "help" : _("Log format"),
+ "type" : "enum",
+ "typespec" : ["RAW", "NOLOG"]
+ ],
+ "flush" :$[
+ // translators: command line help text for flush option
+ "help" : _("How to write data to disk"),
+ "type" : "enum",
+ "typespec" : ["INCREMENTAL", "NONE", "DATA", "SYNC"]
+ ],
+ "freq" :$[
+ // translators: command line help text for frequency option
+ "help" : _("How many records to write before a flush to disk is issued"),
+ "type" : "integer"
+ ],
+ "max_log_file":$[
+ // translators: command line help text for max_log_file option
+ "help" : _("Maximal size (in MByte) of the log file"),
+ "type" : "integer"
+ ],
+ "max_log_file_action":$[
+ // translators: command line help text for max_log_file_action option
+ "help" : _("Action if max_log_file is reached"),
+ "type" : "enum",
+ "typespec" : ["IGNORE", "SYSLOG", "SUSPEND", "ROTATE", "KEEP_LOG"]
+ ],
+ "num_logs" :$[
+ // translators: command line help text for num_logs option
+ "help" : _("Number of log files to keep"),
+ "type" : "integer"
+ ],
+ "name_format":$[
+ // translators: command line help text for name_format option
+ "help" : _("Computer name format"),
+ "type" : "enum",
+ "typespec" : [ "NONE", "HOSTNAME", "FQD", "USER" ]
+ ],
+ "name" :$[
+ // translators: command line help text for name_format option
+ "help" : _("Computer name (used if format is set to USER)"),
+ "type" : "string"
+ ],
+
+ "space_left":$[
+ // translators: command line help text for space_left option
+ "help" : _("Space left on log partition (in MByte) when system starts to run low"),
+ "type" : "integer"
+ ],
+ "space_left_action":$[
+ // translators: command line help text for space_left_action option
+ "help" : _("Action if space_left is reached"),
+ "type" : "enum",
+ "typespec" : [ "IGNORE", "SYSLOG", "SUSPEND", "SINGLE", "HALT", "EMAIL" ]
+ ],
+ "space_left_script":$[
+ // translators: command line help text for space_left_script option
+ "help" : _("Script to execute (full path name) if space_left is reached"),
+ "type" : "string"
+ ],
+ "admin_space_left":$[
+ // translators: command line help text for admin_space_left
+ "help" : _("Space left on log partition (in MByte) when system is running low"),
+ "type" : "integer"
+ ],
+ "admin_space_left_action":$[
+ // command line help text for admin_space_left_action option
+ "help" : _("Action if admin_space_left is reached"),
+ "type" : "enum",
+ "typespec" : [ "IGNORE", "SYSLOG", "SUSPEND", "SINGLE", "HALT", "EMAIL" ]
+
+ ],
+ "admin_space_left_script":$[
+ // translators: command line help text for admin_space_left_script option
+ "help" : _("Script to execute (full path name) if admin_space_left is reached"),
+ "type" : "string"
+ ],
+ "action_mail_acct":$[
+ // command line help text for action_mail_acct option
+ "help" : _("Mail sent to this account (if space_left_action set to EMAIL)"),
+ "type" : "string"
+ ],
+ "disk_full_action":$[
+ // command line help text for disk_full_action option
+ "help" : _("Action to perform if disk is full"),
+ "type" : "enum",
+ "typespec" : ["IGNORE", "SYSLOG", "SUSPEND", "SINGLE", "HALT"]
+ ],
+ "disk_full_script" :$[
+ // translators: command line help text for admin_space_left_script option
+ "help" : _("Script to execute (full path name) if disk is full"),
+ "type" : "string"
+ ],
+ "disk_error_action":$[
+ // command line help text for disk_error_action option
+ "help" : _("Action to perform on disk error"),
+ "type" : "enum",
+ "typespec" : ["IGNORE", "SYSLOG", "SUSPEND", "SINGLE", "HALT"]
+ ],
+ "disk_error_script" :$[
+ // translators: command line help text for script on disk error option
+ "help" : _("Script to execute (full path name) on disk error"),
+ "type" : "string"
+ ],
+ "disp_qos" :$[
+ // command line help text for communication control option
+ "help" : _("How to communicate between dispatcher and the audit daemon"),
+ "type" : "enum",
+ "typespec" : ["lossy", "lossless"]
+ ],
+ "dispatcher" :$[
+ // command line help text for dispatcher option
+ "help" : _("Dispatcher program (full path name)"),
+ "type" : "string"
+ ]
+ ],
+ "mappings": $[
+ "show" : [ "logfile", "diskspace", "disp" ],
+ "set" : [ "log_file", "log_format", "flush", "freq", "max_log_file", "max_log_file_action",
+ "num_logs", "name_format", "name", "space_left", "space_left_action", "space_left_script",
+ "admin_space_left", "admin_space_left_action", "admin_space_left_script", "action_mail_acct",
+ "disk_full_action", "disk_full_script", "disk_error_action", "disk_error_script",
+ "disp_qos", "dispatcher"]
+ ]
+ ];
/* is this proposal or not? */
boolean propose = false;
@@ -81,7 +233,7 @@
if(propose) ret = AuditLafAutoSequence();
else ret = CommandLine::Run(cmdline_description);
-y2debug("ret=%1", ret);
+y2milestone("Return value=%1", ret);
/* Finish */
y2milestone("yast2-audit-laf module finished");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-audit-laf-2.18.2/src/cmdline.ycp new/yast2-audit-laf-2.18.3/src/cmdline.ycp
--- old/yast2-audit-laf-2.18.2/src/cmdline.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-audit-laf-2.18.3/src/cmdline.ycp 2009-07-09 14:36:20.000000000 +0200
@@ -0,0 +1,136 @@
+/**
+ * File: include/audit-laf/cmdline.ycp
+ * Package: Configuration of audit-laf
+ * Summary: Command line interface functions.
+ * Authors: Gabriele Mohr
+ *
+ *
+ * All command line interface functions.
+ */
+{
+
+textdomain "audit-laf";
+
+import "CommandLine";
+import "AuditLaf";
+import "Report";
+
+list <string> logfile_settings = ["log_file",
+ "log_format",
+ "flush",
+ "freq",
+ "max_log_file",
+ "max_log_file_action",
+ "num_logs",
+ "name_format",
+ "name"
+ ];
+list <string> diskspace_settings = ["space_left",
+ "space_left_action",
+ "admin_space_left",
+ "admin_space_left_action",
+ "action_mail_acct",
+ "disk_full_action",
+ "disk_error_action"
+ ];
+list <string> dispatcher_settings = ["disp_qos",
+ "dispatcher"
+ ];
+
+define string GetLogfileSettings() {
+
+ string settings = "";
+
+ foreach ( string key, logfile_settings, {
+ settings = settings + key + ": " + AuditLaf::GetAuditdOption(key) + "\n";
+ } );
+ return settings;
+}
+
+define string GetDiskspaceSettings() {
+ string settings = "";
+
+ foreach ( string key, diskspace_settings, {
+ settings = settings + key + ": " + AuditLaf::GetAuditdOption(key) + "\n";
+ } );
+
+ return settings;
+}
+
+define string GetDispatcherSettings() {
+ string settings = "";
+
+ foreach ( string key, dispatcher_settings, {
+ settings = settings + key + ": " + AuditLaf::GetAuditdOption(key) + "\n";
+ } );
+
+ return settings;
+}
+define boolean SettingsHandler (map options ) {
+
+ y2milestone ( "Command line options: %1", options );
+
+ foreach( string key, any val, options, ``{
+ string value = "";
+
+ if ( is( val, integer ) )
+ value = tostring(val);
+ else
+ value = (string)val;
+
+ if ( contains( logfile_settings, key ) ||
+ contains( diskspace_settings, key ) ||
+ contains( dispatcher_settings, key ) )
+ {
+ // option (key/value pair) can be written 'as is', e.g. log_format = RAW
+ AuditLaf::SetAuditdOption( key, value );
+ }
+ else if ( substring( key, size(key)-6 ) == "script" )
+ {
+ AuditLaf::SetAuditdOption( substring( key, 0, size(key)-6 ) + "action", // replace "script" by "action"
+ "EXEC " + value ); // EXEC <script>
+ }
+
+ });
+
+ return true; // call Write
+}
+
+/**
+ * Show information about settings
+ * @return boolean false
+ */
+define boolean ShowHandler (map options ) {
+
+ y2milestone( "Options:%1", options );
+ list<string> sets = [];
+
+ foreach ( string key, any val, options, ``{
+ if ( contains (["logfile","diskspace", "disp"], key) )
+ sets = add (sets, key);
+ });
+ if ( sets == [] )
+ CommandLine::Print ( "Please specify information ('logfile', 'diskpace' or 'disp')");
+
+ foreach ( string option, sets, {
+ if ( option == "logfile" )
+ {
+ CommandLine::Print( GetLogfileSettings() );
+ }
+ else if ( option == "diskspace" )
+ {
+ CommandLine::Print( GetDiskspaceSettings() );
+ }
+ else if ( option == "disp" )
+ {
+ CommandLine::Print( GetDispatcherSettings() );
+ }
+ else
+ CommandLine::Print ( "Unknown option" );
+ } );
+
+ return false; // do not call Write...
+}
+
+
+ } //EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-audit-laf-2.18.2/src/complex.ycp new/yast2-audit-laf-2.18.3/src/complex.ycp
--- old/yast2-audit-laf-2.18.2/src/complex.ycp 2009-02-03 10:34:24.000000000 +0100
+++ new/yast2-audit-laf-2.18.3/src/complex.ycp 2009-07-06 14:17:12.000000000 +0200
@@ -197,7 +197,7 @@
symbol HandleDispatcherDialog(string id, map event) {
any action = event["ID"]:nil;
- y2milestone( "HandleDiskspaceSettingsDialog got action: %1", action );
+ y2milestone( "HandleDispatcherDialog got action: %1", action );
if ( action == "select_disp" )
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-audit-laf-2.18.2/src/helps.ycp new/yast2-audit-laf-2.18.3/src/helps.ycp
--- old/yast2-audit-laf-2.18.2/src/helps.ycp 2008-11-06 12:53:01.000000000 +0100
+++ new/yast2-audit-laf-2.18.3/src/helps.ycp 2009-07-09 14:36:20.000000000 +0200
@@ -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>More information about rules and the possibility to add rules offers the dialog <b>Rules for auditctl</b>.
+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 */
+ _("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>: similiar
+to ROTATE, but log files aren't 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, <b>HOSTNAME</b>: name returned by the 'gethostname' syscall,
+<b>FQD</b>: 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>") +
+(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>
+ _("<p>The dialog also allows you to edit the rules manually, which is only recommended for advanced users.<br>
Detailed information about all options gives '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>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org