svn merge -r 670:672 $SO/trunk/openvpn

Brought up-to-date with 2.0.x branch.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@673 e7ae566f-a301-0410-adde-c780ea21d3b5

1 files changed, 5 insertions, 0 deletions

diff --git a/multi.c b/multi.c
index a42c561..c4015d7 100644
--- a/multi.c
+++ b/multi.c
@@ -1045,6 +1045,7 @@ multi_delete_dup (struct multi_context *m, struct multi_instance *new_mi)
 	{
 	  struct hash_iterator hi;
 	  struct hash_element *he;
+	  int count = 0;
 
 	  hash_iterator_init (m->iter, &hi, true);
 	  while ((he = hash_iterator_next (&hi)))
@@ -1058,10 +1059,14 @@ multi_delete_dup (struct multi_context *m, struct multi_instance *new_mi)
 		      mi->did_iter = false;
 		      multi_close_instance (m, mi, false);
 		      hash_iterator_delete_element (&hi);
+		      ++count;
 		    }
 		}
 	    }
 	  hash_iterator_free (&hi);
+
+	  if (count)
+	    msg (D_MULTI_LOW, "MULTI: new connection by client '%s' will cause previous active sessions by this client to be dropped.  Remember to use the --duplicate-cn option if you want multiple clients using the same certificate or username to concurrently connect.", new_cn);
 	}
     }
 }