From 75d37c0a6fe3b2c3cb32c5d470a6ac88ae5b386d Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Sun, 29 Apr 2012 00:13:35 +0000 Subject: [PATCH] Revert "Fix problem where unauthorized users could indefinitely hold an xcatd slot open so long as they stayed connected" This reverts commit 293f2194c6fe119e71e3c053c3894748a44f9e7e. Doing it a better way git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12392 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/sbin/xcatd | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd index 3615164f6..06ccf66d0 100755 --- a/xCAT-server/sbin/xcatd +++ b/xCAT-server/sbin/xcatd @@ -1688,10 +1688,9 @@ sub service_connection { my $request; my $req=undef; alarm(15); - my $line; - while (alarm (15) and $line = <$sock>) { + while (<$sock>) { alarm(0); - $request .= $line; + $request .= $_; #$req = eval { XMLin($request, ForceArray => [ 'attribute' , 'attributepair' ]) }; if (m/<\/xcatrequest>/) { $req = eval { XMLin($request, SuppressEmpty=>undef,ForceArray=>1) };