*** ./tools/stunnel.conf-sample.in.ORIG	Thu Jul  7 18:47:37 2011
--- ./tools/stunnel.conf-sample.in	Mon Jul 25 18:24:31 2011
***************
*** 8,14 ****
  
  ; A copy of some devices and system files is needed within the chroot jail
  ; Chroot conflicts with configuration file reload and many other features
! chroot = @prefix@/var/lib/stunnel/
  ; Chroot jail can be escaped if setuid option is not used
  setuid = nobody
  setgid = @DEFAULT_GROUP@
--- 8,14 ----
  
  ; A copy of some devices and system files is needed within the chroot jail
  ; Chroot conflicts with configuration file reload and many other features
! chroot = @localstatedir@/run/stunnel/
  ; Chroot jail can be escaped if setuid option is not used
  setuid = nobody
  setgid = @DEFAULT_GROUP@
***************
*** 25,32 ****
  ; *****************************************************************************
  
  ; Certificate/key is needed in server mode and optional in client mode
! cert = @prefix@/etc/stunnel/mail.pem
! ;key = @prefix@/etc/stunnel/mail.pem
  
  ; Authentication stuff needs to be configured to prevent MITM attacks
  ; It is not enabled by default!
--- 25,32 ----
  ; *****************************************************************************
  
  ; Certificate/key is needed in server mode and optional in client mode
! cert = @sysconfdir@/stunnel/mail.pem
! ;key = @sysconfdir@/stunnel/mail.pem
  
  ; Authentication stuff needs to be configured to prevent MITM attacks
  ; It is not enabled by default!
***************
*** 35,46 ****
  ; CApath is located inside chroot jail
  ;CApath = /certs
  ; It's often easier to use CAfile
! ;CAfile = @prefix@/etc/stunnel/certs.pem
  ; Don't forget to c_rehash CRLpath
  ; CRLpath is located inside chroot jail
  ;CRLpath = /crls
  ; Alternatively CRLfile can be used
! ;CRLfile = @prefix@/etc/stunnel/crls.pem
  
  ; Disable support for insecure SSLv2 protocol
  options = NO_SSLv2
--- 35,47 ----
  ; CApath is located inside chroot jail
  ;CApath = /certs
  ; It's often easier to use CAfile
! ;CAfile = @sysconfdir@/stunnel/certs.pem
! ;CAfile = @sysconfdir@/pki/tls/certs/ca-bundle.crt
  ; Don't forget to c_rehash CRLpath
  ; CRLpath is located inside chroot jail
  ;CRLpath = /crls
  ; Alternatively CRLfile can be used
! ;CRLfile = @sysconfdir@/stunnel/crls.pem
  
  ; Disable support for insecure SSLv2 protocol
  options = NO_SSLv2