Attachment #1937 for bug #1824

Lines 333-338 Link Here

(-)openssh-SNAP-20100922/configure.ac (+13 lines)
333	# Messages for features tested for in target-specific section	333	# Messages for features tested for in target-specific section
334	SIA_MSG="no"	334	SIA_MSG="no"
335	SPC_MSG="no"	335	SPC_MSG="no"
		336	SP_MSG="no"
336		337
337	# Check for some target-specific stuff	338	# Check for some target-specific stuff
338	case "$host" in	339	case "$host" in
Lines 704-709 Link Here
704	SPC_MSG="yes" ], )	705	SPC_MSG="yes" ], )
705	],	706	],
706	)	707	)
		708	AC_ARG_WITH(solaris-projects,
		709	[ --with-solaris-projects Enable Solaris projects (experimental)],
		710	[
		711	AC_CHECK_LIB(project, setproject,
		712	[ AC_DEFINE(USE_SOLARIS_PROJECTS, 1,
		713	[Define if you have Solaris projects])
		714	SSHDLIBS="$SSHDLIBS -lproject"
		715	AC_SUBST(SSHDLIBS)
		716	SP_MSG="yes" ], )
		717	],
		718	)
707	;;	719	;;
708	--sunos4*)	720	--sunos4*)
709	CPPFLAGS="$CPPFLAGS -DSUNOS4"	721	CPPFLAGS="$CPPFLAGS -DSUNOS4"
Lines 4213-4218 Link Here
4213	echo " MD5 password support: $MD5_MSG"	4225	echo " MD5 password support: $MD5_MSG"
4214	echo " libedit support: $LIBEDIT_MSG"	4226	echo " libedit support: $LIBEDIT_MSG"
4215	echo " Solaris process contract support: $SPC_MSG"	4227	echo " Solaris process contract support: $SPC_MSG"
		4228	echo " Solaris project support: $SP_MSG"
4216	echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG"	4229	echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG"
4217	echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"	4230	echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
4218	echo " BSD Auth support: $BSD_AUTH_MSG"	4231	echo " BSD Auth support: $BSD_AUTH_MSG"

Lines 43-48 Link Here

(-)openssh-SNAP-20100922/session.c (+39 lines)
43	#include <sys/socket.h>	43	#include <sys/socket.h>
44	#include <sys/un.h>	44	#include <sys/un.h>
45	#include <sys/wait.h>	45	#include <sys/wait.h>
		46	#ifdef USE_SOLARIS_PROJECTS
		47	#include <sys/task.h>
		48	#endif
46		49
47	#include <arpa/inet.h>	50	#include <arpa/inet.h>
48		51
Lines 59-64 Link Here
59	#include <stdlib.h>	62	#include <stdlib.h>
60	#include <string.h>	63	#include <string.h>
61	#include <unistd.h>	64	#include <unistd.h>
		65	#ifdef USE_SOLARIS_PROJECTS
		66	#include <project.h>
		67	#endif
62		68
63	#include "openbsd-compat/sys-queue.h"	69	#include "openbsd-compat/sys-queue.h"
64	#include "xmalloc.h"	70	#include "xmalloc.h"
Lines 935-940 Link Here
935	}	941	}
936		942
937	/*	943	/*
		944	* Get/set solaris default project.
		945	* If we fail, just run along gracefully.
		946	*/
		947	int
		948	set_default_project(struct passwd *pw)
		949	{
		950	struct project *defaultproject;
		951	struct project tempproject;
		952	char buf[1024];
		953
		954	/* get default project, if we fail just return gracefully */
		955	if ((defaultproject = getdefaultproj(pw->pw_name, &tempproject, &buf, sizeof(buf))) > 0) {
		956	/* set default project */
		957	if (setproject(defaultproject->pj_name, pw->pw_name, TASK_NORMAL) != 0)
		958	debug("setproject(%s): %s", defaultproject->pj_name, strerror(errno));
		959	}
		960	else {
		961	/* debug on getdefaultproj() error */
		962	debug("getdefaultproj(%s): %s", pw->pw_name, strerror(errno));
		963	}
		964
		965	return 0;
		966	}
		967
		968	/*
938	* Sets the value of the given variable in the environment. If the variable	969	* Sets the value of the given variable in the environment. If the variable
939	* already exists, its value is overridden.	970	* already exists, its value is overridden.
940	*/	971	*/
Lines 1524-1529 Link Here
1524	# if defined(WITH_IRIX_PROJECT) \|\| defined(WITH_IRIX_JOBS) \|\| defined(WITH_IRIX_ARRAY)	1555	# if defined(WITH_IRIX_PROJECT) \|\| defined(WITH_IRIX_JOBS) \|\| defined(WITH_IRIX_ARRAY)
1525	irix_setusercontext(pw);	1556	irix_setusercontext(pw);
1526	# endif /* defined(WITH_IRIX_PROJECT) \|\| defined(WITH_IRIX_JOBS) \|\| defined(WITH_IRIX_ARRAY) */	1557	# endif /* defined(WITH_IRIX_PROJECT) \|\| defined(WITH_IRIX_JOBS) \|\| defined(WITH_IRIX_ARRAY) */
		1558
		1559	#ifdef USE_SOLARIS_PROJECTS
		1560	/*
		1561	* if solaris projects were detected, set the default now
		1562	*/
		1563	set_default_project(pw);
		1564	#endif
		1565
1527	# ifdef _AIX	1566	# ifdef _AIX
1528	aix_usrinfo(pw);	1567	aix_usrinfo(pw);
1529	# endif /* _AIX */	1568	# endif /* _AIX */

Return to bug 1824