Changeset ad3ce5b in git


Ignore:
Timestamp:
Feb 8, 2021, 3:44:58 PM (3 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd25190065115c859833252500a64cfb7b11e3a50')
Children:
10ea86a93465b7a864163533f6c6a52f9622d649
Parents:
05c6aa046ecb829a56d4e4271378716a2b3b1148
Message:
fix: avoid "ssh localhost" on ssi tcp links
File:
1 edited

Legend:

Unmodified
Added
Removed
  • Singular/links/ssiLink.cc

    r05c6aa0 rad3ce5b  
    952952          sigprocmask(SIG_BLOCK, &sigint, NULL);
    953953          /* set #cpu to 1 for the child:*/
    954           feSetOptValue(FE_OPT_CPUS,1);
     954          feSetOptValue(FE_OPT_CPUS,1);
    955955
    956956          link_list hh=(link_list)ssiToBeClosed->next;
     
    11421142        char* ser_host = (char*)omAlloc(64);
    11431143        gethostname(ser_host,64);
    1144         sprintf(ssh_command,"ssh %s %s -q --batch --link=ssi --MPhost=%s --MPport=%d &",cli_host,path,ser_host,portno);
     1144        if (strcmp(cli_host,"localhost")==0) /*avoid "ssh localhost" as key may change*/
     1145          sprintf(ssh_command,"%s -q --batch --link=ssi --MPhost=%s --MPport=%d &",path,ser_host,portno);
     1146        else
     1147          sprintf(ssh_command,"ssh %s %s -q --batch --link=ssi --MPhost=%s --MPport=%d &",cli_host,path,ser_host,portno);
    11451148        //Print("client on %s started:%s\n",cli_host,path);
    11461149        omFree(path);
Note: See TracChangeset for help on using the changeset viewer.