Merge branch 'master' of gitlab.com:j.l-w/openconnect into HEAD

sailfishos-mirror · Oct 3, 2018 · 6a2ce5d · 6a2ce5d
2 parents ce6158f + 51f8feb
commit 6a2ce5d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/auth.c b/auth.c
@@ -893,7 +893,8 @@ static int cstp_can_gen_tokencode(struct openconnect_info *vpninfo,
 	}
 #endif
 	/* Otherwise it's an OATH token of some kind. */
-	if (strcmp(opt->name, "secondary_password"))
+	if (strcmp(opt->name, "secondary_password") &&
+        (!form->auth_id || strcmp(form->auth_id, "challenge")))
 		return -EINVAL;
 
 	return can_gen_tokencode(vpninfo, form, opt);