openssh unix dev - May 2017 - [PATCH 0/1] Process the IdentityFile option from the included files

Hello,

This change is to get the IdentityFile option processed
from the included configuration files.

Regards,
Oleg

Oleg Zhurakivskyy (1):
  Process the IdentityFile option from the included files

 readconf.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

-- 
2.9.3

---
 readconf.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/readconf.c b/readconf.c
index 4be5327..066ab25 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1032,14 +1032,12 @@ parse_time:
 		arg = strdelim(&s);
 		if (!arg || *arg == '\0')
 			fatal("%.200s line %d: Missing argument.", filename, linenum);
-		if (*activep) {
-			intptr = &options->num_identity_files;
-			if (*intptr >= SSH_MAX_IDENTITY_FILES)
-				fatal("%.200s line %d: Too many identity files specified (max
%d).",
-				    filename, linenum, SSH_MAX_IDENTITY_FILES);
-			add_identity_file(options, NULL,
-			    arg, flags & SSHCONF_USERCONF);
-		}
+		intptr = &options->num_identity_files;
+		if (*intptr >= SSH_MAX_IDENTITY_FILES)
+			fatal("%.200s line %d: Too many identity files specified (max
%d).",
+				filename, linenum, SSH_MAX_IDENTITY_FILES);
+		add_identity_file(options, NULL,
+					arg, flags & SSHCONF_USERCONF);
 		break;
 
 	case oCertificateFile:
-- 
2.9.3