Attachment #2138 for bug #983

View | Details | Raw Unified | Return to bug 983 | Differences between

and this patch

Lines 482-488 auth2_check_required(const char *list) Link Here

(-)a/auth2.c (-1 / +1 lines)
482	ret = -1;	482	ret = -1;
483	}	483	}
484	/* Activate method if it isn't already */	484	/* Activate method if it isn't already */
485	if (*(m->enabled) == -1)	485	if (m->enabled != NULL && *(m->enabled) == -1)
486	*(m->enabled) = 1;	486	*(m->enabled) = 1;
487	}	487	}
488	xfree(orig_methods);	488	xfree(orig_methods);

Lines 415-423 monitor_child_preauth(Authctxt _authctxt, struct monitor pmonitor) Link Here

(-)a/monitor.c (-2 / +3 lines)
415	auth_method, *req_auth);	415	auth_method, *req_auth);
416	debug2("monitor_child_preauth: required list now: %s",	416	debug2("monitor_child_preauth: required list now: %s",
417	req_auth == NULL ? "DONE" : req_auth);	417	req_auth == NULL ? "DONE" : req_auth);
418	if (*req_auth != NULL)	418	if (*req_auth != NULL) {
419	authenticated = 0;	419	authenticated = 0;
420	no_increment = 1;	420	no_increment = 1;
		421	}
421	}	422	}
422		423
423	if (ent->flags & (MON_AUTHDECIDE\|MON_ALOG)) {	424	if (ent->flags & (MON_AUTHDECIDE\|MON_ALOG)) {




	case sRequiredAuthentications1:
		charptr = &options->required_auth1;
		arg = strdelim(&cp);
		if (auth1_check_required(arg) != 0)
			fatal("%.200s line %d: Invalid required authentication "
			    "list", filename, linenum);
		if (!arg || *arg == '\0')
			fatal("%.200s line %d: Missing argument.",
			    filename, linenum);
		if (auth1_check_required(arg) != 0)
			fatal("%.200s line %d: Invalid required authentication "
			    "list", filename, linenum);
		if (*charptr == NULL)
			*charptr = xstrdup(arg);
		break;

	case sRequiredAuthentications2:
		charptr = &options->required_auth2;
		arg = strdelim(&cp);
		if (auth2_check_required(arg) != 0)
			fatal("%.200s line %d: Invalid required authentication "
			    "list", filename, linenum);
		if (!arg || *arg == '\0')
			fatal("%.200s line %d: Missing argument.",
			    filename, linenum);
		if (auth2_check_required(arg) != 0)
			fatal("%.200s line %d: Invalid required authentication "
			    "list", filename, linenum);
		if (*charptr == NULL)
			*charptr = xstrdup(arg);
		break;

Return to bug 983

Lines 1231-1242 process_server_config_line(ServerOptions options, char line, Link Here

(-)a/servconf.c (-6 / +6 lines)
1231	case sRequiredAuthentications1:	1231	case sRequiredAuthentications1:
1232	charptr = &options->required_auth1;	1232	charptr = &options->required_auth1;
1233	arg = strdelim(&cp);	1233	arg = strdelim(&cp);
1234	if (auth1_check_required(arg) != 0)
1235	fatal("%.200s line %d: Invalid required authentication "
1236	"list", filename, linenum);
1237	if (!arg \|\| *arg == '\0')	1234	if (!arg \|\| *arg == '\0')
1238	fatal("%.200s line %d: Missing argument.",	1235	fatal("%.200s line %d: Missing argument.",
1239	filename, linenum);	1236	filename, linenum);
		1237	if (auth1_check_required(arg) != 0)
		1238	fatal("%.200s line %d: Invalid required authentication "
		1239	"list", filename, linenum);
1240	if (*charptr == NULL)	1240	if (*charptr == NULL)
1241	*charptr = xstrdup(arg);	1241	*charptr = xstrdup(arg);
1242	break;	1242	break;
Lines 1244-1255 process_server_config_line(ServerOptions options, char line, Link Here
1244	case sRequiredAuthentications2:	1244	case sRequiredAuthentications2:
1245	charptr = &options->required_auth2;	1245	charptr = &options->required_auth2;
1246	arg = strdelim(&cp);	1246	arg = strdelim(&cp);
1247	if (auth2_check_required(arg) != 0)
1248	fatal("%.200s line %d: Invalid required authentication "
1249	"list", filename, linenum);
1250	if (!arg \|\| *arg == '\0')	1247	if (!arg \|\| *arg == '\0')
1251	fatal("%.200s line %d: Missing argument.",	1248	fatal("%.200s line %d: Missing argument.",
1252	filename, linenum);	1249	filename, linenum);
		1250	if (auth2_check_required(arg) != 0)
		1251	fatal("%.200s line %d: Invalid required authentication "
		1252	"list", filename, linenum);
1253	if (*charptr == NULL)	1253	if (*charptr == NULL)
1254	*charptr = xstrdup(arg);	1254	*charptr = xstrdup(arg);
1255	break;	1255	break;