[Saga-devel] saga SVN commit 3345: /trunk/adaptors/ssh/ssh_file/

[amerzky at cct.lsu.edu]

User: amerzky
Date: 2009/01/21 06:44 PM

Modified:
 /trunk/adaptors/ssh/ssh_file/
  ssh_file_adaptor_sshfs.cpp, ssh_file_adaptor_sshfs.hpp

Log:
 fix

File Changes:

Directory: /trunk/adaptors/ssh/ssh_file/
========================================

File [modified]: ssh_file_adaptor_sshfs.cpp
Delta lines: +4 -1
===================================================================
--- trunk/adaptors/ssh/ssh_file/ssh_file_adaptor_sshfs.cpp	2009-01-21 23:45:15 UTC (rev 3344)
+++ trunk/adaptors/ssh/ssh_file/ssh_file_adaptor_sshfs.cpp	2009-01-22 00:44:31 UTC (rev 3345)
@@ -62,7 +62,8 @@
         ctx_  = contexts[i];
 
         // FIXME: check if attribs exist
-        user_ = ctx_.get_attribute ("UserID");
+        user_    = ctx_.get_attribute (saga::attributes::context_userid);
+        userkey_ = ctx_.get_attribute (saga::attributes::context_userkey);
 
         // the URL may actually have a userid fixed
         if ( "" != url_.get_userinfo () )
@@ -129,6 +130,7 @@
     //  
     //   proc.set_args (ssh_opt_);             // default options
     //   proc.add_args ("-p", port_s_);        // ssh port to use
+    //   proc.add_args ("-i", userkey_);       // ssh key to use
     //   proc.add_arg  (user_ + "@" + host_);  // remote mount point
     //   proc.add_arg  ("pwd");                // pwd command
     //   proc.add_arg  ("-P");                 // resolve symbolic links
@@ -218,6 +220,7 @@
 
       proc.set_args (sshfs_opt_);                 // default options
       proc.add_args ("-p", port_s_);              // ssh port to use
+      proc.add_args ("-i", userkey_);             // ssh key to use
       proc.add_arg  (user_ + "@" + host_ + ":/"); // remote mount point
       proc.add_arg  (mount_);                     // local mount point
       proc.run_sync ();

File [modified]: ssh_file_adaptor_sshfs.hpp
Delta lines: +1 -0
===================================================================
--- trunk/adaptors/ssh/ssh_file/ssh_file_adaptor_sshfs.hpp	2009-01-21 23:45:15 UTC (rev 3344)
+++ trunk/adaptors/ssh/ssh_file/ssh_file_adaptor_sshfs.hpp	2009-01-22 00:44:31 UTC (rev 3345)
@@ -30,6 +30,7 @@
       std::string   host_;       // remote host
       int           port_;       // ssh port on remote host
       std::string   port_s_;     // ssh port on remote host (string)
+      std::string   userkey_;    // ssh key
 
       std::string   mount_;      // local mountpoint
    // std::string   pwd_;        // remote pwd