merging OPENSSH_5_2P1_SIMON_20090726_HPN13V6 to trunk:

[gssapi-openssh.git] / setup / setup-openssh.pl

diff --git a/setup/setup-openssh.pl b/setup/setup-openssh.pl
index 4aee12923dd3fde5ff381748e9ea8d980415d000..6a4cdd50db13f254b0dafc77ecf29ea87432baac 100644 (file)
--- a/setup/setup-openssh.pl
+++ b/setup/setup-openssh.pl
@@ -35,18 +35,6 @@ use Getopt::Long;
 use Cwd;
 use Cwd 'abs_path';
 
-#
-# modify the ld library path for when we call ssh executables
-#
-
-$oldldpath = $ENV{LD_LIBRARY_PATH};
-$newldpath = "$gpath/lib";
-if (length($oldldpath) > 0)
-{
-    $newldpath .= ":$oldldpath";
-}
-$ENV{LD_LIBRARY_PATH} = "$newldpath";
-
 #
 # i'm including this because other perl scripts in the gpt setup directories
 # do so
@@ -640,7 +628,7 @@ sub determineKeys
         $mainkeyfile = "$localsshdir/$basekeyfile";
         $mainpubkeyfile = "$localsshdir/$basekeyfile.pub";
 
-        if ( isReadable($mainkeyfile) && isReadable($mainpubkeyfile) )
+        if ( isPresent($mainkeyfile) && isPresent($mainpubkeyfile) )
         {
             push(@$linklist, $basekeyfile);
             $count++;
@@ -897,7 +885,7 @@ sub linkFile
 {
     my($src, $dest) = @_;
 
-    if ( !isReadable($src) )
+    if ( !isPresent($src) )
     {
         debug1("$src is not readable... not creating $dest.\n");
         return;
@@ -1083,11 +1071,11 @@ sub action
 
     debug1("$command\n");
 
-    my $result = system("LD_LIBRARY_PATH=\"$gpath/lib:\$LD_LIBRARY_PATH\"; $command >/dev/null 2>&1");
+    my $result = system("$command >/dev/null 2>&1");
 
     if (($result or $?) and $command !~ m!patch!)
     {
-        exitDie("ERROR: Unable to execute command: $!\n");
+        exitDie("ERROR: Unable to execute $command: $!\n");
     }
 }