From 6eee81cbe2a5efbda0699229187de8aada5fe1ce Mon Sep 17 00:00:00 2001 From: David McKnight Date: Mon, 16 Aug 2010 02:31:18 +0000 Subject: [PATCH] [270833] Unify rseserver auth.pl to not use "su -p" on any Platform --- .../serverruntime/scripts/linux/auth.pl | 13 +++---------- .../serverruntime/scripts/unix/auth.pl | 11 ++--------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/auth.pl b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/auth.pl index 32ba47260c6..9275f7e0fc4 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/auth.pl +++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/auth.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w #******************************************************************************* -# Copyright (c) 2005, 2009 IBM Corporation and others. +# Copyright (c) 2005, 2010 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -10,6 +10,7 @@ # IBM Corporation - initial API and implementation # David McKnight (IBM) - [254785] [dstore] RSE Server assumes home directory on target machine # David McKnight (IBM) - [262013] [dstore][unix] RSE Daemon fails to start server on HP-UX +# David McKnight (IBM) - [270833] Unify rseserver auth.pl to not use "su -p" on any Platform #******************************************************************************* use Shell; @@ -56,20 +57,12 @@ else $encryptedPWD = crypt($pwdIN, $passwd); $classpath=$ENV{CLASSPATH}; - $suOptions="-p"; + $suOptions="-"; if ($passwd eq $encryptedPWD) { print("success\n"); - $os = uname(); - chomp($os); - - if (lc($os) eq "aix" || lc($os) eq "HP-UX") - { - $suOptions="-"; - } - # check for the existence of a home directory $homeDir=$dir; if (!(-e $homeDir)) diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/auth.pl b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/auth.pl index 412c28ad530..9bb3b274486 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/auth.pl +++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/auth.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w #******************************************************************************* -# Copyright (c) 2005, 2009 IBM Corporation and others. +# Copyright (c) 2005, 2010 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -11,6 +11,7 @@ # David McKnight (IBM) - [254785] [dstore] RSE Server assumes home directory on target machine # David McKnight (IBM) - [262013] [dstore][unix] RSE Daemon fails to start server on HP-UX # David McKnight (IBM) - [270015] rseserver fails to run on FreeBSD. +# David McKnight (IBM) - [270833] Unify rseserver auth.pl to not use "su -p" on any Platform #******************************************************************************* use Shell; @@ -63,14 +64,6 @@ else { print("success\n"); - $os = uname(); - chomp($os); - - if (lc($os) eq "linux") - { - $suOptions="-p"; - } - # check for the existence of a home directory $homeDir=$dir; if (!(-e $homeDir))