Attachment #1329 for bug #1344

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

Lines 250-258 Link Here

(-)openssh-4.6p1~/servconf.c (-1 / +6 lines)
250	if (options->permit_tun == -1)	250	if (options->permit_tun == -1)
251	options->permit_tun = SSH_TUNMODE_NO;	251	options->permit_tun = SSH_TUNMODE_NO;
252		252
253	/* Turn privilege separation on by default */	253	/* Turn privilege separation on by default if file descriptors can be
		254	passed */
254	if (use_privsep == -1)	255	if (use_privsep == -1)
		256	#ifndef DISABLE_FD_PASSING
255	use_privsep = 1;	257	use_privsep = 1;
		258	#else
		259	use_privsep = 0;
		260	#endif
256		261
257	#ifndef HAVE_MMAP	262	#ifndef HAVE_MMAP
258	if (use_privsep && options->compression == 1) {	263	if (use_privsep && options->compression == 1) {




static void
privsep_postauth(Authctxt *authctxt)
{
#ifdef DISABLE_FD_PASSING
	if (1) {
#else
	if (authctxt->pw->pw_uid == 0 || options.use_login) {
		/* Root login */
		/* File descriptor passing is broken or root login */
		use_privsep = 0;
		goto skip;
	}

Return to bug 1344

Lines 662-673 Link Here

(-)openssh-4.6p1~/sshd.c (-5 / +1 lines)
662	static void	662	static void
663	privsep_postauth(Authctxt *authctxt)	663	privsep_postauth(Authctxt *authctxt)
664	{	664	{
665	#ifdef DISABLE_FD_PASSING
666	if (1) {
667	#else
668	if (authctxt->pw->pw_uid == 0 \|\| options.use_login) {	665	if (authctxt->pw->pw_uid == 0 \|\| options.use_login) {
669	#endif	666	/* Root login */
670	/* File descriptor passing is broken or root login */
671	use_privsep = 0;	667	use_privsep = 0;
672	goto skip;	668	goto skip;
673	}	669	}