Attachment #2111 for bug #1949

Lines 3127-3132 channel_add_adm_permitted_opens(char *ho Link Here

(-)channels.c (-1 / +15 lines)
3127	}	3127	}
3128		3128
3129	void	3129	void
		3130	channel_disable_adm_local_opens(void)
		3131	{
		3132	if (num_adm_permitted_opens == 0) {
		3133	permitted_adm_opens = xmalloc(sizeof(*permitted_adm_opens));
		3134	permitted_adm_opens[num_adm_permitted_opens].host_to_connect
		3135	= NULL;
		3136	num_adm_permitted_opens = 1;
		3137	}
		3138
		3139	}
		3140
		3141	void
3130	channel_clear_permitted_opens(void)	3142	channel_clear_permitted_opens(void)
3131	{	3143	{
3132	int i;	3144	int i;
Lines 3167-3173 channel_print_adm_permitted_opens(void) Link Here
3167	return;	3179	return;
3168	}	3180	}
3169	for (i = 0; i < num_adm_permitted_opens; i++)	3181	for (i = 0; i < num_adm_permitted_opens; i++)
3170	if (permitted_adm_opens[i].host_to_connect != NULL)	3182	if (permitted_adm_opens[i].host_to_connect == NULL)
		3183	printf(" none");
		3184	else
3171	printf(" %s:%d", permitted_adm_opens[i].host_to_connect,	3185	printf(" %s:%d", permitted_adm_opens[i].host_to_connect,
3172	permitted_adm_opens[i].port_to_connect);	3186	permitted_adm_opens[i].port_to_connect);
3173	printf("\n");	3187	printf("\n");

Lines 253-258 void channel_set_af(int af); Link Here

(-)channels.h (+1 lines)
253	void channel_permit_all_opens(void);	253	void channel_permit_all_opens(void);
254	void channel_add_permitted_opens(char *, int);	254	void channel_add_permitted_opens(char *, int);
255	int channel_add_adm_permitted_opens(char *, int);	255	int channel_add_adm_permitted_opens(char *, int);
		256	void channel_disable_adm_local_opens(void);
256	void channel_update_permitted_opens(int, int);	257	void channel_update_permitted_opens(int, int);
257	void channel_clear_permitted_opens(void);	258	void channel_clear_permitted_opens(void);
258	void channel_clear_adm_permitted_opens(void);	259	void channel_clear_adm_permitted_opens(void);

Lines 1333-1338 process_server_config_line(ServerOptions Link Here

(-)servconf.c (+8 lines)
1333	}	1333	}
1334	break;	1334	break;
1335	}	1335	}
		1336	if (strcmp(arg, "none") == 0) {
		1337	if (*activep && n == -1) {
		1338	channel_clear_adm_permitted_opens();
		1339	options->num_permitted_opens = 1;
		1340	channel_disable_adm_local_opens();
		1341	}
		1342	break;
		1343	}
1336	if (*activep && n == -1)	1344	if (*activep && n == -1)
1337	channel_clear_adm_permitted_opens();	1345	channel_clear_adm_permitted_opens();
1338	for (; arg != NULL && *arg != '\0'; arg = strdelim(&cp)) {	1346	for (; arg != NULL && *arg != '\0'; arg = strdelim(&cp)) {

Return to bug 1949