Changeset ad3ce5b in git

Timestamp:

Feb 8, 2021, 3:44:58 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')

Children:

10ea86a93465b7a864163533f6c6a52f9622d649

Parents:

05c6aa046ecb829a56d4e4271378716a2b3b1148

Message:

fix: avoid "ssh localhost" on ssi tcp links

File:

• Singular/links/ssiLink.cc (modified) (2 diffs)

Singular/links/ssiLink.cc

@@ -952 +952 @@
           sigprocmask(SIG_BLOCK, &sigint, NULL);
           /* set #cpu to 1 for the child:*/
-          feSetOptValue(FE_OPT_CPUS,1);
+          feSetOptValue(FE_OPT_CPUS,1);
 
           link_list hh=(link_list)ssiToBeClosed->next;
@@ -1142 +1142 @@
         char* ser_host = (char*)omAlloc(64);
         gethostname(ser_host,64);
-        sprintf(ssh_command,"ssh %s %s -q --batch --link=ssi --MPhost=%s --MPport=%d &",cli_host,path,ser_host,portno);
+        if (strcmp(cli_host,"localhost")==0) /*avoid "ssh localhost" as key may change*/
+          sprintf(ssh_command,"%s -q --batch --link=ssi --MPhost=%s --MPport=%d &",path,ser_host,portno);
+        else
+          sprintf(ssh_command,"ssh %s %s -q --batch --link=ssi --MPhost=%s --MPport=%d &",cli_host,path,ser_host,portno);
         //Print("client on %s started:%s\n",cli_host,path);
         omFree(path);