View | Details | Raw Unified | Return to bug 2288
Collapse All | Expand All

(-)a/auth.c (-2 / +1 lines)
Lines 400-407 expand_authorized_keys(const char *filename, struct passwd *pw) Link Here
400 
char *
 400 
char *
401 
authorized_principals_file(struct passwd *pw)
 401 
authorized_principals_file(struct passwd *pw)
402 
{
 402 
{
403 
	if (options.authorized_principals_file == NULL ||
 403 
	if (options.authorized_principals_file == NULL)
404 
	    strcasecmp(options.authorized_principals_file, "none") == 0)
405 
		return NULL;
 404 
		return NULL;
406 
	return expand_authorized_keys(options.authorized_principals_file, pw);
 405 
	return expand_authorized_keys(options.authorized_principals_file, pw);
407 
}
 406 
}
(-)a/servconf.c (+1 lines)
Lines 349-354 fill_default_server_options(ServerOptions *options) Link Here
349 
	CLEAR_ON_NONE(options->banner);
 349 
	CLEAR_ON_NONE(options->banner);
350 
	CLEAR_ON_NONE(options->trusted_user_ca_keys);
 350 
	CLEAR_ON_NONE(options->trusted_user_ca_keys);
351 
	CLEAR_ON_NONE(options->revoked_keys_file);
 351 
	CLEAR_ON_NONE(options->revoked_keys_file);
352 
	CLEAR_ON_NONE(options->authorized_principals_file);
352 
	for (i = 0; i < options->num_host_key_files; i++)
 353 
	for (i = 0; i < options->num_host_key_files; i++)
353 
		CLEAR_ON_NONE(options->host_key_files[i]);
 354 
		CLEAR_ON_NONE(options->host_key_files[i]);
354 
	for (i = 0; i < options->num_host_cert_files; i++)
 355 
	for (i = 0; i < options->num_host_cert_files; i++)

Return to bug 2288