AuthFormHandler: Fix another setAuthgroup() corner case

Make sure that autogroupOpt.value always gets populated if we have
a saved authgroup.  If we don't have a saved authgroup but the gateway
offers an authgroup dropdown, don't try to log on using batch mode.

Signed-off-by: Kevin Cernekee <[email protected]>

src/app/openconnect/AuthFormHandler.java

@@ -321,18 +321,18 @@ private void saveAndStore() {
 
 	// If the user had saved a preferred authgroup, submit a NEWGROUP request before rendering the form
 	public boolean setAuthgroup() {
-		String authgroup = getStringPref("authgroup");
-
-		if (mAuthgroupSet || authgroup.equals("")) {
+		LibOpenConnect.FormOpt opt = mForm.authgroupOpt;
+		if (opt == null) {
 			return false;
 		}
 
-		LibOpenConnect.FormOpt opt = mForm.authgroupOpt;
-		if (opt == null) {
+		String authgroup = getStringPref("authgroup");
+		if (authgroup.equals("")) {
 			return false;
 		}
+
 		LibOpenConnect.FormChoice selected = opt.choices.get(mForm.authgroupSelection);
-		if (authgroup.equals(selected.name)) {
+		if (mAuthgroupSet || authgroup.equals(selected.name)) {
 			// already good to go
 			opt.value = authgroup;
 			return false;
@@ -369,6 +369,12 @@ public Object earlyReturn() {
 					return null;
 				}
 				opt.value = defval;
+				break;
+			case LibOpenConnect.OC_FORM_OPT_SELECT:
+				if (opt.value == null) {
+					return null;
+				}
+				break;
 			}
 		}
 		return LibOpenConnect.OC_FORM_RESULT_OK;