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

--- a/src/masqmail.c	Mon Oct 27 16:23:31 2008 +0100
+++ b/src/masqmail.c	Wed Oct 29 16:34:13 2008 +0100
@@ -212,9 +212,6 @@
 	struct sockaddr_in saddr;
 	gchar *peername = NULL;
 	int dummy = sizeof(saddr);
-#ifdef ENABLE_IDENT
-	gchar *ident = NULL;
-#endif
 
 	conf.do_verbose = FALSE;
 
@@ -227,24 +224,10 @@
 
 	if (getpeername(0, (struct sockaddr *) (&saddr), &dummy) == 0) {
 		peername = g_strdup(inet_ntoa(saddr.sin_addr));
-#ifdef ENABLE_IDENT
-		{
-			gchar *id = NULL;
-			if ((id = (gchar *) ident_id(0, 60))) {
-				ident = g_strdup(id);
-			}
-		}
-#endif
 	} else if (errno != ENOTSOCK)
 		exit(EXIT_FAILURE);
 
-	//smtp_in(stdin, stdout, peername);
 	smtp_in(stdin, stderr, peername, NULL);
-
-#ifdef ENABLE_IDENT
-	if (ident)
-		g_free(ident);
-#endif
 }
 #endif
 
@@ -567,8 +550,13 @@
 	}
 
 	if (mta_mode == MODE_VERSION) {
-		gchar *with_resolver = "", *with_smtp_server = "", *with_pop3 = "",
-		*with_auth = "", *with_maildir = "", *with_ident = "", *with_mserver = "";
+		gchar *with_resolver = "";
+		gchar *with_smtp_server = "";
+		gchar *with_pop3 = "";
+		gchar *with_auth = "";
+		gchar *with_maildir = "";
+		gchar *with_ident = "";
+		gchar *with_mserver = "";
 
 #ifdef ENABLE_RESOLVER
 		with_resolver = " +resolver";