Changeset - f90b55fcef6d
[Not reviewed]
default
0 1 0
Nathan Brink (binki) - 16 years ago 2009-08-03 23:38:39
ohnobinki@ohnopublishing.net
fixed errorneous references to aserver
1 file changed with 2 insertions and 2 deletions:
0 comments (0 inline, 0 general)
src/common/remoteio.c
Show inline comments
 
@@ -78,51 +78,51 @@ int remoteio_config(cfg_t *cfg, struct r
 

	
 
int remoteio_open(struct remoteio **rem, struct remoteio_opts *opts, const char *servername)
 
{
 
  char *userhost;
 
  char *sshargs[] = {opts->ssh_command, NULL /* userhost */, "distrend", "-d", (char *)NULL};
 
  
 
  int rtn;
 
  
 
  struct remoteio_server *theserver;
 

	
 
  theserver = remoteio_getserver(opts, servername);
 
  if(!theserver)
 
    {
 
      fprintf(stderr, "%s:%d: Could not find server named ``%s''\n", __FILE__, __LINE__, servername);
 
      return 1;
 
    }
 

	
 
  if(theserver->method != REMOTEIO_METHOD_SSH)
 
    {
 
      fprintf(stderr, "%s:%d: Unsupported remoteio method %d\n", __FILE__, __LINE__, theserver->method);
 
      return 1;
 
    }
 

	
 
  if(theserver->username)
 
    _distren_asprintf(&userhost, "%s@%s", aserver->username, aserver->hostname);
 
    _distren_asprintf(&userhost, "%s@%s", theserver->username, theserver->hostname);
 
  else
 
    userhost = strdup(aserver->hostname);
 
    userhost = strdup(theserver->hostname);
 
  sshargs[1] = userhost;
 

	
 
  *rem = malloc(sizeof(struct remoteio));
 
  rtn = execio_open( &(*rem)->execio, "ssh", sshargs);
 
  if(rtn)
 
    {
 
      fprintf(stderr, "error opening remoteio channel to server ``%s''" , servername);
 
      free(*rem);
 
      free(userhost);
 
      return 1;
 
    }
 
  free(userhost);
 
  
 
  return 0;
 
}
 

	
 

	
 
int remoteio_read(struct remoteio *rem, void *buf, size_t len, size_t *bytesread)
 
{
 
  return execio_read(rem->execio, buf, len, bytesread);
 
}
 

	
 
int remoteio_write(struct remoteio *rem, void *buf, size_t len, size_t *byteswritten)
 
{
0 comments (0 inline, 0 general)