Improve the strength of sendmail.fc files, print version, add extension

(Joerg Jenderek)

diff --git a/magic/Magdir/sendmail b/magic/Magdir/sendmail
index aeb62031426995e1e4d832c469aea8fde347af2c..29004104d0125d0e339a528553e782b4d28bde8b 100644 (file)
--- a/magic/Magdir/sendmail
+++ b/magic/Magdir/sendmail
@@ -1,14 +1,31 @@
 
 #------------------------------------------------------------------------------
-# $File: sendmail,v 1.7 2009/09/19 16:28:12 christos Exp $
+# $File: sendmail,v 1.8 2015/11/11 15:27:03 christos Exp $
 # sendmail:  file(1) magic for sendmail config files
 #
 # XXX - byte order?
 #
-0      byte    046       Sendmail frozen configuration 
->16    string  >\0       - version %s
-0      short   0x271c    Sendmail frozen configuration
->16    string  >\0       - version %s
+# Update: Joerg Jenderek 
+# GRR: this test is too general as it catches also
+# READ.ME.FIRST.AWP Sendmail frozen configuration
+# - version ====|====|====|====|====|====|====|====|====|====|====|====|===
+# Email_23_f217153422.ts Sendmail frozen configuration
+# - version \330jK\354
+0      byte    046       
+# http://www.sendmail.com/sm/open_source/docs/older_release_notes/
+# freezed configuration file (dbm format?) created from sendmal.cf with -bz
+# by older sendmail. til version 8.6 support for frozen configuration files is removed
+# valid version numbers look like "7.14.4" and should be simliar to output of commands
+# "sendmail -d0 -bt < /dev/null |grep -i Version" or "egrep '^DZ' /etc/sendmail.cf" 
+>16    regex/s =^[0-78][0-9.]{4}       Sendmail frozen configuration
+# normally only /etc/sendmail.fc or /var/adm/sendmail/sendmail.fc
+!:ext fc
+>>16   string  >\0                     - version %s
+0      short   0x271c    
+# look for valid version number
+>16    regex/s =^[0-78][0-9.]{4}       Sendmail frozen configuration
+!:ext fc
+>>16   string  >\0                     - version %s
 
 #------------------------------------------------------------------------------
 # sendmail:  file(1) magic for sendmail m4(1) files