*** samples/generic/transports.orig	Wed Oct 19 20:22:41 1994
--- samples/generic/transports	Wed Oct 19 20:24:32 1994
***************
*** 91,123 ****
  #
  # comment out the mode=0600 line below, and uncomment the mode=0660
  # line, to get the correct mailbox file permissions for your system.
! local:	driver=appendfile,		# append message to a file
! 	return_path,			# include a Return-Path: field
! 	from,				# supply a From_ envelope line
! 	unix_from_hack,			# insert > before From in body
! 					# comment out the above line for
! 					# MMDF mailbox format and for
! 					# use with the Content-Length
! 					# header fields.
  # SVR4 mailbox format: uncomment the below 3 lines
  #	remove_header="Content-Length",
  #	append_header="${if !header:Content-Type :Content-Type: text}",
  #	append_header="Content-Length: $body_size",
! 	local;				# use local forms for delivery
! 
! 	file=/usr/spool/mail/${lc:user}, # location of mailbox files
  #	file=/usr/mail/${lc:user},	# use this location for System V
  #	group=mail,			# group to own file for System V
! 	mode=0600,			# For BSD: only the user can
! 					# read and write file
  #	mode=0660,			# under System V, group mail can access
! 					# use this for SCO UNIX, as well
! 	suffix="\n",			# append an extra newline
! 					# comment out the above line for
! 					# MMDF mailbox format and for
! 					# use with the Content-Length
! 					# header fields.
! 	notify_comsat,			# notify comsat daemon of delivery
  #	suffix="\1\1\1\1\n",		# MMDF mailbox format
  #	prefix="\1\1\1\1\n",		# MMDF mailbox format
  
--- 91,123 ----
  #
  # comment out the mode=0600 line below, and uncomment the mode=0660
  # line, to get the correct mailbox file permissions for your system.
! #local:	driver=appendfile,		# append message to a file
! #	return_path,			# include a Return-Path: field
! #	from,				# supply a From_ envelope line
! #	unix_from_hack,			# insert > before From in body
! #					# comment out the above line for
! #					# MMDF mailbox format and for
! #					# use with the Content-Length
! #					# header fields.
  # SVR4 mailbox format: uncomment the below 3 lines
  #	remove_header="Content-Length",
  #	append_header="${if !header:Content-Type :Content-Type: text}",
  #	append_header="Content-Length: $body_size",
! #	local;				# use local forms for delivery
! #
! #	file=/usr/spool/mail/${lc:user}, # location of mailbox files
  #	file=/usr/mail/${lc:user},	# use this location for System V
  #	group=mail,			# group to own file for System V
! #	mode=0600,			# For BSD: only the user can
! #					# read and write file
  #	mode=0660,			# under System V, group mail can access
! #					# use this for SCO UNIX, as well
! #	suffix="\n",			# append an extra newline
! #					# comment out the above line for
! #					# MMDF mailbox format and for
! #					# use with the Content-Length
! #					# header fields.
! #	notify_comsat,			# notify comsat daemon of delivery
  #	suffix="\1\1\1\1\n",		# MMDF mailbox format
  #	prefix="\1\1\1\1\n",		# MMDF mailbox format
  
***************
*** 139,151 ****
  # NOTE: If you wish to use this alternate local entry, you must
  # comment out the regular local transport entry, and uncomment the
  # entry below.
! #local:	driver=pipe,			# call out to a program
! #	return_path,			# include a Return-Path: field
! #	local,				# use local forms for delivery
  #	from,				# supply a From_ envelope line
! #	-max_addrs;			# give multiple addresses to command
! #
! #	cmd="/bin/lmail $($user$)"
  
  # pipe - deliver mail to shell commands
  #
--- 139,151 ----
  # NOTE: If you wish to use this alternate local entry, you must
  # comment out the regular local transport entry, and uncomment the
  # entry below.
! local:	driver=pipe,			# call out to a program
! 	return_path,			# include a Return-Path: field
! 	local,				# use local forms for delivery
  #	from,				# supply a From_ envelope line
! 	-max_addrs;			# give multiple addresses to command
! 
! 	cmd="/usr/libexec/mail.local -f $($from$) $($user$)"
  
  # pipe - deliver mail to shell commands
  #