From b6989502a56414ceec16da8fb399e49fd9b98f1a Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Mon, 21 Nov 2011 19:43:44 +0100
Subject: [PATCH] Add torque-fix-munge-rhbz#752079-PTII.patch

---
 torque-fix-munge-rhbz#752079-PTII.patch | 109 ++++++++++++++++++++++++
 torque.spec                             |   9 +-
 2 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100644 torque-fix-munge-rhbz#752079-PTII.patch

diff --git a/torque-fix-munge-rhbz#752079-PTII.patch b/torque-fix-munge-rhbz#752079-PTII.patch
new file mode 100644
index 0000000..c5b684a
--- /dev/null
+++ b/torque-fix-munge-rhbz#752079-PTII.patch
@@ -0,0 +1,109 @@
+*** process_request.c.orig	2011-11-08 14:20:50.000000000 +0100
+--- process_request.c	2011-11-08 17:15:21.000000000 +0100
+***************
+*** 539,564 ****
+  
+      if (ENABLE_TRUSTED_AUTH == TRUE )
+        rc = 0;  /* bypass the authentication of the user--trust the client completely */
+!     else if(munge_on)
+        {
+!       /* If munge_on is true we will validate the connection now */
+!       if ( request->rq_type == PBS_BATCH_AltAuthenUser)
+          {
+!         rc = req_altauthenuser(request);
+!         if (rc == PBSE_NONE)
+            {
+!           conn_credent[sfds].timestamp = time_now;
+!           svr_conn[sfds].cn_authen = PBS_NET_CONN_AUTHENTICATED;
+            }
+          return;
+          }
+        else
+!         {
+!         rc = authenticate_user(request, &conn_credent[sfds]);
+!         }
+        }
+-     else if (svr_conn[sfds].cn_authen != PBS_NET_CONN_AUTHENTICATED)
+-       rc = PBSE_BADCRED;
+      else
+        rc = authenticate_user(request, &conn_credent[sfds]);
+  
+--- 539,562 ----
+  
+      if (ENABLE_TRUSTED_AUTH == TRUE )
+        rc = 0;  /* bypass the authentication of the user--trust the client completely */
+!     else if (svr_conn[sfds].cn_authen != PBS_NET_CONN_AUTHENTICATED)
+        {
+!       if (munge_on && request->rq_type == PBS_BATCH_AltAuthenUser)
+          {
+!         /* If munge_on is true do the validation request now */
+!         if (request->rq_ind.rq_authen.rq_port !=  svr_conn[sfds].cn_port)
+!           {
+!           req_reject(PBSE_IVALREQ, 0, request, NULL, "Unexpected request to authenticate an alternate connection");
+!           }
+!         else
+            {
+!           req_altauthenuser(request);
+            }
+          return;
+          }
+        else
+!         rc = PBSE_BADCRED;
+        }
+      else
+        rc = authenticate_user(request, &conn_credent[sfds]);
+  
+***************
+*** 1032,1038 ****
+        break;
+  
+      case PBS_BATCH_AltAuthenUser:
+! 
+        break;
+  
+      case PBS_BATCH_JobObit:
+--- 1030,1036 ----
+        break;
+  
+      case PBS_BATCH_AltAuthenUser:
+!       req_reject(PBSE_IVALREQ, 0, request, NULL, "Unexpected request to authenticate at this point");
+        break;
+  
+      case PBS_BATCH_JobObit:
+*** req_getcred.c.orig	2011-11-08 17:27:36.000000000 +0100
+--- req_getcred.c	2011-11-08 17:20:18.000000000 +0100
+***************
+*** 365,371 ****
+  	  /* Something went wrong. We will have to depend on the parent
+  	     to let everyone know */
+  	  close(fd_pipe[1]);
+! 	  exit(0);
+  	  
+  	  }
+  
+--- 365,371 ----
+  	  /* Something went wrong. We will have to depend on the parent
+  	     to let everyone know */
+  	  close(fd_pipe[1]);
+! 	  _exit(0);
+  	  
+  	  }
+  
+***************
+*** 453,459 ****
+  
+    for (s = 0;s < PBS_NET_MAX_CONNECTIONS;++s)
+      {
+!     if (preq->rq_ind.rq_authen.rq_port != svr_conn[s].cn_port)
+        {
+        continue;
+        }
+--- 453,460 ----
+  
+    for (s = 0;s < PBS_NET_MAX_CONNECTIONS;++s)
+      {
+!     if (preq->rq_ind.rq_authen.rq_port != svr_conn[s].cn_port || 
+!              svr_conn[preq->rq_conn].cn_addr != svr_conn[s].cn_addr)
+        {
+        continue;
+        }
diff --git a/torque.spec b/torque.spec
index ac9c3db..5391757 100644
--- a/torque.spec
+++ b/torque.spec
@@ -68,7 +68,7 @@
 
 Name:        torque
 Version:     2.5.7
-Release:     6%{?dist}
+Release:     7%{?dist}
 Summary:     Tera-scale Open-source Resource and QUEue manager
 Source0:     http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz
 Source2:     xpbs.desktop
@@ -88,6 +88,7 @@ Patch2:      torque-initd-hangs-rhbz-744138.patch
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=752079
 Patch3:      torque-fix-munge-rhbz#752079.patch
+Patch4:      torque-fix-munge-rhbz#752079-PTII.patch
 
 
 License:     OpenPBS and TORQUEv1.1
@@ -348,6 +349,9 @@ DRMAA is "Distributed Resource Management Application API"
 %patch0 -p 1
 %patch2 -p 1
 %patch3 -p 2
+pushd src/server
+%patch4 -p 0
+popd
 install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
    %{SOURCE6} %{SOURCE8} .
 # rm x bit on some documentation.
@@ -796,6 +800,9 @@ fi
 %endif
 
 %changelog
+* Mon Nov 21 2011 Steve Traylen <steve.traylen@cern.ch> - 2.5.7-7
+- Add torque-fix-munge-rhbz#752079-PTII.patch
+
 * Thu Nov 17 2011 Steve Traylen <steve.traylen@cern.ch> - 2.5.7-6
 - Empty release for release mistake.