Attachment #2035 for bug #1893

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

Lines 57-62 Link Here

(-)openssh-5.8p1/authfile.c.keyperm (+8 lines)
57	#include <stdlib.h>	57	#include <stdlib.h>
58	#include <string.h>	58	#include <string.h>
59	#include <unistd.h>	59	#include <unistd.h>
		60	#include <grp.h>
60		61
61	#include "xmalloc.h"	62	#include "xmalloc.h"
62	#include "cipher.h"	63	#include "cipher.h"
Lines 600-605 key_perm_ok(int fd, const char *filename Link Here
600	#ifdef HAVE_CYGWIN	601	#ifdef HAVE_CYGWIN
601	if (check_ntsec(filename))	602	if (check_ntsec(filename))
602	#endif	603	#endif
		604	if (st.st_mode & 040) {
		605	struct group *gr;
		606
		607	if ((gr = getgrnam("ssh_keys")) && (st.st_gid == gr->gr_gid))
		608	st.st_mode &= ~040;
		609	}
		610
603	if ((st.st_uid == getuid()) && (st.st_mode & 077) != 0) {	611	if ((st.st_uid == getuid()) && (st.st_mode & 077) != 0) {
604	error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");	612	error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
605	error("@ WARNING: UNPROTECTED PRIVATE KEY FILE! @");	613	error("@ WARNING: UNPROTECTED PRIVATE KEY FILE! @");

Lines 268-274 install-files: Link Here

(-)openssh-5.8p1/Makefile.in.keyperm (-1 / +1 lines)
268	if test ! -z "$(INSTALL_SSH_RAND_HELPER)" ; then \	268	if test ! -z "$(INSTALL_SSH_RAND_HELPER)" ; then \
269	$(INSTALL) -m 0755 $(STRIP_OPT) ssh-rand-helper$(EXEEXT) $(DESTDIR)$(libexecdir)/ssh-rand-helper$(EXEEXT) ; \	269	$(INSTALL) -m 0755 $(STRIP_OPT) ssh-rand-helper$(EXEEXT) $(DESTDIR)$(libexecdir)/ssh-rand-helper$(EXEEXT) ; \
270	fi	270	fi
271	$(INSTALL) -m 2711 -g ssh_keys $(STRIP_OPT) ssh-keysign$(EXEEXT) $(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT)	271	$(INSTALL) -m 4711 $(STRIP_OPT) ssh-keysign$(EXEEXT) $(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT)
272	$(INSTALL) -m 0755 $(STRIP_OPT) ssh-pkcs11-helper$(EXEEXT) $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT)	272	$(INSTALL) -m 0755 $(STRIP_OPT) ssh-pkcs11-helper$(EXEEXT) $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT)
273	$(INSTALL) -m 0755 $(STRIP_OPT) sftp$(EXEEXT) $(DESTDIR)$(bindir)/sftp$(EXEEXT)	273	$(INSTALL) -m 0755 $(STRIP_OPT) sftp$(EXEEXT) $(DESTDIR)$(bindir)/sftp$(EXEEXT)
274	$(INSTALL) -m 0755 $(STRIP_OPT) sftp-server$(EXEEXT) $(DESTDIR)$(SFTP_SERVER)$(EXEEXT)	274	$(INSTALL) -m 0755 $(STRIP_OPT) sftp-server$(EXEEXT) $(DESTDIR)$(SFTP_SERVER)$(EXEEXT)

Return to bug 1893