From: frank Date: Sun, 29 Jan 2012 10:54:28 +0000 (+0100) Subject: committing changes in /etc after emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=3417666f255d037bafc69a46bb0942a6344b4655;p=config%2Fuhu1%2Fetc.git committing changes in /etc after emerge run Package changes: +mail-filter/amavisd-new-2.7.0 --- diff --git a/.etckeeper b/.etckeeper index 3693434..8d53af8 100755 --- a/.etckeeper +++ b/.etckeeper @@ -48,6 +48,7 @@ maybe chmod 0755 './X11' maybe chmod 0755 './X11/xinit' maybe chmod 0755 './X11/xinit/xinitrc.d' maybe chmod 0755 './X11/xinit/xinitrc.d/80-dbus' +maybe chmod 0640 './amavisd.conf' maybe chmod 0755 './apache2' maybe chmod 0644 './apache2/httpd.conf' maybe chmod 0644 './apache2/magic' @@ -526,6 +527,7 @@ maybe chmod 0644 './idn.conf.sample' maybe chmod 0644 './idnalias.conf' maybe chmod 0644 './idnalias.conf.sample' maybe chmod 0755 './init.d' +maybe chmod 0755 './init.d/amavisd' maybe chmod 0755 './init.d/apache2' maybe chmod 0755 './init.d/atd' maybe chmod 0755 './init.d/auditd' @@ -734,6 +736,7 @@ maybe chmod 0644 './openldap/ldap.conf' maybe chmod 0644 './openldap/ldap.conf.default' maybe chmod 0755 './openldap/schema' maybe chmod 0444 './openldap/schema/README' +maybe chmod 0644 './openldap/schema/amavisd-new.schema' maybe chmod 0644 './openldap/schema/authldap.schema' maybe chmod 0444 './openldap/schema/collective.schema' maybe chmod 0444 './openldap/schema/corba.schema' diff --git a/amavisd.conf b/amavisd.conf new file mode 100644 index 0000000..7e6eb35 --- /dev/null +++ b/amavisd.conf @@ -0,0 +1,806 @@ +use strict; + +# a minimalistic configuration file for amavisd-new with all necessary settings +# +# see amavisd.conf-default for a list of all variables with their defaults; +# for more details see documentation in INSTALL, README_FILES/* +# and at http://www.ijs.si/software/amavisd/amavisd-new-docs.html + + +# COMMONLY ADJUSTED SETTINGS: + +# @bypass_virus_checks_maps = (1); # controls running of anti-virus code +# @bypass_spam_checks_maps = (1); # controls running of anti-spam code +# $bypass_decode_parts = 1; # controls running of decoders&dearchivers + +$max_servers = 2; # num of pre-forked children (2..30 is common), -m +$daemon_user = 'amavis'; # (no default; customary: vscan or amavis), -u +$daemon_group = 'amavis'; # (no default; customary: vscan or amavis), -g + +$mydomain = 'example.com'; # a convenient default for other settings + +# $MYHOME = '/var/amavis'; # a convenient default for other settings, -H +$TEMPBASE = "$MYHOME/tmp"; # working directory, needs to exist, -T +$ENV{TMPDIR} = $TEMPBASE; # environment variable TMPDIR, used by SA, etc. +$QUARANTINEDIR = "$MYHOME/quarantine"; # -Q +# $quarantine_subdir_levels = 1; # add level of subdirs to disperse quarantine +# $release_format = 'resend'; # 'attach', 'plain', 'resend' +# $report_format = 'arf'; # 'attach', 'plain', 'resend', 'arf' + +# $daemon_chroot_dir = $MYHOME; # chroot directory or undef, -R + +# $db_home = "$MYHOME/db"; # dir for bdb nanny/cache/snmp databases, -D +# $helpers_home = "$MYHOME/var"; # working directory for SpamAssassin, -S +# $lock_file = "$MYHOME/var/amavisd.lock"; # -L +# $pid_file = "$MYHOME/var/amavisd.pid"; # -P +#NOTE: create directories $MYHOME/tmp, $MYHOME/var, $MYHOME/db manually + +$log_level = 0; # verbosity 0..5, -d +$log_recip_templ = undef; # disable by-recipient level-0 log entries +$do_syslog = 1; # log via syslogd (preferred) +$syslog_facility = 'mail'; # Syslog facility as a string + # e.g.: mail, daemon, user, local0, ... local7 + +$enable_db = 1; # enable use of BerkeleyDB/libdb (SNMP and nanny) +$nanny_details_level = 2; # nanny verbosity: 1: traditional, 2: detailed +$enable_dkim_verification = 0; # enable DKIM signatures verification +$enable_dkim_signing = 0; # load DKIM signing code, keys defined by dkim_key + +@local_domains_maps = ( [".$mydomain"] ); # list of all local domains + +@mynetworks = qw( 127.0.0.0/8 [::1] [FE80::]/10 [FEC0::]/10 + 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 ); + +$unix_socketname = "$MYHOME/amavisd.sock"; # amavisd-release or amavis-milter + # option(s) -p overrides $inet_socket_port and $unix_socketname + +$inet_socket_port = 10024; # listen on this local TCP port(s) +# $inet_socket_port = [10024,10026]; # listen on multiple TCP ports + +$policy_bank{'MYNETS'} = { # mail originating from @mynetworks + originating => 1, # is true in MYNETS by default, but let's make it explicit + os_fingerprint_method => undef, # don't query p0f for internal clients +}; + +# it is up to MTA to re-route mail from authenticated roaming users or +# from internal hosts to a dedicated TCP port (such as 10026) for filtering +$interface_policy{'10026'} = 'ORIGINATING'; + +$policy_bank{'ORIGINATING'} = { # mail supposedly originating from our users + originating => 1, # declare that mail was submitted by our smtp client + allow_disclaimers => 1, # enables disclaimer insertion if available + # notify administrator of locally originating malware + virus_admin_maps => ["virusalert\@$mydomain"], + spam_admin_maps => ["virusalert\@$mydomain"], + warnbadhsender => 1, + # forward to a smtpd service providing DKIM signing service + forward_method => 'smtp:[127.0.0.1]:10027', + # force MTA conversion to 7-bit (e.g. before DKIM signing) + smtpd_discard_ehlo_keywords => ['8BITMIME'], + bypass_banned_checks_maps => [1], # allow sending any file names and types + terminate_dsn_on_notify_success => 0, # don't remove NOTIFY=SUCCESS option +}; + +$interface_policy{'SOCK'} = 'AM.PDP-SOCK'; # only applies with $unix_socketname + +# Use with amavis-release over a socket or with Petr Rehor's amavis-milter.c +# (with amavis-milter.c from this package or old amavis.c client use 'AM.CL'): +$policy_bank{'AM.PDP-SOCK'} = { + protocol => 'AM.PDP', + auth_required_release => 0, # do not require secret_id for amavisd-release +}; + +$sa_tag_level_deflt = 2.0; # add spam info headers if at, or above that level +$sa_tag2_level_deflt = 6.2; # add 'spam detected' headers at that level +$sa_kill_level_deflt = 6.9; # triggers spam evasive actions (e.g. blocks mail) +$sa_dsn_cutoff_level = 10; # spam level beyond which a DSN is not sent +$sa_crediblefrom_dsn_cutoff_level = 18; # likewise, but for a likely valid From +# $sa_quarantine_cutoff_level = 25; # spam level beyond which quarantine is off +$penpals_bonus_score = 8; # (no effect without a @storage_sql_dsn database) +$penpals_threshold_high = $sa_kill_level_deflt; # don't waste time on hi spam +$bounce_killer_score = 100; # spam score points to add for joe-jobbed bounces + +$sa_mail_body_size_limit = 400*1024; # don't waste time on SA if mail is larger +$sa_local_tests_only = 0; # only tests which do not require internet access? + +# @lookup_sql_dsn = +# ( ['DBI:mysql:database=mail;host=127.0.0.1;port=3306', 'user1', 'passwd1'], +# ['DBI:mysql:database=mail;host=host2', 'username2', 'password2'], +# ["DBI:SQLite:dbname=$MYHOME/sql/mail_prefs.sqlite", '', ''] ); +# @storage_sql_dsn = @lookup_sql_dsn; # none, same, or separate database + +# $timestamp_fmt_mysql = 1; # if using MySQL *and* msgs.time_iso is TIMESTAMP; +# defaults to 0, which is good for non-MySQL or if msgs.time_iso is CHAR(16) + +$virus_admin = "virusalert\@$mydomain"; # notifications recip. + +$mailfrom_notify_admin = "virusalert\@$mydomain"; # notifications sender +$mailfrom_notify_recip = "virusalert\@$mydomain"; # notifications sender +$mailfrom_notify_spamadmin = "spam.police\@$mydomain"; # notifications sender +$mailfrom_to_quarantine = ''; # null return path; uses original sender if undef + +@addr_extension_virus_maps = ('virus'); +@addr_extension_banned_maps = ('banned'); +@addr_extension_spam_maps = ('spam'); +@addr_extension_bad_header_maps = ('badh'); +# $recipient_delimiter = '+'; # undef disables address extensions altogether +# when enabling addr extensions do also Postfix/main.cf: recipient_delimiter=+ + +$path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin'; +# $dspam = 'dspam'; + +$MAXLEVELS = 14; +$MAXFILES = 1500; +$MIN_EXPANSION_QUOTA = 100*1024; # bytes (default undef, not enforced) +$MAX_EXPANSION_QUOTA = 300*1024*1024; # bytes (default undef, not enforced) + +$sa_spam_subject_tag = '***Spam*** '; +$defang_virus = 1; # MIME-wrap passed infected mail +$defang_banned = 1; # MIME-wrap passed mail containing banned name +# for defanging bad headers only turn on certain minor contents categories: +$defang_by_ccat{CC_BADH.",3"} = 1; # NUL or CR character in header +$defang_by_ccat{CC_BADH.",5"} = 1; # header line longer than 998 characters +$defang_by_ccat{CC_BADH.",6"} = 1; # header field syntax error + + +# OTHER MORE COMMON SETTINGS (defaults may suffice): + +# $myhostname = 'host.example.com'; # must be a fully-qualified domain name! + +# $notify_method = 'smtp:[127.0.0.1]:10025'; +# $forward_method = 'smtp:[127.0.0.1]:10025'; # set to undef with milter! + +# $final_virus_destiny = D_DISCARD; +# $final_banned_destiny = D_DISCARD; +# $final_spam_destiny = D_PASS; #!!! D_DISCARD / D_REJECT +# $final_bad_header_destiny = D_PASS; +# $bad_header_quarantine_method = undef; + +# $os_fingerprint_method = 'p0f:*:2345'; # to query p0f-analyzer.pl + +## hierarchy by which a final setting is chosen: +## policy bank (based on port or IP address) -> *_by_ccat +## *_by_ccat (based on mail contents) -> *_maps +## *_maps (based on recipient address) -> final configuration value + + +# SOME OTHER VARIABLES WORTH CONSIDERING (see amavisd.conf-default for all) + +# $warnbadhsender, +# $warnvirusrecip, $warnbannedrecip, $warnbadhrecip, (or @warn*recip_maps) +# +# @bypass_virus_checks_maps, @bypass_spam_checks_maps, +# @bypass_banned_checks_maps, @bypass_header_checks_maps, +# +# @virus_lovers_maps, @spam_lovers_maps, +# @banned_files_lovers_maps, @bad_header_lovers_maps, +# +# @blacklist_sender_maps, @score_sender_maps, +# +# $clean_quarantine_method, $virus_quarantine_to, $banned_quarantine_to, +# $bad_header_quarantine_to, $spam_quarantine_to, +# +# $defang_bad_header, $defang_undecipherable, $defang_spam + + +# REMAINING IMPORTANT VARIABLES ARE LISTED HERE BECAUSE OF LONGER ASSIGNMENTS + +@keep_decoded_original_maps = (new_RE( + qr'^MAIL$', # retain full original message for virus checking + qr'^MAIL-UNDECIPHERABLE$', # recheck full mail if it contains undecipherables + qr'^(ASCII(?! cpio)|text|uuencoded|xxencoded|binhex)'i, +# qr'^Zip archive data', # don't trust Archive::Zip +)); + + +$banned_filename_re = new_RE( + +### BLOCKED ANYWHERE +# qr'^UNDECIPHERABLE$', # is or contains any undecipherable components + qr'^\.(exe-ms|dll)$', # banned file(1) types, rudimentary +# qr'^\.(exe|lha|cab|dll)$', # banned file(1) types + +### BLOCK THE FOLLOWING, EXCEPT WITHIN UNIX ARCHIVES: +# [ qr'^\.(gz|bz2)$' => 0 ], # allow any in gzip or bzip2 + [ qr'^\.(rpm|cpio|tar)$' => 0 ], # allow any in Unix-type archives + + qr'.\.(pif|scr)$'i, # banned extensions - rudimentary +# qr'^\.zip$', # block zip type + +### BLOCK THE FOLLOWING, EXCEPT WITHIN ARCHIVES: +# [ qr'^\.(zip|rar|arc|arj|zoo)$'=> 0 ], # allow any within these archives + + qr'^application/x-msdownload$'i, # block these MIME types + qr'^application/x-msdos-program$'i, + qr'^application/hta$'i, + +# qr'^message/partial$'i, # rfc2046 MIME type +# qr'^message/external-body$'i, # rfc2046 MIME type + +# qr'^(application/x-msmetafile|image/x-wmf)$'i, # Windows Metafile MIME type +# qr'^\.wmf$', # Windows Metafile file(1) type + + # block certain double extensions in filenames + qr'^(?!cid:).*\.[^./]*[A-Za-z][^./]*\.\s*(exe|vbs|pif|scr|bat|cmd|com|cpl|dll)[.\s]*$'i, + +# qr'\{[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}\}?'i, # Class ID CLSID, strict +# qr'\{[0-9a-z]{4,}(-[0-9a-z]{4,}){0,7}\}?'i, # Class ID extension CLSID, loose + + qr'.\.(exe|vbs|pif|scr|cpl)$'i, # banned extension - basic +# qr'.\.(exe|vbs|pif|scr|cpl|bat|cmd|com)$'i, # banned extension - basic+cmd +# qr'.\.(ade|adp|app|bas|bat|chm|cmd|com|cpl|crt|emf|exe|fxp|grp|hlp|hta| +# inf|ini|ins|isp|js|jse|lib|lnk|mda|mdb|mde|mdt|mdw|mdz|msc|msi| +# msp|mst|ocx|ops|pcd|pif|prg|reg|scr|sct|shb|shs|sys|vb|vbe|vbs|vxd| +# wmf|wsc|wsf|wsh)$'ix, # banned extensions - long +# qr'.\.(asd|asf|asx|url|vcs|wmd|wmz)$'i, # consider also +# qr'.\.(ani|cur|ico)$'i, # banned cursors and icons filename +# qr'^\.ani$', # banned animated cursor file(1) type +# qr'.\.(mim|b64|bhx|hqx|xxe|uu|uue)$'i, # banned extension - WinZip vulnerab. +); +# See http://support.microsoft.com/default.aspx?scid=kb;EN-US;q262631 +# and http://www.cknow.com/vtutor/vtextensions.htm + + +# ENVELOPE SENDER SOFT-WHITELISTING / SOFT-BLACKLISTING + +@score_sender_maps = ({ # a by-recipient hash lookup table, + # results from all matching recipient tables are summed + +# ## per-recipient personal tables (NOTE: positive: black, negative: white) +# 'user1@example.com' => [{'bla-mobile.press@example.com' => 10.0}], +# 'user3@example.com' => [{'.ebay.com' => -3.0}], +# 'user4@example.com' => [{'cleargreen@cleargreen.com' => -7.0, +# '.cleargreen.com' => -5.0}], + + ## site-wide opinions about senders (the '.' matches any recipient) + '.' => [ # the _first_ matching sender determines the score boost + + new_RE( # regexp-type lookup table, just happens to be all soft-blacklist + [qr'^(bulkmail|offers|cheapbenefits|earnmoney|foryou)@'i => 5.0], + [qr'^(greatcasino|investments|lose_weight_today|market\.alert)@'i=> 5.0], + [qr'^(money2you|MyGreenCard|new\.tld\.registry|opt-out|opt-in)@'i=> 5.0], + [qr'^(optin|saveonlsmoking2002k|specialoffer|specialoffers)@'i => 5.0], + [qr'^(stockalert|stopsnoring|wantsome|workathome|yesitsfree)@'i => 5.0], + [qr'^(your_friend|greatoffers)@'i => 5.0], + [qr'^(inkjetplanet|marketopt|MakeMoney)\d*@'i => 5.0], + ), + +# read_hash("/var/amavis/sender_scores_sitewide"), + + { # a hash-type lookup table (associative array) + 'nobody@cert.org' => -3.0, + 'cert-advisory@us-cert.gov' => -3.0, + 'owner-alert@iss.net' => -3.0, + 'slashdot@slashdot.org' => -3.0, + 'securityfocus.com' => -3.0, + 'ntbugtraq@listserv.ntbugtraq.com' => -3.0, + 'security-alerts@linuxsecurity.com' => -3.0, + 'mailman-announce-admin@python.org' => -3.0, + 'amavis-user-admin@lists.sourceforge.net'=> -3.0, + 'amavis-user-bounces@lists.sourceforge.net' => -3.0, + 'spamassassin.apache.org' => -3.0, + 'notification-return@lists.sophos.com' => -3.0, + 'owner-postfix-users@postfix.org' => -3.0, + 'owner-postfix-announce@postfix.org' => -3.0, + 'owner-sendmail-announce@lists.sendmail.org' => -3.0, + 'sendmail-announce-request@lists.sendmail.org' => -3.0, + 'donotreply@sendmail.org' => -3.0, + 'ca+envelope@sendmail.org' => -3.0, + 'noreply@freshmeat.net' => -3.0, + 'owner-technews@postel.acm.org' => -3.0, + 'ietf-123-owner@loki.ietf.org' => -3.0, + 'cvs-commits-list-admin@gnome.org' => -3.0, + 'rt-users-admin@lists.fsck.com' => -3.0, + 'clp-request@comp.nus.edu.sg' => -3.0, + 'surveys-errors@lists.nua.ie' => -3.0, + 'emailnews@genomeweb.com' => -5.0, + 'yahoo-dev-null@yahoo-inc.com' => -3.0, + 'returns.groups.yahoo.com' => -3.0, + 'clusternews@linuxnetworx.com' => -3.0, + lc('lvs-users-admin@LinuxVirtualServer.org') => -3.0, + lc('owner-textbreakingnews@CNNIMAIL12.CNN.COM') => -5.0, + + # soft-blacklisting (positive score) + 'sender@example.net' => 3.0, + '.example.net' => 1.0, + + }, + ], # end of site-wide tables +}); + + +@decoders = ( + ['mail', \&do_mime_decode], +# ['asc', \&do_ascii], +# ['uue', \&do_ascii], +# ['hqx', \&do_ascii], +# ['ync', \&do_ascii], + ['F', \&do_uncompress, ['unfreeze','freeze -d','melt','fcat'] ], + ['Z', \&do_uncompress, ['uncompress','gzip -d','zcat'] ], + ['gz', \&do_uncompress, 'gzip -d'], + ['gz', \&do_gunzip], + ['bz2', \&do_uncompress, 'bzip2 -d'], + ['xz', \&Amavis::Unpackers::do_uncompress, + ['xzdec'. 'xz -dc', 'unxz -c', 'xzcat'] ], + ['lzma', \&Amavis::Unpackers::do_uncompress, + ['lzmadec', 'xz -dc --format=lzma', + 'lzma -dc', 'unlzma -c', 'lzcat', 'lzmadec'] ], + ['lzo', \&do_uncompress, 'lzop -d'], + ['rpm', \&do_uncompress, ['rpm2cpio.pl','rpm2cpio'] ], + ['cpio', \&do_pax_cpio, ['pax','gcpio','cpio'] ], + ['tar', \&do_pax_cpio, ['pax','gcpio','cpio'] ], + ['deb', \&do_ar, 'ar'], +# ['a', \&do_ar, 'ar'], # unpacking .a seems an overkill + ['zip', \&do_unzip], + ['7z', \&do_7zip, ['7zr','7za','7z'] ], + ['rar', \&do_unrar, ['rar','unrar'] ], + ['arj', \&do_unarj, ['arj','unarj'] ], + ['arc', \&do_arc, ['nomarch','arc'] ], + ['zoo', \&do_zoo, ['zoo','unzoo'] ], + ['lha', \&do_lha, 'lha'], +# ['doc', \&do_ole, 'ripole'], + ['cab', \&do_cabextract, 'cabextract'], + ['tnef', \&do_tnef_ext, 'tnef'], + ['tnef', \&do_tnef], +# ['sit', \&do_unstuff, 'unstuff'], # broken/unsafe decoder + ['exe', \&do_executable, ['rar','unrar'], 'lha', ['arj','unarj'] ], +); + + +@av_scanners = ( + +# ### http://www.sophos.com/ +# ['Sophos-SSSP', +# \&ask_daemon, ["{}", 'sssp:/var/run/savdi/sssp.sock'], +# # or: ["{}", 'sssp:[127.0.0.1]:4010'], +# qr/^DONE OK\b/m, qr/^VIRUS\b/m, qr/^VIRUS\s*(\S*)/m ], + +# ### http://www.clanfield.info/sophie/ (http://www.vanja.com/tools/sophie/) +# ['Sophie', +# \&ask_daemon, ["{}/\n", 'sophie:/var/run/sophie'], +# qr/(?x)^ 0+ ( : | [\000\r\n]* $)/, qr/(?x)^ 1 ( : | [\000\r\n]* $)/, +# qr/(?x)^ [-+]? \d+ : (.*?) [\000\r\n]* $/m ], + +# ### http://www.csupomona.edu/~henson/www/projects/SAVI-Perl/ +# ['Sophos SAVI', \&ask_daemon, ['{}','savi-perl:'] ], + +# ['Avira SAVAPI', +# \&ask_daemon, ["*", 'savapi:/var/tmp/.savapi3', 'product-id'], +# qr/^(200|210)/m, qr/^(310|420|319)/m, +# qr/^(?:310|420)[,\s]*(?:.* <<< )?(.+?)(?: ; |$)/m +# settings for the SAVAPI3.conf: ArchiveScan=1, HeurLevel=2, MailboxScan=1 + +# ### http://www.clamav.net/ +# ['ClamAV-clamd', +# \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"], +# qr/\bOK$/m, qr/\bFOUND$/m, +# qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ], +# # NOTE: run clamd under the same user as amavisd, or run it under its own +# # uid such as clamav, add user clamav to the amavis group, and then add +# # AllowSupplementaryGroups to clamd.conf; +# # NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in +# # this entry; when running chrooted one may prefer socket "$MYHOME/clamd". + +# ### http://www.clamav.net/ and CPAN (memory-hungry! clamd is preferred) +# # note that Mail::ClamAV requires perl to be build with threading! +# ['Mail::ClamAV', \&ask_daemon, ['{}','clamav-perl:'], +# [0], [1], qr/^INFECTED: (.+)/m], + +# ### http://www.openantivirus.org/ +# ['OpenAntiVirus ScannerDaemon (OAV)', +# \&ask_daemon, ["SCAN {}\n", '127.0.0.1:8127'], +# qr/^OK/m, qr/^FOUND: /m, qr/^FOUND: (.+)/m ], + +# ### http://www.vanja.com/tools/trophie/ +# ['Trophie', +# \&ask_daemon, ["{}/\n", 'trophie:/var/run/trophie'], +# qr/(?x)^ 0+ ( : | [\000\r\n]* $)/m, qr/(?x)^ 1 ( : | [\000\r\n]* $)/m, +# qr/(?x)^ [-+]? \d+ : (.*?) [\000\r\n]* $/m ], + +# ### http://www.grisoft.com/ +# ['AVG Anti-Virus', +# \&ask_daemon, ["SCAN {}\n", '127.0.0.1:55555'], +# qr/^200/m, qr/^403/m, qr/^403 .*?: ([^\r\n]+)/m ], + +# ### http://www.f-prot.com/ +# ['F-Prot fpscand', # F-PROT Antivirus for BSD/Linux/Solaris, version 6 +# \&ask_daemon, +# ["SCAN FILE {}/*\n", '127.0.0.1:10200'], +# qr/^(0|8|64) /m, +# qr/^([1235679]|1[01345]) |<[^>:]*(?i)(infected|suspicious|unwanted)/m, +# qr/(?i)<[^>:]*(?:infected|suspicious|unwanted)[^>:]*: ([^>]*)>/m ], + +# ### http://www.f-prot.com/ +# ['F-Prot f-protd', # old version +# \&ask_daemon, +# ["GET {}/*?-dumb%20-archive%20-packed HTTP/1.0\r\n\r\n", +# ['127.0.0.1:10200', '127.0.0.1:10201', '127.0.0.1:10202', +# '127.0.0.1:10203', '127.0.0.1:10204'] ], +# qr/(?i)]*>clean<\/summary>/m, +# qr/(?i)]*>infected<\/summary>/m, +# qr/(?i)(.+)<\/name>/m ], + +# ### http://www.sald.com/, http://www.dials.ru/english/, http://www.drweb.ru/ +# ['DrWebD', \&ask_daemon, # DrWebD 4.31 or later +# [pack('N',1). # DRWEBD_SCAN_CMD +# pack('N',0x00280001). # DONT_CHANGEMAIL, IS_MAIL, RETURN_VIRUSES +# pack('N', # path length +# length("$TEMPBASE/amavis-yyyymmddTHHMMSS-xxxxx/parts/pxxx")). +# '{}/*'. # path +# pack('N',0). # content size +# pack('N',0), +# '/var/drweb/run/drwebd.sock', +# # '/var/amavis/var/run/drwebd.sock', # suitable for chroot +# # '/usr/local/drweb/run/drwebd.sock', # FreeBSD drweb ports default +# # '127.0.0.1:3000', # or over an inet socket +# ], +# qr/\A\x00[\x10\x11][\x00\x10]\x00/sm, # IS_CLEAN,EVAL_KEY; SKIPPED +# qr/\A\x00[\x00\x01][\x00\x10][\x20\x40\x80]/sm,# KNOWN_V,UNKNOWN_V,V._MODIF +# qr/\A.{12}(?:infected with )?([^\x00]+)\x00/sm, +# ], +# # NOTE: If using amavis-milter, change length to: +# # length("$TEMPBASE/amavis-milter-xxxxxxxxxxxxxx/parts/pxxx"). + + ### http://www.kaspersky.com/ (kav4mailservers) + ['KasperskyLab AVP - aveclient', + ['/usr/local/kav/bin/aveclient','/usr/local/share/kav/bin/aveclient', + '/opt/kav/5.5/kav4mailservers/bin/aveclient','aveclient'], + '-p /var/run/aveserver -s {}/*', + [0,3,6,8], qr/\b(INFECTED|SUSPICION|SUSPICIOUS)\b/m, + qr/(?:INFECTED|WARNING|SUSPICION|SUSPICIOUS) (.+)/m, + ], + # NOTE: one may prefer [0],[2,3,4,5], depending on how suspicious, + # currupted or protected archives are to be handled + + ### http://www.kaspersky.com/ + ['KasperskyLab AntiViral Toolkit Pro (AVP)', ['avp'], + '-* -P -B -Y -O- {}', [0,3,6,8], [2,4], # any use for -A -K ? + qr/infected: (.+)/m, + sub {chdir('/opt/AVP') or die "Can't chdir to AVP: $!"}, + sub {chdir($TEMPBASE) or die "Can't chdir back to $TEMPBASE $!"}, + ], + + ### The kavdaemon and AVPDaemonClient have been removed from Kasperky + ### products and replaced by aveserver and aveclient + ['KasperskyLab AVPDaemonClient', + [ '/opt/AVP/kavdaemon', 'kavdaemon', + '/opt/AVP/AvpDaemonClient', 'AvpDaemonClient', + '/opt/AVP/AvpTeamDream', 'AvpTeamDream', + '/opt/AVP/avpdc', 'avpdc' ], + "-f=$TEMPBASE {}", [0,8], [3,4,5,6], qr/infected: ([^\r\n]+)/m ], + # change the startup-script in /etc/init.d/kavd to: + # DPARMS="-* -Y -dl -f=/var/amavis /var/amavis" + # (or perhaps: DPARMS="-I0 -Y -* /var/amavis" ) + # adjusting /var/amavis above to match your $TEMPBASE. + # The '-f=/var/amavis' is needed if not running it as root, so it + # can find, read, and write its pid file, etc., see 'man kavdaemon'. + # defUnix.prf: there must be an entry "*/var/amavis" (or whatever + # directory $TEMPBASE specifies) in the 'Names=' section. + # cd /opt/AVP/DaemonClients; configure; cd Sample; make + # cp AvpDaemonClient /opt/AVP/ + # su - amavis -c "${PREFIX}/kavdaemon ${DPARMS}" + + ### http://www.centralcommand.com/ + ['CentralCommand Vexira (new) vascan', + ['vascan','/usr/lib/Vexira/vascan'], + "-a s --timeout=60 --temp=$TEMPBASE -y $QUARANTINEDIR ". + "--log=/var/log/vascan.log {}", + [0,3], [1,2,5], + qr/(?x)^\s* (?:virus|iworm|macro|mutant|sequence|trojan)\ found:\ ( [^\]\s']+ )\ \.\.\.\ /m ], + # Adjust the path of the binary and the virus database as needed. + # 'vascan' does not allow to have the temp directory to be the same as + # the quarantine directory, and the quarantine option can not be disabled. + # If $QUARANTINEDIR is not used, then another directory must be specified + # to appease 'vascan'. Move status 3 to the second list if password + # protected files are to be considered infected. + + ### http://www.avira.com/ + ### old Avira AntiVir 2.x (ex H+BEDV) or old CentralCommand Vexira Antivirus + ['Avira AntiVir', ['antivir','vexira'], + '--allfiles -noboot -nombr -rs -s -z {}', [0], qr/ALERT:|VIRUS:/m, + qr/(?x)^\s* (?: ALERT: \s* (?: \[ | [^']* ' ) | + (?i) VIRUS:\ .*?\ virus\ '?) ( [^\]\s']+ )/m ], + # NOTE: if you only have a demo version, remove -z and add 214, as in: + # '--allfiles -noboot -nombr -rs -s {}', [0,214], qr/ALERT:|VIRUS:/, + + ### http://www.avira.com/ + ### Avira for UNIX 3.x + ['Avira AntiVir', ['avscan'], + '-s --batch --alert-action=none {}', [0,4], qr/(?:ALERT|FUND):/m, + qr/(?:ALERT|FUND): (?:.* <<< )?(.+?)(?: ; |$)/m ], + + ### http://www.commandsoftware.com/ + ['Command AntiVirus for Linux', 'csav', + '-all -archive -packed {}', [50], [51,52,53], + qr/Infection: (.+)/m ], + + ### http://www.symantec.com/ + ['Symantec CarrierScan via Symantec CommandLineScanner', + 'cscmdline', '-a scan -i 1 -v -s 127.0.0.1:7777 {}', + qr/^Files Infected:\s+0$/m, qr/^Infected\b/m, + qr/^(?:Info|Virus Name):\s+(.+)/m ], + + ### http://www.symantec.com/ + ['Symantec AntiVirus Scan Engine', + 'savsecls', '-server 127.0.0.1:7777 -mode scanrepair -details -verbose {}', + [0], qr/^Infected\b/m, + qr/^(?:Info|Virus Name):\s+(.+)/m ], + # NOTE: check options and patterns to see which entry better applies + +# ### http://www.f-secure.com/products/anti-virus/ version 4.65 +# ['F-Secure Antivirus for Linux servers', +# ['/opt/f-secure/fsav/bin/fsav', 'fsav'], +# '--delete=no --disinf=no --rename=no --archive=yes --auto=yes '. +# '--dumb=yes --list=no --mime=yes {}', [0], [3,6,8], +# qr/(?:infection|Infected|Suspected): (.+)/m ], + + ### http://www.f-secure.com/products/anti-virus/ version 5.52 + ['F-Secure Antivirus for Linux servers', + ['/opt/f-secure/fsav/bin/fsav', 'fsav'], + '--virus-action1=report --archive=yes --auto=yes '. + '--dumb=yes --list=no --mime=yes {}', [0], [3,4,6,8], + qr/(?:infection|Infected|Suspected|Riskware): (.+)/m ], + # NOTE: internal archive handling may be switched off by '--archive=no' + # to prevent fsav from exiting with status 9 on broken archives + +# ### http://www.avast.com/ +# ['avast! Antivirus daemon', +# \&ask_daemon, # greets with 220, terminate with QUIT +# ["SCAN {}\015\012QUIT\015\012", '/var/run/avast4/mailscanner.sock'], +# qr/\t\[\+\]/m, qr/\t\[L\]\t/m, qr/\t\[L\]\t([^[ \t\015\012]+)/m ], + +# ### http://www.avast.com/ +# ['avast! Antivirus - Client/Server Version', 'avastlite', +# '-a /var/run/avast4/mailscanner.sock -n {}', [0], [1], +# qr/\t\[L\]\t([^[ \t\015\012]+)/m ], + + ['CAI InoculateIT', 'inocucmd', # retired product + '-sec -nex {}', [0], [100], + qr/was infected by virus (.+)/m ], + # see: http://www.flatmtn.com/computer/Linux-Antivirus_CAI.html + + ### http://www3.ca.com/Solutions/Product.asp?ID=156 (ex InoculateIT) + ['CAI eTrust Antivirus', 'etrust-wrapper', + '-arc -nex -spm h {}', [0], [101], + qr/is infected by virus: (.+)/m ], + # NOTE: requires suid wrapper around inocmd32; consider flag: -mod reviewer + # see http://marc.theaimsgroup.com/?l=amavis-user&m=109229779912783 + + ### http://mks.com.pl/english.html + ['MkS_Vir for Linux (beta)', ['mks32','mks'], + '-s {}/*', [0], [1,2], + qr/--[ \t]*(.+)/m ], + + ### http://mks.com.pl/english.html + ['MkS_Vir daemon', 'mksscan', + '-s -q {}', [0], [1..7], + qr/^... (\S+)/m ], + +# ### http://www.nod32.com/, version v2.52 (old) +# ['ESET NOD32 for Linux Mail servers', +# ['/opt/eset/nod32/bin/nod32cli', 'nod32cli'], +# '--subdir --files -z --sfx --rtp --adware --unsafe --pattern --heur '. +# '-w -a --action-on-infected=accept --action-on-uncleanable=accept '. +# '--action-on-notscanned=accept {}', +# [0,3], [1,2], qr/virus="([^"]+)"/m ], + +# ### http://www.eset.com/, version v2.7 (old) +# ['ESET NOD32 Linux Mail Server - command line interface', +# ['/usr/bin/nod32cli', '/opt/eset/nod32/bin/nod32cli', 'nod32cli'], +# '--subdir {}', [0,3], [1,2], qr/virus="([^"]+)"/m ], + +# ### http://www.eset.com/, version 2.71.12 +# ['ESET Software ESETS Command Line Interface', +# ['/usr/bin/esets_cli', 'esets_cli'], +# '--subdir {}', [0], [1,2,3], qr/virus="([^"]+)"/m ], + + ### http://www.eset.com/, version 3.0 + ['ESET Software ESETS Command Line Interface', + ['/usr/bin/esets_cli', 'esets_cli'], + '--subdir {}', [0], [1,2,3], + qr/:\s*action="(?!accepted)[^"]*"\n.*:\s*virus="([^"]*)"/m ], + + ## http://www.nod32.com/, NOD32LFS version 2.5 and above + ['ESET NOD32 for Linux File servers', + ['/opt/eset/nod32/sbin/nod32','nod32'], + '--files -z --mail --sfx --rtp --adware --unsafe --pattern --heur '. + '-w -a --action=1 -b {}', + [0], [1,10], qr/^object=.*, virus="(.*?)",/m ], + +# Experimental, based on posting from Rado Dibarbora (Dibo) on 2002-05-31 +# ['ESET Software NOD32 Client/Server (NOD32SS)', +# \&ask_daemon2, # greets with 200, persistent, terminate with QUIT +# ["SCAN {}/*\r\n", '127.0.0.1:8448' ], +# qr/^200 File OK/m, qr/^201 /m, qr/^201 (.+)/m ], + + ### http://www.norman.com/products_nvc.shtml + ['Norman Virus Control v5 / Linux', 'nvcc', + '-c -l:0 -s -u -temp:$TEMPBASE {}', [0,10,11], [1,2,14], + qr/(?i).* virus in .* -> \'(.+)\'/m ], + + ### http://www.pandasoftware.com/ + ['Panda CommandLineSecure 9 for Linux', + ['/opt/pavcl/usr/bin/pavcl','pavcl'], + '-auto -aex -heu -cmp -nbr -nor -nos -eng -nob {}', + qr/Number of files infected[ .]*: 0+(?!\d)/m, + qr/Number of files infected[ .]*: 0*[1-9]/m, + qr/Found virus :\s*(\S+)/m ], + # NOTE: for efficiency, start the Panda in resident mode with 'pavcl -tsr' + # before starting amavisd - the bases are then loaded only once at startup. + # To reload bases in a signature update script: + # /opt/pavcl/usr/bin/pavcl -tsr -ulr; /opt/pavcl/usr/bin/pavcl -tsr + # Please review other options of pavcl, for example: + # -nomalw, -nojoke, -nodial, -nohackt, -nospyw, -nocookies + +# ### http://www.pandasoftware.com/ +# ['Panda Antivirus for Linux', ['pavcl'], +# '-TSR -aut -aex -heu -cmp -nbr -nor -nso -eng {}', +# [0], [0x10, 0x30, 0x50, 0x70, 0x90, 0xB0, 0xD0, 0xF0], +# qr/Found virus :\s*(\S+)/m ], + +# GeCAD AV technology is acquired by Microsoft; RAV has been discontinued. +# Check your RAV license terms before fiddling with the following two lines! +# ['GeCAD RAV AntiVirus 8', 'ravav', +# '--all --archive --mail {}', [1], [2,3,4,5], qr/Infected: (.+)/m ], +# # NOTE: the command line switches changed with scan engine 8.5 ! +# # (btw, assigning stdin to /dev/null causes RAV to fail) + + ### http://www.nai.com/ + ['NAI McAfee AntiVirus (uvscan)', 'uvscan', + '--secure -rv --mime --summary --noboot - {}', [0], [13], + qr/(?x) Found (?: + \ the\ (.+)\ (?:virus|trojan) | + \ (?:virus|trojan)\ or\ variant\ ([^ ]+) | + :\ (.+)\ NOT\ a\ virus)/m, + # sub {$ENV{LD_PRELOAD}='/lib/libc.so.6'}, + # sub {delete $ENV{LD_PRELOAD}}, + ], + # NOTE1: with RH9: force the dynamic linker to look at /lib/libc.so.6 before + # anything else by setting environment variable LD_PRELOAD=/lib/libc.so.6 + # and then clear it when finished to avoid confusing anything else. + # NOTE2: to treat encrypted files as viruses replace the [13] with: + # qr/^\s{5,}(Found|is password-protected|.*(virus|trojan))/ + + ### http://www.virusbuster.hu/en/ + ['VirusBuster', ['vbuster', 'vbengcl'], + "{} -ss -i '*' -log=$MYHOME/vbuster.log", [0], [1], + qr/: '(.*)' - Virus/m ], + # VirusBuster Ltd. does not support the daemon version for the workstation + # engine (vbuster-eng-1.12-linux-i386-libc6.tgz) any longer. The names of + # binaries, some parameters AND return codes have changed (from 3 to 1). + # See also the new Vexira entry 'vascan' which is possibly related. + +# ### http://www.virusbuster.hu/en/ +# ['VirusBuster (Client + Daemon)', 'vbengd', +# '-f -log scandir {}', [0], [3], +# qr/Virus found = (.*);/m ], +# # HINT: for an infected file it always returns 3, +# # although the man-page tells a different story + + ### http://www.cyber.com/ + ['CyberSoft VFind', 'vfind', + '--vexit {}/*', [0], [23], qr/##==>>>> VIRUS ID: CVDL (.+)/m, + # sub {$ENV{VSTK_HOME}='/usr/lib/vstk'}, + ], + + ### http://www.avast.com/ + ['avast! Antivirus', ['/usr/bin/avastcmd','avastcmd'], + '-a -i -n -t=A {}', [0], [1], qr/\binfected by:\s+([^ \t\n\[\]]+)/m ], + + ### http://www.ikarus-software.com/ + ['Ikarus AntiVirus for Linux', 'ikarus', + '{}', [0], [40], qr/Signature (.+) found/m ], + + ### http://www.bitdefender.com/ + ['BitDefender', 'bdscan', # new version + '--action=ignore --no-list {}', qr/^Infected files\s*:\s*0+(?!\d)/m, + qr/^(?:Infected files|Identified viruses|Suspect files)\s*:\s*0*[1-9]/m, + qr/(?:suspected|infected)\s*:\s*(.*)(?:\033|$)/m ], + + ### http://www.bitdefender.com/ + ['BitDefender', 'bdc', # old version + '--arc --mail {}', qr/^Infected files *:0+(?!\d)/m, + qr/^(?:Infected files|Identified viruses|Suspect files) *:0*[1-9]/m, + qr/(?:suspected|infected): (.*)(?:\033|$)/m ], + # consider also: --all --nowarn --alev=15 --flev=15. The --all argument may + # not apply to your version of bdc, check documentation and see 'bdc --help' + + ### ArcaVir for Linux and Unix http://www.arcabit.pl/ + ['ArcaVir for Linux', ['arcacmd','arcacmd.static'], + '-v 1 -summary 0 -s {}', [0], [1,2], + qr/(?:VIR|WIR):[ \t]*(.+)/m ], + +# ### a generic SMTP-client interface to a SMTP-based virus scanner +# ['av_smtp', \&ask_av_smtp, +# ['{}', 'smtp:[127.0.0.1]:5525', 'dummy@localhost'], +# qr/^2/, qr/^5/, qr/^\s*(.*?)\s*$/m ], + +# ['File::Scan', sub {Amavis::AV::ask_av(sub{ +# use File::Scan; my($fn)=@_; +# my($f)=File::Scan->new(max_txt_size=>0, max_bin_size=>0); +# my($vname) = $f->scan($fn); +# $f->error ? (2,"Error: ".$f->error) +# : ($vname ne '') ? (1,"$vname FOUND") : (0,"Clean")}, @_) }, +# ["{}/*"], [0], [1], qr/^(.*) FOUND$/m ], + +# ### fully-fledged checker for JPEG marker segments of invalid length +# ['check-jpeg', +# sub { use JpegTester (); Amavis::AV::ask_av(\&JpegTester::test_jpeg, @_) }, +# ["{}/*"], undef, [1], qr/^(bad jpeg: .*)$/m ], +# # NOTE: place file JpegTester.pm somewhere where Perl can find it, +# # for example in /usr/local/lib/perl5/site_perl + +); + + +@av_scanners_backup = ( + + ### http://www.clamav.net/ - backs up clamd or Mail::ClamAV + ['ClamAV-clamscan', 'clamscan', + "--stdout --no-summary -r --tempdir=$TEMPBASE {}", + [0], qr/:.*\sFOUND$/m, qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ], + +# ### http://www.clamav.net/ - using remote clamd scanner as a backup +# ['ClamAV-clamdscan', 'clamdscan', +# "--stdout --no-summary --config-file=/etc/clamd-client.conf {}", +# [0], qr/:.*\sFOUND$/m, qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ], + +# ['ClamAV-clamd-stream', +# \&ask_daemon, ["*", 'clamd:/var/run/clamav/clamd'], +# qr/\bOK$/m, qr/\bFOUND$/m, +# qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ], + + ### http://www.f-prot.com/ - backs up F-Prot Daemon, V6 + ['F-PROT Antivirus for UNIX', ['fpscan'], + '--report --mount --adware {}', # consider: --applications -s 4 -u 3 -z 10 + [0,8,64], [1,2,3, 4+1,4+2,4+3, 8+1,8+2,8+3, 12+1,12+2,12+3], + qr/^\[Found\s+[^\]]*\]\s+<([^ \t(>]*)/m ], + + ### http://www.f-prot.com/ - backs up F-Prot Daemon (old) + ['FRISK F-Prot Antivirus', ['f-prot','f-prot.sh'], + '-dumb -archive -packed {}', [0,8], [3,6], # or: [0], [3,6,8], + qr/(?:Infection:|security risk named) (.+)|\s+contains\s+(.+)$/m ], + + ### http://www.trendmicro.com/ - backs up Trophie + ['Trend Micro FileScanner', ['/etc/iscan/vscan','vscan'], + '-za -a {}', [0], qr/Found virus/m, qr/Found virus (.+) in/m ], + + ### http://www.sald.com/, http://drweb.imshop.de/ - backs up DrWebD + ['drweb - DrWeb Antivirus', # security LHA hole in Dr.Web 4.33 and earlier + ['/usr/local/drweb/drweb', '/opt/drweb/drweb', 'drweb'], + '-path={} -al -go -ot -cn -upn -ok-', + [0,32], [1,9,33], qr' infected (?:with|by)(?: virus)? (.*)$'m ], + + ### http://www.kaspersky.com/ + ['Kaspersky Antivirus v5.5', + ['/opt/kaspersky/kav4fs/bin/kav4fs-kavscanner', + '/opt/kav/5.5/kav4unix/bin/kavscanner', + '/opt/kav/5.5/kav4mailservers/bin/kavscanner', 'kavscanner'], + '-i0 -xn -xp -mn -R -ePASBME {}/*', [0,10,15], [5,20,21,25], + qr/(?:INFECTED|WARNING|SUSPICION|SUSPICIOUS) (.*)/m, +# sub {chdir('/opt/kav/bin') or die "Can't chdir to kav: $!"}, +# sub {chdir($TEMPBASE) or die "Can't chdir back to $TEMPBASE $!"}, + ], + +# Commented out because the name 'sweep' clashes with Debian and FreeBSD +# package/port of an audio editor. Make sure the correct 'sweep' is found +# in the path when enabling. +# +# ### http://www.sophos.com/ - backs up Sophie or SAVI-Perl +# ['Sophos Anti Virus (sweep)', 'sweep', +# '-nb -f -all -rec -ss -sc -archive -cab -mime -oe -tnef '. +# '--no-reset-atime {}', +# [0,2], qr/Virus .*? found/m, +# qr/^>>> Virus(?: fragment)? '?(.*?)'? found/m, +# ], +# # other options to consider: -idedir=/usr/local/sav + +# Always succeeds and considers mail clean. +# Potentially useful when all other scanners fail and it is desirable +# to let mail continue to flow with no virus checking (when uncommented). +# ['always-clean', sub {0}], + +); + + +1; # insure a defined return value diff --git a/group b/group index aab40df..28878f9 100644 --- a/group +++ b/group @@ -49,3 +49,4 @@ postgrey:x:999: postfix:x:207: postdrop:x:208: polw:x:998: +amavis:x:997: diff --git a/group- b/group- index e0729d2..aab40df 100644 --- a/group- +++ b/group- @@ -48,3 +48,4 @@ openvpn:x:101: postgrey:x:999: postfix:x:207: postdrop:x:208: +polw:x:998: diff --git a/gshadow b/gshadow index d403b11..b430050 100644 --- a/gshadow +++ b/gshadow @@ -49,3 +49,4 @@ postgrey:!:: postfix:!:: postdrop:!:: polw:!:: +amavis:!:: diff --git a/gshadow- b/gshadow- index 4d0a571..d403b11 100644 --- a/gshadow- +++ b/gshadow- @@ -48,3 +48,4 @@ openvpn:!:: postgrey:!:: postfix:!:: postdrop:!:: +polw:!:: diff --git a/init.d/amavisd b/init.d/amavisd new file mode 100755 index 0000000..ce3a447 --- /dev/null +++ b/init.d/amavisd @@ -0,0 +1,54 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd,v 1.4 2012/01/10 13:46:47 eras Exp $ + +extra_started_commands="reload" +extra_commands="debug debug_sa" + +prog="/usr/sbin/amavisd" +progname="amavisd-new" + +depend() { + need net + use logger antivirus snmpd + before mta +} + +start() { + ebegin "Starting ${progname}" + "${prog}" start + eend $? +} + +stop() { + ebegin "Stopping ${progname}" + "${prog}" stop 2>/dev/null + eend $? +} + +reload() { + ebegin "Reloading ${progname}" + "${prog}" reload 2>/dev/null + eend $? +} + +restart() { + ebegin "Restarting ${progname}" + svc_stop + sleep 3 + svc_start + eend $? +} + +debug() { + ebegin "Starting ${progname} in debug mode" + "${prog}" debug + eend $? +} + +debug_sa() { + ebegin "Starting ${progname} in debug-sa mode" + "${prog}" debug-sa + eend $? +} diff --git a/openldap/schema/amavisd-new.schema b/openldap/schema/amavisd-new.schema new file mode 100644 index 0000000..4d97d3c --- /dev/null +++ b/openldap/schema/amavisd-new.schema @@ -0,0 +1,931 @@ +#-------------------------------------------------------------------------- +# LDAP Schema for amavisd-new Jacques Supcik, PhD +#----------------------------- IP-Plus Internet Services +# Release 1.2.2 Swisscom Enterprise Solutions Ltd +# 30 May 2004 3050 Bern - Switzerland +#-------------------------------------------------------------------------- +# Copyright (c) 2004 Jacques Supcik, Swisscom Enterprise Solutions Ltd. +# Permission is granted to copy, distribute and/or modify this document +# under the terms of the GNU Free Documentation License, Version 1.2 +# or any later version published by the Free Software Foundation; +# with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. +# A copy of the license is included in the section entitled "GNU +# Free Documentation License". +#-------------------------------------------------------------------------- +# Changes made to LDAP Schema to make it import and play nicely with +# Novell NDS - Michael Tracey, SONOPRESS USA, LLC April 07 2005 +# ( uncomment each dn:, changetype:, add:, add X-NDS-NAME attribute, replace +# "attributetype" by "attributetypes:" and "objectclasse" by "objectclasses:" +# (plural,colon), and unwrap each attributetypes: and objectclasses: ) +#-------------------------------------------------------------------------- +# 1.3.6.1.4.1.15312 Jozef Stefan Institute's OID +# 1.3.6.1.4.1.15312.2 amavisd-new +# 1.3.6.1.4.1.15312.2.2 amavisd-new LDAP Elements +# 1.3.6.1.4.1.15312.2.2.1 AttributeTypes +# 1.3.6.1.4.1.15312.2.2.2 ObjectClasses +# 1.3.6.1.4.1.15312.2.2.3 Syntax Definitions +#-------------------------------------------------------------------------- + +# Attribute Types +#----------------- + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.1 + NAME 'amavisVirusLover' + DESC 'Virus Lover' + EQUALITY booleanMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.2 + NAME 'amavisBannedFilesLover' + DESC 'Banned Files Lover' + EQUALITY booleanMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.3 + NAME 'amavisBypassVirusChecks' + DESC 'Bypass Virus Check' + EQUALITY booleanMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.4 + NAME 'amavisBypassSpamChecks' + DESC 'Bypass Spam Check' + EQUALITY booleanMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.5 + NAME 'amavisSpamTagLevel' + DESC 'Spam Tag Level' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.6 + NAME 'amavisSpamTag2Level' + DESC 'Spam Tag2 Level' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.7 + NAME 'amavisSpamKillLevel' + DESC 'Spam Kill Level' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.8 + NAME 'amavisSpamModifiesSubj' + DESC 'Modifies Subject on spam - no longer in use since 2.7.0' + EQUALITY booleanMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.9 + NAME 'amavisWhitelistSender' + DESC 'White List Sender' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.10 + NAME 'amavisBlacklistSender' + DESC 'Black List Sender' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.11 + NAME 'amavisSpamQuarantineTo' + DESC 'Spam Quarantine to' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.12 + NAME 'amavisSpamLover' + DESC 'Spam Lover' + EQUALITY booleanMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.13 + NAME 'amavisBadHeaderLover' + DESC 'Bad Header Lover' + EQUALITY booleanMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.14 + NAME 'amavisBypassBannedChecks' + DESC 'Bypass Banned Files Check' + EQUALITY booleanMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.15 + NAME 'amavisBypassHeaderChecks' + DESC 'Bypass Header Check' + EQUALITY booleanMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.16 + NAME 'amavisVirusQuarantineTo' + DESC 'Virus quarantine location' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.17 + NAME 'amavisBannedQuarantineTo' + DESC 'Banned Files quarantine location' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.18 + NAME 'amavisBadHeaderQuarantineTo' + DESC 'Bad Header quarantine location' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.19 + NAME 'amavisLocal' + DESC 'Is user considered local' + EQUALITY booleanMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.20 + NAME 'amavisMessageSizeLimit' + DESC 'Message size limit' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.21 + NAME 'amavisWarnVirusRecip' + DESC 'Notify virus recipients' + EQUALITY booleanMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.22 + NAME 'amavisWarnBannedRecip' + DESC 'Notify banned file recipients' + EQUALITY booleanMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.23 + NAME 'amavisWarnBadHeaderRecip' + DESC 'Notify bad header recipients' + EQUALITY booleanMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.24 + NAME 'amavisVirusAdmin' + DESC 'Virus admin' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.25 + NAME 'amavisNewVirusAdmin' + DESC 'New virus admin' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.26 + NAME 'amavisSpamAdmin' + DESC 'Spam admin' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.27 + NAME 'amavisBannedAdmin' + DESC 'Banned file admin' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.28 + NAME 'amavisBadHeaderAdmin' + DESC 'Bad header admin' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.29 + NAME 'amavisBannedRuleNames' + DESC 'Banned rule names' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.30 + NAME 'amavisSpamDsnCutoffLevel' + DESC 'Spam DSN Cutoff Level' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.31 + NAME 'amavisSpamQuarantineCutoffLevel' + DESC 'Spam Quarantine Cutoff Level' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.32 + NAME 'amavisSpamSubjectTag' + DESC 'Spam Subject Tag' + EQUALITY caseExactIA5Match + SUBSTR caseExactSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.33 + NAME 'amavisSpamSubjectTag2' + DESC 'Spam Subject Tag2' + EQUALITY caseExactIA5Match + SUBSTR caseExactSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.34 + NAME 'amavisArchiveQuarantineTo' + DESC 'Archive quarantine location' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.35 + NAME 'amavisAddrExtensionVirus' + DESC 'Address Extension for Virus' + EQUALITY caseExactIA5Match + SUBSTR caseExactSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.36 + NAME 'amavisAddrExtensionSpam' + DESC 'Address Extension for Spam' + EQUALITY caseExactIA5Match + SUBSTR caseExactSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.37 + NAME 'amavisAddrExtensionBanned' + DESC 'Address Extension for Banned' + EQUALITY caseExactIA5Match + SUBSTR caseExactSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.38 + NAME 'amavisAddrExtensionBadHeader' + DESC 'Address Extension for Bad Header' + EQUALITY caseExactIA5Match + SUBSTR caseExactSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +# NEW since 2.7.0: + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.39 + NAME 'amavisSpamTag3Level' + DESC 'Spam Tag3 Level' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.40 + NAME 'amavisSpamSubjectTag3' + DESC 'Spam Subject Tag3' + EQUALITY caseExactIA5Match + SUBSTR caseExactSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.41 + NAME 'amavisUncheckedQuarantineTo' + DESC 'Virus quarantine location' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.42 + NAME 'amavisCleanQuarantineTo' + DESC 'Clean quarantine location' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.43 + NAME 'amavisUncheckedLover' + DESC 'Unchecked Files Lover' + EQUALITY booleanMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.44 + NAME 'amavisForwardMethod' + DESC 'Forward / next hop destination' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.45 + NAME 'amavisSaUserConf' + DESC 'SpamAssassin user preferences configuration filename' + EQUALITY caseExactIA5Match + SUBSTR caseExactSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + +#dn: cn=schema +#changetype: modify +#add: attributetypes +attributetype ( 1.3.6.1.4.1.15312.2.2.1.46 + NAME 'amavisSaUserName' + DESC 'SpamAssassin username (for Bayes and AWL lookups)' + EQUALITY caseExactIA5Match + SUBSTR caseExactSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) + + +# Classes +#--------- + +# amavisAccount +# This class is an auxiliary class, this mean that the class will be added +# to a structural class. Usually, the structural class is the class that +# represent the mail account itself (e.g. an inetOrgPerson) + +#dn: cn=schema +#changetype: modify +#add: objectclasses +objectclass ( 1.3.6.1.4.1.15312.2.2.2.1 + NAME 'amavisAccount' AUXILIARY + DESC 'Amavisd Account' + SUP top + MAY ( amavisVirusLover $ amavisBypassVirusChecks $ + amavisSpamLover $ amavisBypassSpamChecks $ + amavisBannedFilesLover $ amavisBypassBannedChecks $ + amavisBadHeaderLover $ amavisBypassHeaderChecks $ + amavisSpamTagLevel $ amavisSpamTag2Level $ amavisSpamKillLevel $ + amavisWhitelistSender $ amavisBlacklistSender $ + amavisSpamQuarantineTo $ amavisVirusQuarantineTo $ + amavisBannedQuarantineTo $ amavisBadHeaderQuarantineTo $ + amavisArchiveQuarantineTo $ + amavisSpamModifiesSubj $ amavisLocal $ amavisMessageSizeLimit $ + amavisWarnVirusRecip $ amavisWarnBannedRecip $ + amavisWarnBadHeaderRecip $ amavisVirusAdmin $ amavisNewVirusAdmin $ + amavisSpamAdmin $ amavisBannedAdmin $ amavisBadHeaderAdmin $ + amavisBannedRuleNames $ + amavisSpamDsnCutoffLevel $ amavisSpamQuarantineCutoffLevel $ + amavisSpamSubjectTag $ amavisSpamSubjectTag2 $ + amavisAddrExtensionVirus $ amavisAddrExtensionSpam $ + amavisAddrExtensionBanned $ amavisAddrExtensionBadHeader $ + amavisSpamTag3Level $ amavisSpamSubjectTag3 $ + amavisUncheckedQuarantineTo $ amavisCleanQuarantineTo $ + amavisUncheckedLover $ amavisForwardMethod $ + amavisSaUserConf $ amavisSaUserName $ + cn $ description ) ) + +#-------------------------------------------------------------------------- +# +# GNU Free Documentation License +# Version 1.2, November 2002 +# +# +# Copyright (C) 2000,2001,2002 Free Software Foundation, Inc. +# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Everyone is permitted to copy and distribute verbatim copies +# of this license document, but changing it is not allowed. +# +# +# 0. PREAMBLE +# +# The purpose of this License is to make a manual, textbook, or other +# functional and useful document "free" in the sense of freedom: to +# assure everyone the effective freedom to copy and redistribute it, +# with or without modifying it, either commercially or noncommercially. +# Secondarily, this License preserves for the author and publisher a way +# to get credit for their work, while not being considered responsible +# for modifications made by others. +# +# This License is a kind of "copyleft", which means that derivative +# works of the document must themselves be free in the same sense. It +# complements the GNU General Public License, which is a copyleft +# license designed for free software. +# +# We have designed this License in order to use it for manuals for free +# software, because free software needs free documentation: a free +# program should come with manuals providing the same freedoms that the +# software does. But this License is not limited to software manuals; +# it can be used for any textual work, regardless of subject matter or +# whether it is published as a printed book. We recommend this License +# principally for works whose purpose is instruction or reference. +# +# +# 1. APPLICABILITY AND DEFINITIONS +# +# This License applies to any manual or other work, in any medium, that +# contains a notice placed by the copyright holder saying it can be +# distributed under the terms of this License. Such a notice grants a +# world-wide, royalty-free license, unlimited in duration, to use that +# work under the conditions stated herein. The "Document", below, +# refers to any such manual or work. Any member of the public is a +# licensee, and is addressed as "you". You accept the license if you +# copy, modify or distribute the work in a way requiring permission +# under copyright law. +# +# A "Modified Version" of the Document means any work containing the +# Document or a portion of it, either copied verbatim, or with +# modifications and/or translated into another language. +# +# A "Secondary Section" is a named appendix or a front-matter section of +# the Document that deals exclusively with the relationship of the +# publishers or authors of the Document to the Document's overall subject +# (or to related matters) and contains nothing that could fall directly +# within that overall subject. (Thus, if the Document is in part a +# textbook of mathematics, a Secondary Section may not explain any +# mathematics.) The relationship could be a matter of historical +# connection with the subject or with related matters, or of legal, +# commercial, philosophical, ethical or political position regarding +# them. +# +# The "Invariant Sections" are certain Secondary Sections whose titles +# are designated, as being those of Invariant Sections, in the notice +# that says that the Document is released under this License. If a +# section does not fit the above definition of Secondary then it is not +# allowed to be designated as Invariant. The Document may contain zero +# Invariant Sections. If the Document does not identify any Invariant +# Sections then there are none. +# +# The "Cover Texts" are certain short passages of text that are listed, +# as Front-Cover Texts or Back-Cover Texts, in the notice that says that +# the Document is released under this License. A Front-Cover Text may +# be at most 5 words, and a Back-Cover Text may be at most 25 words. +# +# A "Transparent" copy of the Document means a machine-readable copy, +# represented in a format whose specification is available to the +# general public, that is suitable for revising the document +# straightforwardly with generic text editors or (for images composed of +# pixels) generic paint programs or (for drawings) some widely available +# drawing editor, and that is suitable for input to text formatters or +# for automatic translation to a variety of formats suitable for input +# to text formatters. A copy made in an otherwise Transparent file +# format whose markup, or absence of markup, has been arranged to thwart +# or discourage subsequent modification by readers is not Transparent. +# An image format is not Transparent if used for any substantial amount +# of text. A copy that is not "Transparent" is called "Opaque". +# +# Examples of suitable formats for Transparent copies include plain +# ASCII without markup, Texinfo input format, LaTeX input format, SGML +# or XML using a publicly available DTD, and standard-conforming simple +# HTML, PostScript or PDF designed for human modification. Examples of +# transparent image formats include PNG, XCF and JPG. Opaque formats +# include proprietary formats that can be read and edited only by +# proprietary word processors, SGML or XML for which the DTD and/or +# processing tools are not generally available, and the +# machine-generated HTML, PostScript or PDF produced by some word +# processors for output purposes only. +# +# The "Title Page" means, for a printed book, the title page itself, +# plus such following pages as are needed to hold, legibly, the material +# this License requires to appear in the title page. For works in +# formats which do not have any title page as such, "Title Page" means +# the text near the most prominent appearance of the work's title, +# preceding the beginning of the body of the text. +# +# A section "Entitled XYZ" means a named subunit of the Document whose +# title either is precisely XYZ or contains XYZ in parentheses following +# text that translates XYZ in another language. (Here XYZ stands for a +# specific section name mentioned below, such as "Acknowledgements", +# "Dedications", "Endorsements", or "History".) To "Preserve the Title" +# of such a section when you modify the Document means that it remains a +# section "Entitled XYZ" according to this definition. +# +# The Document may include Warranty Disclaimers next to the notice which +# states that this License applies to the Document. These Warranty +# Disclaimers are considered to be included by reference in this +# License, but only as regards disclaiming warranties: any other +# implication that these Warranty Disclaimers may have is void and has +# no effect on the meaning of this License. +# +# +# 2. VERBATIM COPYING +# +# You may copy and distribute the Document in any medium, either +# commercially or noncommercially, provided that this License, the +# copyright notices, and the license notice saying this License applies +# to the Document are reproduced in all copies, and that you add no other +# conditions whatsoever to those of this License. You may not use +# technical measures to obstruct or control the reading or further +# copying of the copies you make or distribute. However, you may accept +# compensation in exchange for copies. If you distribute a large enough +# number of copies you must also follow the conditions in section 3. +# +# You may also lend copies, under the same conditions stated above, and +# you may publicly display copies. +# +# +# 3. COPYING IN QUANTITY +# +# If you publish printed copies (or copies in media that commonly have +# printed covers) of the Document, numbering more than 100, and the +# Document's license notice requires Cover Texts, you must enclose the +# copies in covers that carry, clearly and legibly, all these Cover +# Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on +# the back cover. Both covers must also clearly and legibly identify +# you as the publisher of these copies. The front cover must present +# the full title with all words of the title equally prominent and +# visible. You may add other material on the covers in addition. +# Copying with changes limited to the covers, as long as they preserve +# the title of the Document and satisfy these conditions, can be treated +# as verbatim copying in other respects. +# +# If the required texts for either cover are too voluminous to fit +# legibly, you should put the first ones listed (as many as fit +# reasonably) on the actual cover, and continue the rest onto adjacent +# pages. +# +# If you publish or distribute Opaque copies of the Document numbering +# more than 100, you must either include a machine-readable Transparent +# copy along with each Opaque copy, or state in or with each Opaque copy +# a computer-network location from which the general network-using +# public has access to download using public-standard network protocols +# a complete Transparent copy of the Document, free of added material. +# If you use the latter option, you must take reasonably prudent steps, +# when you begin distribution of Opaque copies in quantity, to ensure +# that this Transparent copy will remain thus accessible at the stated +# location until at least one year after the last time you distribute an +# Opaque copy (directly or through your agents or retailers) of that +# edition to the public. +# +# It is requested, but not required, that you contact the authors of the +# Document well before redistributing any large number of copies, to give +# them a chance to provide you with an updated version of the Document. +# +# +# 4. MODIFICATIONS +# +# You may copy and distribute a Modified Version of the Document under +# the conditions of sections 2 and 3 above, provided that you release +# the Modified Version under precisely this License, with the Modified +# Version filling the role of the Document, thus licensing distribution +# and modification of the Modified Version to whoever possesses a copy +# of it. In addition, you must do these things in the Modified Version: +# +# A. Use in the Title Page (and on the covers, if any) a title distinct +# from that of the Document, and from those of previous versions +# (which should, if there were any, be listed in the History section +# of the Document). You may use the same title as a previous version +# if the original publisher of that version gives permission. +# B. List on the Title Page, as authors, one or more persons or entities +# responsible for authorship of the modifications in the Modified +# Version, together with at least five of the principal authors of the +# Document (all of its principal authors, if it has fewer than five), +# unless they release you from this requirement. +# C. State on the Title page the name of the publisher of the +# Modified Version, as the publisher. +# D. Preserve all the copyright notices of the Document. +# E. Add an appropriate copyright notice for your modifications +# adjacent to the other copyright notices. +# F. Include, immediately after the copyright notices, a license notice +# giving the public permission to use the Modified Version under the +# terms of this License, in the form shown in the Addendum below. +# G. Preserve in that license notice the full lists of Invariant Sections +# and required Cover Texts given in the Document's license notice. +# H. Include an unaltered copy of this License. +# I. Preserve the section Entitled "History", Preserve its Title, and add +# to it an item stating at least the title, year, new authors, and +# publisher of the Modified Version as given on the Title Page. If +# there is no section Entitled "History" in the Document, create one +# stating the title, year, authors, and publisher of the Document as +# given on its Title Page, then add an item describing the Modified +# Version as stated in the previous sentence. +# J. Preserve the network location, if any, given in the Document for +# public access to a Transparent copy of the Document, and likewise +# the network locations given in the Document for previous versions +# it was based on. These may be placed in the "History" section. +# You may omit a network location for a work that was published at +# least four years before the Document itself, or if the original +# publisher of the version it refers to gives permission. +# K. For any section Entitled "Acknowledgements" or "Dedications", +# Preserve the Title of the section, and preserve in the section all +# the substance and tone of each of the contributor acknowledgements +# and/or dedications given therein. +# L. Preserve all the Invariant Sections of the Document, +# unaltered in their text and in their titles. Section numbers +# or the equivalent are not considered part of the section titles. +# M. Delete any section Entitled "Endorsements". Such a section +# may not be included in the Modified Version. +# N. Do not retitle any existing section to be Entitled "Endorsements" +# or to conflict in title with any Invariant Section. +# O. Preserve any Warranty Disclaimers. +# +# If the Modified Version includes new front-matter sections or +# appendices that qualify as Secondary Sections and contain no material +# copied from the Document, you may at your option designate some or all +# of these sections as invariant. To do this, add their titles to the +# list of Invariant Sections in the Modified Version's license notice. +# These titles must be distinct from any other section titles. +# +# You may add a section Entitled "Endorsements", provided it contains +# nothing but endorsements of your Modified Version by various +# parties--for example, statements of peer review or that the text has +# been approved by an organization as the authoritative definition of a +# standard. +# +# You may add a passage of up to five words as a Front-Cover Text, and a +# passage of up to 25 words as a Back-Cover Text, to the end of the list +# of Cover Texts in the Modified Version. Only one passage of +# Front-Cover Text and one of Back-Cover Text may be added by (or +# through arrangements made by) any one entity. If the Document already +# includes a cover text for the same cover, previously added by you or +# by arrangement made by the same entity you are acting on behalf of, +# you may not add another; but you may replace the old one, on explicit +# permission from the previous publisher that added the old one. +# +# The author(s) and publisher(s) of the Document do not by this License +# give permission to use their names for publicity for or to assert or +# imply endorsement of any Modified Version. +# +# +# 5. COMBINING DOCUMENTS +# +# You may combine the Document with other documents released under this +# License, under the terms defined in section 4 above for modified +# versions, provided that you include in the combination all of the +# Invariant Sections of all of the original documents, unmodified, and +# list them all as Invariant Sections of your combined work in its +# license notice, and that you preserve all their Warranty Disclaimers. +# +# The combined work need only contain one copy of this License, and +# multiple identical Invariant Sections may be replaced with a single +# copy. If there are multiple Invariant Sections with the same name but +# different contents, make the title of each such section unique by +# adding at the end of it, in parentheses, the name of the original +# author or publisher of that section if known, or else a unique number. +# Make the same adjustment to the section titles in the list of +# Invariant Sections in the license notice of the combined work. +# +# In the combination, you must combine any sections Entitled "History" +# in the various original documents, forming one section Entitled +# "History"; likewise combine any sections Entitled "Acknowledgements", +# and any sections Entitled "Dedications". You must delete all sections +# Entitled "Endorsements". +# +# +# 6. COLLECTIONS OF DOCUMENTS +# +# You may make a collection consisting of the Document and other documents +# released under this License, and replace the individual copies of this +# License in the various documents with a single copy that is included in +# the collection, provided that you follow the rules of this License for +# verbatim copying of each of the documents in all other respects. +# +# You may extract a single document from such a collection, and distribute +# it individually under this License, provided you insert a copy of this +# License into the extracted document, and follow this License in all +# other respects regarding verbatim copying of that document. +# +# +# 7. AGGREGATION WITH INDEPENDENT WORKS +# +# A compilation of the Document or its derivatives with other separate +# and independent documents or works, in or on a volume of a storage or +# distribution medium, is called an "aggregate" if the copyright +# resulting from the compilation is not used to limit the legal rights +# of the compilation's users beyond what the individual works permit. +# When the Document is included in an aggregate, this License does not +# apply to the other works in the aggregate which are not themselves +# derivative works of the Document. +# +# If the Cover Text requirement of section 3 is applicable to these +# copies of the Document, then if the Document is less than one half of +# the entire aggregate, the Document's Cover Texts may be placed on +# covers that bracket the Document within the aggregate, or the +# electronic equivalent of covers if the Document is in electronic form. +# Otherwise they must appear on printed covers that bracket the whole +# aggregate. +# +# +# 8. TRANSLATION +# +# Translation is considered a kind of modification, so you may +# distribute translations of the Document under the terms of section 4. +# Replacing Invariant Sections with translations requires special +# permission from their copyright holders, but you may include +# translations of some or all Invariant Sections in addition to the +# original versions of these Invariant Sections. You may include a +# translation of this License, and all the license notices in the +# Document, and any Warranty Disclaimers, provided that you also include +# the original English version of this License and the original versions +# of those notices and disclaimers. In case of a disagreement between +# the translation and the original version of this License or a notice +# or disclaimer, the original version will prevail. +# +# If a section in the Document is Entitled "Acknowledgements", +# "Dedications", or "History", the requirement (section 4) to Preserve +# its Title (section 1) will typically require changing the actual +# title. +# +# +# 9. TERMINATION +# +# You may not copy, modify, sublicense, or distribute the Document except +# as expressly provided for under this License. Any other attempt to +# copy, modify, sublicense or distribute the Document is void, and will +# automatically terminate your rights under this License. However, +# parties who have received copies, or rights, from you under this +# License will not have their licenses terminated so long as such +# parties remain in full compliance. +# +# +# 10. FUTURE REVISIONS OF THIS LICENSE +# +# The Free Software Foundation may publish new, revised versions +# of the GNU Free Documentation License from time to time. Such new +# versions will be similar in spirit to the present version, but may +# differ in detail to address new problems or concerns. See +# http://www.gnu.org/copyleft/. +# +# Each version of the License is given a distinguishing version number. +# If the Document specifies that a particular numbered version of this +# License "or any later version" applies to it, you have the option of +# following the terms and conditions either of that specified version or +# of any later version that has been published (not as a draft) by the +# Free Software Foundation. If the Document does not specify a version +# number of this License, you may choose any version ever published (not +# as a draft) by the Free Software Foundation. diff --git a/passwd b/passwd index 19887e1..bc9741f 100644 --- a/passwd +++ b/passwd @@ -32,3 +32,4 @@ openvpn:x:105:101:added by portage for openvpn:/dev/null:/sbin/nologin postgrey:x:106:999:added by portage for postgrey:/dev/null:/sbin/nologin postfix:x:207:207:added by portage for postfix:/var/spool/postfix:/sbin/nologin polw:x:107:998:added by portage for policyd-weight:/dev/null:/sbin/nologin +amavis:x:108:997:added by portage for amavisd-new:/var/amavis:/sbin/nologin diff --git a/passwd- b/passwd- index cd223d4..19887e1 100644 --- a/passwd- +++ b/passwd- @@ -31,3 +31,4 @@ tcpdump:x:104:102:added by portage for tcpdump:/dev/null:/sbin/nologin openvpn:x:105:101:added by portage for openvpn:/dev/null:/sbin/nologin postgrey:x:106:999:added by portage for postgrey:/dev/null:/sbin/nologin postfix:x:207:207:added by portage for postfix:/var/spool/postfix:/sbin/nologin +polw:x:107:998:added by portage for policyd-weight:/dev/null:/sbin/nologin diff --git a/shadow b/shadow index 5e6e80a..7063dbd 100644 --- a/shadow +++ b/shadow @@ -31,3 +31,4 @@ openvpn:!:15368:::::: postgrey:!:15368:::::: postfix:!:15368:::::: polw:!:15368:::::: +amavis:!:15368:::::: diff --git a/shadow- b/shadow- index 1ba3768..5e6e80a 100644 --- a/shadow- +++ b/shadow- @@ -30,3 +30,4 @@ tcpdump:!:15368:::::: openvpn:!:15368:::::: postgrey:!:15368:::::: postfix:!:15368:::::: +polw:!:15368::::::