Attachment 8256 Details for Bug 17360 – file.diff

[patch] file.diff

file.diff (text/plain), 1.27 KB, created by ajk on 2000-03-13 19:00:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ajk

Created: 2000-03-13 19:00:02 UTC

Size: 1.27 KB

patch

obsolete

>Index: pam_ssh.c
>===================================================================
>RCS file: /var/cvs/src/crypto/openssh/pam_ssh/pam_ssh.c,v
>retrieving revision 1.3
>diff -U2 -r1.3 pam_ssh.c
>--- pam_ssh.c	2000/02/26 09:59:14	1.3
>+++ pam_ssh.c	2000/03/13 18:36:44
>@@ -1,4 +1,4 @@
> /*-
>- * Copyright (c) 1999 Andrew J. Korty
>+ * Copyright (c) 1999, 2000 Andrew J. Korty
>  * All rights reserved.
>  *
>@@ -31,4 +31,5 @@
> #include <sys/param.h>
> #include <sys/queue.h>
>+#include <sys/stat.h>
> 
> #include <fcntl.h>
>@@ -121,5 +122,5 @@
> 
> static int
>-env_put(ENV *self, char *s)
>+env_put(ENV *self, const char *s)
> {
> 	struct env_entry	*env;
>@@ -137,5 +138,5 @@
> 
> static void
>-env_swap(ENV *self, int which)
>+env_swap(const ENV *self, int which)
> {
> 	environ = which ? self->e_environ_new : self->e_environ_orig;
>@@ -174,7 +175,8 @@
> 
> 	env_swap(self, 0);
>-	SLIST_FOREACH(p, &self->e_head, ee_entries) {
>+	while ((p = SLIST_FIRST(&self->e_head))) {
> 		free(p->ee_env);
> 		free(p);
>+		SLIST_REMOVE_HEAD(&self->e_head, ee_entries);
> 	}
> 	if (self->e_committed)
>@@ -366,5 +368,6 @@
> 	saved_uid = geteuid();
> 	(void)seteuid(pwent->pw_uid);
>-	env_fp = fopen(env_file, "w");
>+	if ((env_fp = fopen(env_file, "w")))
>+		(void)chmod(env_file, S_IRUSR);
> 	pipe = popen(PATH_SSH_AGENT, "r");
> 	(void)seteuid(saved_uid);

Actions: View | Diff

Attachments on bug 17360: 8256