Attachment #2822 for bug #2581

Lines 1253-1258 mm_answer_keyallowed(int sock, Buffer *m) Link Here

(-)a/monitor.c (-3 / +4 lines)
1253	break;	1253	break;
1254	}	1254	}
1255	}	1255	}
		1256
		1257	debug3("%s: key %p is %s",
		1258	__func__, key, allowed ? "allowed" : "not allowed");
		1259
1256	if (key != NULL)	1260	if (key != NULL)
1257	key_free(key);	1261	key_free(key);
1258		1262
Lines 1274-1282 mm_answer_keyallowed(int sock, Buffer *m) Link Here
1274	free(chost);	1278	free(chost);
1275	}	1279	}
1276		1280
1277	debug3("%s: key %p is %s",
1278	__func__, key, allowed ? "allowed" : "not allowed");
1279
1280	buffer_clear(m);	1281	buffer_clear(m);
1281	buffer_put_int(m, allowed);	1282	buffer_put_int(m, allowed);
1282	buffer_put_int(m, forced_command != NULL);	1283	buffer_put_int(m, forced_command != NULL);

Lines 502-511 mm_pty_allocate(int ptyfd, int ttyfd, char *namebuf, size_t namebuflen) Link Here

(-)a/monitor_wrap.c (-3 / +1 lines)
502	if ((tmp1 = dup(pmonitor->m_recvfd)) == -1 \|\|	502	if ((tmp1 = dup(pmonitor->m_recvfd)) == -1 \|\|
503	(tmp2 = dup(pmonitor->m_recvfd)) == -1) {	503	(tmp2 = dup(pmonitor->m_recvfd)) == -1) {
504	error("%s: cannot allocate fds for pty", __func__);	504	error("%s: cannot allocate fds for pty", __func__);
505	if (tmp1 > 0)	505	if (tmp1 >= 0)
506	close(tmp1);	506	close(tmp1);
507	if (tmp2 > 0)
508	close(tmp2);
509	return 0;	507	return 0;
510	}	508	}
511	close(tmp1);	509	close(tmp1);

Lines 1592-1600 process_server_config_line(ServerOptions options, char line, Link Here

(-)a/servconf.c (-3 lines)
1592	filename, linenum);	1592	filename, linenum);
1593	if (activep && charptr == NULL) {	1593	if (activep && charptr == NULL) {
1594	*charptr = tilde_expand_filename(arg, getuid());	1594	*charptr = tilde_expand_filename(arg, getuid());
1595	/* increase optional counter */
1596	if (intptr != NULL)
1597	intptr = intptr + 1;
1598	}	1595	}
1599	break;	1596	break;
1600		1597

Lines 721-728 privsep_preauth(Authctxt *authctxt) Link Here

(-)a/sshd.c (-2 / +6 lines)
721		721
722	privsep_preauth_child();	722	privsep_preauth_child();
723	setproctitle("%s", "[net]");	723	setproctitle("%s", "[net]");
724	if (box != NULL)	724	if (box != NULL) {
725	ssh_sandbox_child(box);	725	ssh_sandbox_child(box);
		726	free(box);
		727	}
726		728
727	return 0;	729	return 0;
728	}	730	}
Lines 1467-1472 server_accept_loop(int sock_in, int sock_out, int newsock, int config_s) Link Here
1467	if (num_listen_socks < 0)	1469	if (num_listen_socks < 0)
1468	break;	1470	break;
1469	}	1471	}
		1472
		1473	if (fdset != NULL)
		1474	free(fdset);
1470	}	1475	}
1471		1476
1472	/*	1477	/*
1473	-

Return to bug 2581