diff -rub /usr/ports/security/ipsec-tools-devel/work/ipsec-tools-0.8.0/src/racoon/handler.c /root/ipsec-tools-modified/work/ipsec-tools-0.8.0/src/racoon/handler.c
--- /usr/ports/security/ipsec-tools-devel/work/ipsec-tools-0.8.0/src/racoon/handler.c	2011-03-14 13:18:12.000000000 -0400
+++ /root/ipsec-tools-modified/work/ipsec-tools-0.8.0/src/racoon/handler.c	2011-11-01 15:27:26.000000000 -0400
@@ -340,6 +340,16 @@
 		pd->etype = iph1->etype;
 		pd->created = iph1->created;
 		pd->ph2cnt = iph1->ph2cnt;
+#ifdef ENABLE_HYBRID
+		if (iph1->mode_cfg == NULL) {
+			/* Not a mobile client, so no login name */
+			strncpy(pd->login, " ", LOGINLEN);
+			pd->login[LOGINLEN] = '\0';
+		} else {
+			strncpy(pd->login, iph1->mode_cfg->login, LOGINLEN);
+			pd->login[LOGINLEN] = '\0';
+		}
+#endif
 		pd++;
 	}
 
diff -rub /usr/ports/security/ipsec-tools-devel/work/ipsec-tools-0.8.0/src/racoon/handler.h /root/ipsec-tools-modified/work/ipsec-tools-0.8.0/src/racoon/handler.h
--- /usr/ports/security/ipsec-tools-devel/work/ipsec-tools-0.8.0/src/racoon/handler.h	2010-11-17 05:40:41.000000000 -0500
+++ /root/ipsec-tools-modified/work/ipsec-tools-0.8.0/src/racoon/handler.h	2011-10-28 16:06:15.000000000 -0400
@@ -453,6 +453,10 @@
 	u_int8_t etype;
 	time_t created;
 	int ph2cnt;
+#ifdef ENABLE_HYBRID
+#define LOGINLEN 31
+	char login[LOGINLEN + 1];
+#endif
 };
 
 struct sockaddr;
diff -rub /usr/ports/security/ipsec-tools-devel/work/ipsec-tools-0.8.0/src/racoon/racoonctl.c /root/ipsec-tools-modified/work/ipsec-tools-0.8.0/src/racoon/racoonctl.c
--- /usr/ports/security/ipsec-tools-devel/work/ipsec-tools-0.8.0/src/racoon/racoonctl.c	2010-11-12 04:08:26.000000000 -0500
+++ /root/ipsec-tools-modified/work/ipsec-tools-0.8.0/src/racoon/racoonctl.c	2011-10-31 14:30:04.000000000 -0400
@@ -1039,8 +1039,13 @@
 /* semi long header;
  1234567890123456789012 0000000000000000:0000000000000000 00 X 00 X 0000-00-00 00:00:00 000000
 */
+#ifdef ENABLE_HYBRID
+char *header2 = 
+"Destination            Cookies                           ST S  V E Created             Phase2 Login";
+#else
 char *header2 = 
 "Destination            Cookies                           ST S  V E Created             Phase2";
+#endif
 
 /* long header;
  0000:0000:0000:0000:0000:0000:0000:0000.00000 0000:0000:0000:0000:0000:0000:0000:0000.00000 0000000000000000:0000000000000000 00 X 00 X 0000-00-00 00:00:00 000000
@@ -1131,6 +1136,10 @@
 		if (long_format >= 1)
 			printf("%6d ", pd->ph2cnt);
 
+#ifdef ENABLE_HYBRID
+		if ((long_format >= 1) && (pd->login != NULL))
+			printf(" %s", pd->login);
+#endif
 		printf("\n");
 
 		pd++;