From ebb51c8cab53b71be0c200fc6e1e48bffcc0172f Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <dbelyavs@redhat.com>
Date: Oct 18 2024 14:14:10 +0000
Subject: Extra help information should not be printed if stderr is not a TTY


Resolves: RHEL-63061

---

diff --git a/openssh-8.7p1-redhat-help.patch b/openssh-8.7p1-redhat-help.patch
index 95d669c..3ffb657 100644
--- a/openssh-8.7p1-redhat-help.patch
+++ b/openssh-8.7p1-redhat-help.patch
@@ -1,17 +1,19 @@
 diff -up openssh-8.7p1/ssh.c.xxx openssh-8.7p1/ssh.c
 --- openssh-8.7p1/ssh.c.xxx	2024-09-11 14:24:06.711088878 +0200
 +++ openssh-8.7p1/ssh.c	2024-09-11 14:35:12.883765718 +0200
-@@ -175,6 +175,14 @@ extern int muxserver_sock;
+@@ -175,6 +175,16 @@ extern int muxserver_sock;
  extern u_int muxclient_command;
  
  /* Prints a help message to the user.  This function never returns. */
 +static void
 +redhat_usage(void)
 +{
++    if(isatty(fileno(stderr))) {
 +	fprintf(stderr,
 +"\nYou can find some explanations for typical errors at this link:\n"
 +"	    https://red.ht/support_rhel_ssh\n"
 +	);
++    }
 +}
  
  static void
diff --git a/openssh.spec b/openssh.spec
index 0c9168b..ef86af3 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -39,7 +39,7 @@
 %{?static_openssl:%global static_libcrypto 1}
 
 %global openssh_ver 9.9p1
-%global openssh_rel 2
+%global openssh_rel 3
 
 Summary: An open source implementation of SSH protocol version 2
 Name: openssh
@@ -656,6 +656,10 @@ test -f %{sysconfig_anaconda} && \
 %attr(0755,root,root) %{_libdir}/sshtest/sk-dummy.so
 
 %changelog
+* Fri Oct 18 2024 Dmitry Belyavskiy <dbelyavs@redhat.com> - 9.9p1-2
+- Extra help information should not be printed if stderr is not a TTY
+  Resolves: RHEL-63061
+
 * Tue Oct 15 2024 Dmitry Belyavskiy <dbelyavs@redhat.com> - 9.9p1-2
 - Resolve memory management issues after rebase
   Related: RHEL-60564