Fix a mistake with pwcopy-related patches.

3 files changed, 29 insertions, 15 deletions

diff --git a/security/openssh/files/patch-ak b/security/openssh/files/patch-ak
index ab72c61830cf..33ac163f33de 100644
--- a/security/openssh/files/patch-ak
+++ b/security/openssh/files/patch-ak
@@ -1,6 +1,6 @@
---- ssh.c.orig	Sat Feb 19 23:57:54 2000
-+++ ssh.c	Mon Feb 28 04:49:22 2000
-@@ -131,6 +131,9 @@
+--- ssh.c.orig	Mon May  8 13:12:15 2000
++++ ssh.c	Sat May 13 15:17:33 2000
+@@ -154,6 +154,9 @@
  	log("Using rsh.  WARNING: Connection will not be encrypted.");
  	/* Build argument list for rsh. */
  	i = 0;
@@ -10,3 +10,15 @@
  	args[i++] = _PATH_RSH;
  	/* host may have to come after user on some systems */
  	args[i++] = host;
+@@ -477,6 +480,11 @@
+ 	pwcopy.pw_gid = pw->pw_gid;
+ 	pwcopy.pw_dir = xstrdup(pw->pw_dir);
+ 	pwcopy.pw_shell = xstrdup(pw->pw_shell);
++#ifdef __FreeBSD__
++	pwcopy.pw_class = xstrdup(pw->pw_class);
++ 	pwcopy.pw_expire = pw->pw_expire;
++ 	pwcopy.pw_change = pw->pw_change;
++#endif /* __FreeBSD__ */
+ 	pw = &pwcopy;
+ 
+ 	/* Initialize "log" output.  Since we are the client all output
diff --git a/security/openssh/files/patch-av b/security/openssh/files/patch-av
index 88cc6a43fd68..d781357fb1da 100644
--- a/security/openssh/files/patch-av
+++ b/security/openssh/files/patch-av
@@ -25,15 +25,3 @@
  	/* We found no reason not to let this user try to log on... */
  	return 1;
  }
-@@ -523,6 +532,11 @@
- 	pwcopy.pw_gid = pw->pw_gid;
- 	pwcopy.pw_dir = xstrdup(pw->pw_dir);
- 	pwcopy.pw_shell = xstrdup(pw->pw_shell);
-+#ifdef __FreeBSD__
-+	pwcopy.pw_class = xstrdup(pw->pw_class);
-+	pwcopy.pw_expire = pw->pw_expire;
-+	pwcopy.pw_change = pw->pw_change;
-+#endif /* __FreeBSD__ */
- 	pw = &pwcopy;
- 
- 	/*
diff --git a/security/openssh/files/patch-aw b/security/openssh/files/patch-aw
new file mode 100644
index 000000000000..dd187964ac7d
--- /dev/null
+++ b/security/openssh/files/patch-aw
@@ -0,0 +1,14 @@
+--- auth1.c.orig	Thu Apr 20 17:21:58 2000
++++ auth1.c	Thu Apr 20 17:50:06 2000
+@@ -523,6 +532,11 @@
+ 	pwcopy.pw_gid = pw->pw_gid;
+ 	pwcopy.pw_dir = xstrdup(pw->pw_dir);
+ 	pwcopy.pw_shell = xstrdup(pw->pw_shell);
++#ifdef __FreeBSD__
++	pwcopy.pw_class = xstrdup(pw->pw_class);
++	pwcopy.pw_expire = pw->pw_expire;
++	pwcopy.pw_change = pw->pw_change;
++#endif /* __FreeBSD__ */
+ 	pw = &pwcopy;
+ 
+ 	/*