*** smtpd.c.orig	Tue Oct  3 04:48:02 2006
--- smtpd.c	Mon Jan  8 21:47:22 2007
***************
*** 2535,2545 ****
       * intermediate proxy.
       */
      if (!state->proxy || state->xforward.flags == 0) {
  	out_fprintf(out_stream, REC_TYPE_NORM,
  		    "Received: from %s (%s [%s])",
  		    state->helo_name ? state->helo_name : state->name,
  		    state->name, state->rfc_addr);
! 
  #define VSTRING_STRDUP(s) vstring_strcpy(vstring_alloc(strlen(s) + 1), (s))
  
  #ifdef USE_TLS
--- 2535,2562 ----
       * intermediate proxy.
       */
      if (!state->proxy || state->xforward.flags == 0) {
+ /* 2007-01-01 */
+ #define HIDE_IPADDR_FOR_KNOWN_HOSTS
+ #ifndef HIDE_IPADDR_FOR_KNOWN_HOSTS
  	out_fprintf(out_stream, REC_TYPE_NORM,
  		    "Received: from %s (%s [%s])",
  		    state->helo_name ? state->helo_name : state->name,
  		    state->name, state->rfc_addr);
! #else
! 	if (strcmp(state->name, "unknown") == 0) {
! 		out_fprintf(out_stream, REC_TYPE_NORM,
! 		    "Received: from %s (%s [%s])",
! 		    state->helo_name ? state->helo_name : state->name,
! 		    state->name, state->rfc_addr);
! 	}
! 	else {
! 		/* hide IP address for known hosts */
!  		out_fprintf(out_stream, REC_TYPE_NORM,
! 		    "Received: from %s (%s)",
! 		    state->helo_name ? state->helo_name : state->name,
! 		    state->name);
! 	}
! #endif
  #define VSTRING_STRDUP(s) vstring_strcpy(vstring_alloc(strlen(s) + 1), (s))
  
  #ifdef USE_TLS
***************
*** 3873,3879 ****
--- 3890,3899 ----
  	}
  	/* XXX We use the real client for connect access control. */
  	if (SMTPD_STAND_ALONE(state) == 0
+ #define ENABLE_GREET_PAUSE_EARLY /* ignore $smtpd_delay_reject */
+ #ifndef ENABLE_GREET_PAUSE_EARLY
  	    && var_smtpd_delay_reject == 0
+ #endif
  	    && (err = smtpd_check_client(state)) != 0) {
  	    state->error_mask |= MAIL_ERROR_POLICY;
  	    state->access_denied = mystrdup(err);