--- src/main/auth.c	2006-07-18 16:05:42.000000000 +0300
+++ src/main/auth.c	2006-07-18 17:13:39.000000000 +0300
@@ -45,16 +45,21 @@
 char *auth_name(char *buf, size_t buflen, REQUEST *request, int do_cli) {
 	VALUE_PAIR	*cli;
 	VALUE_PAIR	*pair;
+	VALUE_PAIR  *did;
+
 	int		port = 0;
+	int		do_did = 1;
 
 	if ((cli = pairfind(request->packet->vps, PW_CALLING_STATION_ID)) == NULL)
 		do_cli = 0;
 	if ((pair = pairfind(request->packet->vps, PW_NAS_PORT)) != NULL)
 		port = pair->lvalue;
+	if ((did = pairfind(request->packet->vps, PW_CALLED_STATION_ID)) == NULL)
+		do_did = 0;
 
-	snprintf(buf, buflen, "from client %.128s port %u%s%.128s",
+	snprintf(buf, buflen, "from client %.128s port %u%s%.128s%s%.128s",
 			client_name(request->packet->src_ipaddr), port,
-			(do_cli ? " cli " : ""), (do_cli ? (char *)cli->strvalue : ""));
+			(do_cli ? " cli " : ""), (do_cli ? (char *)cli->strvalue : ""), (do_did ? " did " : ""), (do_did ? (char *)did->strvalue : ""));
 
 	return buf;
 }
