Attachment #1922 for bug #1614

Lines 46-51 LD=@LD@ Link Here

(-)Makefile.in (-1 / +2 lines)
46	CFLAGS=@CFLAGS@	46	CFLAGS=@CFLAGS@
47	CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@	47	CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
48	LIBS=@LIBS@	48	LIBS=@LIBS@
		49	SSHLIBS=@SSHLIBS@
49	SSHDLIBS=@SSHDLIBS@	50	SSHDLIBS=@SSHDLIBS@
50	LIBEDIT=@LIBEDIT@	51	LIBEDIT=@LIBEDIT@
51	AR=@AR@	52	AR=@AR@
Lines 139-145 libssh.a: $(LIBSSH_OBJS) Link Here
139	$(RANLIB) $@	140	$(RANLIB) $@
140		141
141	ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS)	142	ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS)
142	$(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)	143	$(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHLIBS) $(LIBS)
143		144
144	sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS)	145	sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS)
145	$(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS)	146	$(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS)

Lines 700-706 mips-sony-bsd\|mips-sony-newsos4) Link Here

(-)configure.ac (-1 / +6 lines)
700	[ AC_DEFINE(USE_SOLARIS_PROCESS_CONTRACTS, 1,	700	[ AC_DEFINE(USE_SOLARIS_PROCESS_CONTRACTS, 1,
701	[Define if you have Solaris process contracts])	701	[Define if you have Solaris process contracts])
702	SSHDLIBS="$SSHDLIBS -lcontract"	702	SSHDLIBS="$SSHDLIBS -lcontract"
703	AC_SUBST(SSHDLIBS)
704	SPC_MSG="yes" ], )	703	SPC_MSG="yes" ], )
705	],	704	],
706	)	705	)
Lines 3388-3393 AC_ARG_WITH(selinux, Link Here
3388	],	3387	],
3389	AC_MSG_ERROR(SELinux support requires libselinux library))	3388	AC_MSG_ERROR(SELinux support requires libselinux library))
3390	SSHDLIBS="$SSHDLIBS $LIBSELINUX"	3389	SSHDLIBS="$SSHDLIBS $LIBSELINUX"
		3390	SSHLIBS="$SSHLIBS $LIBSELINUX"
3391	AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level)	3391	AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level)
3392	LIBS="$save_LIBS"	3392	LIBS="$save_LIBS"
3393	fi ]	3393	fi ]
Lines 4137-4142 else Link Here
4137	fi	4137	fi
4138	AC_CHECK_DECL(BROKEN_GETADDRINFO, TEST_SSH_IPV6=no)	4138	AC_CHECK_DECL(BROKEN_GETADDRINFO, TEST_SSH_IPV6=no)
4139	AC_SUBST(TEST_SSH_IPV6, $TEST_SSH_IPV6)	4139	AC_SUBST(TEST_SSH_IPV6, $TEST_SSH_IPV6)
		4140	AC_SUBST(SSHLIBS)
		4141	AC_SUBST(SSHDLIBS)
4140		4142
4141	AC_EXEEXT	4143	AC_EXEEXT
4142	AC_CONFIG_FILES([Makefile buildpkg.sh opensshd.init openssh.xml \	4144	AC_CONFIG_FILES([Makefile buildpkg.sh opensshd.init openssh.xml \
Lines 4209-4214 echo " Linker flags: ${LDFLAGS}" Link Here
4209	echo " Libraries: ${LIBS}"	4211	echo " Libraries: ${LIBS}"
4210	if test ! -z "${SSHDLIBS}"; then	4212	if test ! -z "${SSHDLIBS}"; then
4211	echo " +for sshd: ${SSHDLIBS}"	4213	echo " +for sshd: ${SSHDLIBS}"
		4214	fi
		4215	if test ! -z "${SSHLIBS}"; then
		4216	echo " +for ssh: ${SSHLIBS}"
4212	fi	4217	fi
4213		4218
4214	echo ""	4219	echo ""

Lines 830-839 main(int ac, char **av) Link Here

(-)ssh.c (-2 / +11 lines)
830	*/	830	*/
831	r = snprintf(buf, sizeof buf, "%s%s%s", pw->pw_dir,	831	r = snprintf(buf, sizeof buf, "%s%s%s", pw->pw_dir,
832	strcmp(pw->pw_dir, "/") ? "/" : "", _PATH_SSH_USER_DIR);	832	strcmp(pw->pw_dir, "/") ? "/" : "", _PATH_SSH_USER_DIR);
833	if (r > 0 && (size_t)r < sizeof(buf) && stat(buf, &st) < 0)	833	if (r > 0 && (size_t)r < sizeof(buf) && stat(buf, &st) < 0) {
		834	#ifdef WITH_SELINUX
		835	char *scon;
		836
		837	matchpathcon(buf, 0700, &scon);
		838	setfscreatecon(scon);
		839	#endif
834	if (mkdir(buf, 0700) < 0)	840	if (mkdir(buf, 0700) < 0)
835	error("Could not create directory '%.200s'.", buf);	841	error("Could not create directory '%.200s'.", buf);
836		842	#ifdef WITH_SELINUX
		843	setfscreatecon(NULL);
		844	#endif
		845	}
837	/* load options.identity_files */	846	/* load options.identity_files */
838	load_public_identity_files();	847	load_public_identity_files();
839		848

Lines 41-47 fi Link Here

(-)contrib/ssh-copy-id (-1 / +1 lines)
41	# strip any trailing colon	41	# strip any trailing colon
42	host=`echo $1 \| sed 's/:$//'`	42	host=`echo $1 \| sed 's/:$//'`
43		43
44	{ eval "$GET_ID" ; } \| ssh $host "umask 077; test -d ~/.ssh \|\| mkdir ~/.ssh ; cat >> ~/.ssh/authorized_keys" \|\| exit 1	44	{ eval "$GET_ID" ; } \| ssh $host "umask 077; test -d ~/.ssh \|\| mkdir ~/.ssh ; cat >> ~/.ssh/authorized_keys; test -x /sbin/restorecon && /sbin/restorecon ~/.ssh ~/.ssh/authorized_keys" \|\| exit 1
45		45
46	cat <<EOF	46	cat <<EOF
47	Now try logging into the machine, with "ssh '$host'", and check in:	47	Now try logging into the machine, with "ssh '$host'", and check in:

Lines 20-25 Link Here

(-)openbsd-compat/port-linux.h (+1 lines)
20	#define _PORT_LINUX_H	20	#define _PORT_LINUX_H
21		21
22	#ifdef WITH_SELINUX	22	#ifdef WITH_SELINUX
		23	#include <selinux/selinux.h>
23	int ssh_selinux_enabled(void);	24	int ssh_selinux_enabled(void);
24	void ssh_selinux_setup_pty(char , const char );	25	void ssh_selinux_setup_pty(char , const char );
25	void ssh_selinux_setup_exec_context(char *);	26	void ssh_selinux_setup_exec_context(char *);

Return to bug 1614