Attachment 304 Details for Bug 565 – Fix a few of these

[patch] Fix a few of these

types.diff (text/plain), 3.14 KB, created by Damien Miller on 2003-05-16 16:11:28 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2003-05-16 16:11:28 AEST

Size: 3.14 KB

patch

obsolete

>Index: authfile.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/authfile.c,v
>retrieving revision 1.53
>diff -u -r1.53 authfile.c
>--- authfile.c	11 May 2003 16:56:48 -0000	1.53
>+++ authfile.c	16 May 2003 06:07:01 -0000
>@@ -511,7 +511,7 @@
> 		error("@         WARNING: UNPROTECTED PRIVATE KEY FILE!          @");
> 		error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
> 		error("Permissions 0%3.3o for '%s' are too open.",
>-		    st.st_mode & 0777, filename);
>+		    (u_int)st.st_mode & 0777, filename);
> 		error("It is recommended that your private key files are NOT accessible by others.");
> 		error("This private key will be ignored.");
> 		return 0;
>Index: monitor.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/monitor.c,v
>retrieving revision 1.40
>diff -u -r1.40 monitor.c
>--- monitor.c	14 May 2003 08:57:49 -0000	1.40
>+++ monitor.c	16 May 2003 06:07:01 -0000
>@@ -1020,7 +1020,7 @@
> static void
> mm_session_close(Session *s)
> {
>-	debug3("%s: session %d pid %d", __func__, s->self, s->pid);
>+	debug3("%s: session %d pid %ld", __func__, s->self, (long)s->pid);
> 	if (s->ttyfd != -1) {
> 		debug3("%s: tty %s ptyfd %d",  __func__, s->tty, s->ptyfd);
> 		fatal_remove_cleanup(session_pty_cleanup2, (void *)s);
>Index: sftp-common.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/sftp-common.c,v
>retrieving revision 1.8
>diff -u -r1.8 sftp-common.c
>--- sftp-common.c	16 Oct 2002 14:31:48 -0000	1.8
>+++ sftp-common.c	16 May 2003 06:07:02 -0000
>@@ -206,8 +206,8 @@
> 		tbuf[0] = '\0';
> 	ulen = MAX(strlen(user), 8);
> 	glen = MAX(strlen(group), 8);
>-	snprintf(buf, sizeof buf, "%s %3d %-*s %-*s %8llu %s %s", mode,
>-	    st->st_nlink, ulen, user, glen, group,
>+	snprintf(buf, sizeof buf, "%s %3u %-*s %-*s %8llu %s %s", mode,
>+	    (u_int)st->st_nlink, ulen, user, glen, group,
> 	    (unsigned long long)st->st_size, tbuf, name);
> 	return xstrdup(buf);
> }
>Index: sshd.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/sshd.c,v
>retrieving revision 1.265
>diff -u -r1.265 sshd.c
>--- sshd.c	14 Apr 2003 14:17:50 -0000	1.265
>+++ sshd.c	16 May 2003 06:07:03 -0000
>@@ -556,7 +556,7 @@
> #else
> 	gidset[0] = pw->pw_gid;
> 	if (setgid(pw->pw_gid) < 0)
>-		fatal("setgid failed for %u", pw->pw_gid );
>+		fatal("setgid failed for %u", (u_int)pw->pw_gid );
> 	if (setgroups(1, gidset) < 0)
> 		fatal("setgroups: %.100s", strerror(errno));
> 	permanently_set_uid(pw);
>Index: sshpty.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/sshpty.c,v
>retrieving revision 1.8
>diff -u -r1.8 sshpty.c
>--- sshpty.c	3 Feb 2003 08:56:16 -0000	1.8
>+++ sshpty.c	16 May 2003 06:07:03 -0000
>@@ -290,10 +290,10 @@
> 			if (errno == EROFS &&
> 			    (st.st_mode & (S_IRGRP | S_IROTH)) == 0)
> 				debug("chmod(%.100s, 0%o) failed: %.100s",
>-				    ttyname, mode, strerror(errno));
>+				    ttyname, (u_int)mode, strerror(errno));
> 			else
> 				fatal("chmod(%.100s, 0%o) failed: %.100s",
>-				    ttyname, mode, strerror(errno));
>+				    ttyname, (u_int)mode, strerror(errno));
> 		}
> 	}
> }

Actions: View | Diff

Attachments on bug 565: 293 | 304 | 310 | 337