1.1 --- a/src/masqmail.c	Mon Oct 27 16:23:31 2008 +0100
     1.2 +++ b/src/masqmail.c	Wed Oct 29 16:34:13 2008 +0100
     1.3 @@ -212,9 +212,6 @@
     1.4  	struct sockaddr_in saddr;
     1.5  	gchar *peername = NULL;
     1.6  	int dummy = sizeof(saddr);
     1.7 -#ifdef ENABLE_IDENT
     1.8 -	gchar *ident = NULL;
     1.9 -#endif
    1.10  
    1.11  	conf.do_verbose = FALSE;
    1.12  
    1.13 @@ -227,24 +224,10 @@
    1.14  
    1.15  	if (getpeername(0, (struct sockaddr *) (&saddr), &dummy) == 0) {
    1.16  		peername = g_strdup(inet_ntoa(saddr.sin_addr));
    1.17 -#ifdef ENABLE_IDENT
    1.18 -		{
    1.19 -			gchar *id = NULL;
    1.20 -			if ((id = (gchar *) ident_id(0, 60))) {
    1.21 -				ident = g_strdup(id);
    1.22 -			}
    1.23 -		}
    1.24 -#endif
    1.25  	} else if (errno != ENOTSOCK)
    1.26  		exit(EXIT_FAILURE);
    1.27  
    1.28 -	//smtp_in(stdin, stdout, peername);
    1.29  	smtp_in(stdin, stderr, peername, NULL);
    1.30 -
    1.31 -#ifdef ENABLE_IDENT
    1.32 -	if (ident)
    1.33 -		g_free(ident);
    1.34 -#endif
    1.35  }
    1.36  #endif
    1.37  
    1.38 @@ -567,8 +550,13 @@
    1.39  	}
    1.40  
    1.41  	if (mta_mode == MODE_VERSION) {
    1.42 -		gchar *with_resolver = "", *with_smtp_server = "", *with_pop3 = "",
    1.43 -		*with_auth = "", *with_maildir = "", *with_ident = "", *with_mserver = "";
    1.44 +		gchar *with_resolver = "";
    1.45 +		gchar *with_smtp_server = "";
    1.46 +		gchar *with_pop3 = "";
    1.47 +		gchar *with_auth = "";
    1.48 +		gchar *with_maildir = "";
    1.49 +		gchar *with_ident = "";
    1.50 +		gchar *with_mserver = "";
    1.51  
    1.52  #ifdef ENABLE_RESOLVER
    1.53  		with_resolver = " +resolver";