===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh.c,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -r1.439 -r1.440
--- src/usr.bin/ssh/ssh.c	2016/05/04 12:21:53	1.439
+++ src/usr.bin/ssh/ssh.c	2016/05/04 14:29:58	1.440
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.439 2016/05/04 12:21:53 markus Exp $ */
+/* $OpenBSD: ssh.c,v 1.440 2016/05/04 14:29:58 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1287,7 +1287,8 @@
 	load_public_identity_files();
 
 	/* optionally set the SSH_AUTHSOCKET_ENV_NAME varibale */
-	if (options.identity_agent) {
+	if (options.identity_agent &&
+	    strcmp(options.identity_agent, SSH_AUTHSOCKET_ENV_NAME) != 0) {
 		if (strcmp(options.identity_agent, "none") == 0) {
 			unsetenv(SSH_AUTHSOCKET_ENV_NAME);
 		} else {