jjelen pushed to openssh (f22). "Fix audit_end_command to restore ControlPersist function (#1203900)"

[notifications at fedoraproject.org]

>From f78ec07f4b952744f7ef0b18796b4005618842e4 Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen at redhat.com>
Date: Thu, 2 Apr 2015 17:24:56 +0200
Subject: Fix audit_end_command to restore ControlPersist function (#1203900)


diff --git a/openssh-6.7p1-audit.patch b/openssh-6.7p1-audit.patch
index 4a06b32..213ca67 100644
--- a/openssh-6.7p1-audit.patch
+++ b/openssh-6.7p1-audit.patch
@@ -1942,7 +1942,7 @@ diff -up openssh-6.8p1/session.c.audit openssh-6.8p1/session.c
  session_by_tty(char *tty)
  {
  	int i;
-@@ -2532,6 +2561,31 @@ session_exit_message(Session *s, int sta
+@@ -2532,6 +2561,32 @@ session_exit_message(Session *s, int sta
  		chan_write_failed(c);
  }
  
@@ -1951,7 +1951,7 @@ diff -up openssh-6.8p1/session.c.audit openssh-6.8p1/session.c
 +session_end_command2(Session *s)
 +{
 +	if (s->command != NULL) {
-+		if (s->ptyfd == -1)
++		if (s->command_handle != -1)
 +			audit_end_command(s->command_handle, s->command);
 +		free(s->command);
 +		s->command = NULL;
@@ -1963,7 +1963,8 @@ diff -up openssh-6.8p1/session.c.audit openssh-6.8p1/session.c
 +session_end_command(Session *s)
 +{
 +	if (s->command != NULL) {
-+		PRIVSEP(audit_end_command(s->command_handle, s->command));
++		if (s->command_handle != -1)
++			PRIVSEP(audit_end_command(s->command_handle, s->command));
 +		free(s->command);
 +		s->command = NULL;
 +		s->command_handle = -1;
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/openssh.git/commit/?h=f22&id=f78ec07f4b952744f7ef0b18796b4005618842e4