1.1 --- a/src/deliver.c	Mon Oct 27 16:23:31 2008 +0100
     1.2 +++ b/src/deliver.c	Wed Oct 29 16:34:13 2008 +0100
     1.3 @@ -355,8 +355,7 @@
     1.4  		set_heloname(psb, route->helo_name ? route->helo_name : conf.host_name, route->do_correct_helo);
     1.5  
     1.6  #ifdef ENABLE_AUTH
     1.7 -		if ((route->auth_name) && (route->auth_login)
     1.8 -		    && (route->auth_secret))
     1.9 +		if ((route->auth_name) && (route->auth_login) && (route->auth_secret))
    1.10  			set_auth(psb, route->auth_name, route->auth_login, route->auth_secret);
    1.11  #endif
    1.12  		if (smtp_out_init(psb)) {

     2.1 --- a/src/masqmail.c	Mon Oct 27 16:23:31 2008 +0100
     2.2 +++ b/src/masqmail.c	Wed Oct 29 16:34:13 2008 +0100
     2.3 @@ -212,9 +212,6 @@
     2.4  	struct sockaddr_in saddr;
     2.5  	gchar *peername = NULL;
     2.6  	int dummy = sizeof(saddr);
     2.7 -#ifdef ENABLE_IDENT
     2.8 -	gchar *ident = NULL;
     2.9 -#endif
    2.10  
    2.11  	conf.do_verbose = FALSE;
    2.12  
    2.13 @@ -227,24 +224,10 @@
    2.14  
    2.15  	if (getpeername(0, (struct sockaddr *) (&saddr), &dummy) == 0) {
    2.16  		peername = g_strdup(inet_ntoa(saddr.sin_addr));
    2.17 -#ifdef ENABLE_IDENT
    2.18 -		{
    2.19 -			gchar *id = NULL;
    2.20 -			if ((id = (gchar *) ident_id(0, 60))) {
    2.21 -				ident = g_strdup(id);
    2.22 -			}
    2.23 -		}
    2.24 -#endif
    2.25  	} else if (errno != ENOTSOCK)
    2.26  		exit(EXIT_FAILURE);
    2.27  
    2.28 -	//smtp_in(stdin, stdout, peername);
    2.29  	smtp_in(stdin, stderr, peername, NULL);
    2.30 -
    2.31 -#ifdef ENABLE_IDENT
    2.32 -	if (ident)
    2.33 -		g_free(ident);
    2.34 -#endif
    2.35  }
    2.36  #endif
    2.37  
    2.38 @@ -567,8 +550,13 @@
    2.39  	}
    2.40  
    2.41  	if (mta_mode == MODE_VERSION) {
    2.42 -		gchar *with_resolver = "", *with_smtp_server = "", *with_pop3 = "",
    2.43 -		*with_auth = "", *with_maildir = "", *with_ident = "", *with_mserver = "";
    2.44 +		gchar *with_resolver = "";
    2.45 +		gchar *with_smtp_server = "";
    2.46 +		gchar *with_pop3 = "";
    2.47 +		gchar *with_auth = "";
    2.48 +		gchar *with_maildir = "";
    2.49 +		gchar *with_ident = "";
    2.50 +		gchar *with_mserver = "";
    2.51  
    2.52  #ifdef ENABLE_RESOLVER
    2.53  		with_resolver = " +resolver";