From f94360c02ae90f70a61e7d1cb59062a32ba85fe3 Mon Sep 17 00:00:00 2001
From: Kent Peacock <kentp@fb.com>
Date: Aug 27 2022 18:12:40 +0000
Subject: Fix a bug in slog, and fix patches that had offsets in application.


---

diff --git a/fb87_log_accept_env.patch b/fb87_log_accept_env.patch
index 24ba1fc..cbb5c01 100644
--- a/fb87_log_accept_env.patch
+++ b/fb87_log_accept_env.patch
@@ -1,7 +1,8 @@
-diff --git a/session.c b/session.c
---- a/session.c
+Index: b/session.c
+===================================================================
+--- b.orig/session.c
 +++ b/session.c
-@@ -2106,16 +2106,16 @@
+@@ -2206,7 +2206,7 @@ session_env_req(struct ssh *ssh, Session
  
  	for (i = 0; i < options.num_accept_env; i++) {
  		if (match_pattern(name, options.accept_env[i])) {
@@ -10,8 +11,7 @@ diff --git a/session.c b/session.c
  			s->env = xrecallocarray(s->env, s->num_env,
  			    s->num_env + 1, sizeof(*s->env));
  			s->env[s->num_env].name = name;
- 			s->env[s->num_env].val = val;
- 			s->num_env++;
+@@ -2215,7 +2215,7 @@ session_env_req(struct ssh *ssh, Session
  			return (1);
  		}
  	}
diff --git a/fb87_pass_principals_to_child.patch b/fb87_pass_principals_to_child.patch
index 27bb7ca..742629a 100644
--- a/fb87_pass_principals_to_child.patch
+++ b/fb87_pass_principals_to_child.patch
@@ -1,5 +1,6 @@
-diff --git a/session.c b/session.c
---- a/session.c
+Index: b/session.c
+===================================================================
+--- b.orig/session.c
 +++ b/session.c
 @@ -98,6 +98,7 @@
  #include "atomicio.h"
@@ -9,7 +10,7 @@ diff --git a/session.c b/session.c
  
  #if defined(KRB5) && defined(USE_AFS)
  #include <kafs.h>
-@@ -990,11 +991,18 @@
+@@ -1054,11 +1055,18 @@ copy_environment(char **source, char ***
  static char **
  do_setup_env(struct ssh *ssh, Session *s, const char *shell)
  {
@@ -29,7 +30,7 @@ diff --git a/session.c b/session.c
  #if !defined (HAVE_LOGIN_CAP) && !defined (HAVE_CYGWIN)
  	char *path = NULL;
  #endif
-@@ -1188,9 +1196,57 @@
+@@ -1255,9 +1263,57 @@ do_setup_env(struct ssh *ssh, Session *s
  		child_set_env(&env, &envsize, "SSH_USER_AUTH", auth_info_file);
  	if (s->ttyfd != -1)
  		child_set_env(&env, &envsize, "SSH_TTY", s->tty);
@@ -88,8 +89,8 @@ diff --git a/session.c b/session.c
  
  	if (debug_flag) {
  		/* dump the environment */
-diff --git a/regress/cert-princ-env.sh b/regress/cert-princ-env.sh
-new file mode 100644
+Index: b/regress/cert-princ-env.sh
+===================================================================
 --- /dev/null
 +++ b/regress/cert-princ-env.sh
 @@ -0,0 +1,129 @@
diff --git a/fb87_slog.patch b/fb87_slog.patch
index 427cdda..e6e907b 100644
--- a/fb87_slog.patch
+++ b/fb87_slog.patch
@@ -671,7 +671,7 @@ Index: b/servconf.c
  		break;
  
 +	case sLogFormatPrefix:
-+		arg = strdelim(&str);
++		arg = argv_next(&ac, &av);
 +		if (!arg || *arg == '\0') {
 +			fatal("%.200s line %d: invalid log format prefix",
 +			    filename, linenum);
@@ -680,7 +680,7 @@ Index: b/servconf.c
 +		break;
 +
 +	case sLogFormatKeys:
-+		while ((arg = strdelim(&str)) && *arg != '\0') {
++		while ((arg = argv_next(&ac, &av)) && *arg != '\0') {
 +			if (options->num_log_format_keys >= MAX_LOGFORMAT_KEYS)
 +				fatal("%s line %d: too long format keys.",
 +				    filename, linenum);
diff --git a/openssh.spec b/openssh.spec
index d7d36e1..bc26594 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -7,7 +7,7 @@
 
 # Useful development mode for porting patches from
 # a different release
-%global use_quilt 0
+%global use_quilt 1
 
 %global _hardened_build 1