cvs commit: src/contrib/sendmail/mail.local mail.local.c src/contrib/sendmail/src conf.c conf.h err.c headers.c mailq.1 mci.c savemail.c

[Gregory Neil Shapiro]

gshapiro    2007-04-09 01:44:17 UTC

  FreeBSD src repository

  Modified files:
    contrib/sendmail/mail.local mail.local.c 
    contrib/sendmail/src conf.c conf.h err.c headers.c mailq.1 
                         mci.c savemail.c 
  Log:
  Resolve conflicts from sendmail 8.14.1 import
  
  Revision  Changes    Path
  1.27      +4 -2      src/contrib/sendmail/mail.local/mail.local.c
  1.31      +257 -298  src/contrib/sendmail/src/conf.c
  1.25      +7 -6      src/contrib/sendmail/src/conf.h
  1.14      +23 -25    src/contrib/sendmail/src/err.c
  1.24      +210 -78   src/contrib/sendmail/src/headers.c
  1.15      +23 -3     src/contrib/sendmail/src/mailq.1
  1.23      +17 -17    src/contrib/sendmail/src/mci.c
  1.20      +73 -67    src/contrib/sendmail/src/savemail.c