Fossil SCM
Avoid prompting for the password for SSH syncs, since the password is never used. Omit debugging output on SSH syncs.
Commit
d1eb341f8020397940bcb14523c8543d5cfc8416
Parent
0c7ae64ab519d48…
3 files changed
+1
-1
+2
-2
+1
+1
-1
| --- src/http_transport.c | ||
| +++ src/http_transport.c | ||
| @@ -476,11 +476,11 @@ | ||
| 476 | 476 | return &transport.pBuf[iStart]; |
| 477 | 477 | } |
| 478 | 478 | |
| 479 | 479 | void transport_global_shutdown(void){ |
| 480 | 480 | if( g.urlIsSsh && sshPid ){ |
| 481 | - printf("Closing SSH tunnel: "); | |
| 481 | + /*printf("Closing SSH tunnel: ");*/ | |
| 482 | 482 | fflush(stdout); |
| 483 | 483 | pclose2(sshIn, sshOut, sshPid); |
| 484 | 484 | sshPid = 0; |
| 485 | 485 | } |
| 486 | 486 | if( g.urlIsHttps ){ |
| 487 | 487 |
| --- src/http_transport.c | |
| +++ src/http_transport.c | |
| @@ -476,11 +476,11 @@ | |
| 476 | return &transport.pBuf[iStart]; |
| 477 | } |
| 478 | |
| 479 | void transport_global_shutdown(void){ |
| 480 | if( g.urlIsSsh && sshPid ){ |
| 481 | printf("Closing SSH tunnel: "); |
| 482 | fflush(stdout); |
| 483 | pclose2(sshIn, sshOut, sshPid); |
| 484 | sshPid = 0; |
| 485 | } |
| 486 | if( g.urlIsHttps ){ |
| 487 |
| --- src/http_transport.c | |
| +++ src/http_transport.c | |
| @@ -476,11 +476,11 @@ | |
| 476 | return &transport.pBuf[iStart]; |
| 477 | } |
| 478 | |
| 479 | void transport_global_shutdown(void){ |
| 480 | if( g.urlIsSsh && sshPid ){ |
| 481 | /*printf("Closing SSH tunnel: ");*/ |
| 482 | fflush(stdout); |
| 483 | pclose2(sshIn, sshOut, sshPid); |
| 484 | sshPid = 0; |
| 485 | } |
| 486 | if( g.urlIsHttps ){ |
| 487 |
+2
-2
| --- src/sync.c | ||
| +++ src/sync.c | ||
| @@ -114,11 +114,11 @@ | ||
| 114 | 114 | if( zUrl==0 ){ |
| 115 | 115 | if( urlOptional ) fossil_exit(0); |
| 116 | 116 | usage("URL"); |
| 117 | 117 | } |
| 118 | 118 | url_parse(zUrl); |
| 119 | - if( g.urlUser!=0 && g.urlPasswd==0 ){ | |
| 119 | + if( g.urlUser!=0 && g.urlPasswd==0 && g.urlIsSsh==0 ){ | |
| 120 | 120 | if( zPw==0 ){ |
| 121 | 121 | url_prompt_for_password(); |
| 122 | 122 | }else{ |
| 123 | 123 | g.urlPasswd = mprintf("%s", zPw); |
| 124 | 124 | } |
| @@ -261,11 +261,11 @@ | ||
| 261 | 261 | if( fossil_strcmp(g.argv[2],"off")==0 ){ |
| 262 | 262 | db_unset("last-sync-url", 0); |
| 263 | 263 | db_unset("last-sync-pw", 0); |
| 264 | 264 | }else{ |
| 265 | 265 | url_parse(g.argv[2]); |
| 266 | - if( g.urlUser && g.urlPasswd==0 ){ | |
| 266 | + if( g.urlUser && g.urlPasswd==0 && g.urlIsSsh==0 ){ | |
| 267 | 267 | url_prompt_for_password(); |
| 268 | 268 | } |
| 269 | 269 | db_set("last-sync-url", g.urlCanonical, 0); |
| 270 | 270 | if( g.urlPasswd ){ |
| 271 | 271 | db_set("last-sync-pw", obscure(g.urlPasswd), 0); |
| 272 | 272 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -114,11 +114,11 @@ | |
| 114 | if( zUrl==0 ){ |
| 115 | if( urlOptional ) fossil_exit(0); |
| 116 | usage("URL"); |
| 117 | } |
| 118 | url_parse(zUrl); |
| 119 | if( g.urlUser!=0 && g.urlPasswd==0 ){ |
| 120 | if( zPw==0 ){ |
| 121 | url_prompt_for_password(); |
| 122 | }else{ |
| 123 | g.urlPasswd = mprintf("%s", zPw); |
| 124 | } |
| @@ -261,11 +261,11 @@ | |
| 261 | if( fossil_strcmp(g.argv[2],"off")==0 ){ |
| 262 | db_unset("last-sync-url", 0); |
| 263 | db_unset("last-sync-pw", 0); |
| 264 | }else{ |
| 265 | url_parse(g.argv[2]); |
| 266 | if( g.urlUser && g.urlPasswd==0 ){ |
| 267 | url_prompt_for_password(); |
| 268 | } |
| 269 | db_set("last-sync-url", g.urlCanonical, 0); |
| 270 | if( g.urlPasswd ){ |
| 271 | db_set("last-sync-pw", obscure(g.urlPasswd), 0); |
| 272 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -114,11 +114,11 @@ | |
| 114 | if( zUrl==0 ){ |
| 115 | if( urlOptional ) fossil_exit(0); |
| 116 | usage("URL"); |
| 117 | } |
| 118 | url_parse(zUrl); |
| 119 | if( g.urlUser!=0 && g.urlPasswd==0 && g.urlIsSsh==0 ){ |
| 120 | if( zPw==0 ){ |
| 121 | url_prompt_for_password(); |
| 122 | }else{ |
| 123 | g.urlPasswd = mprintf("%s", zPw); |
| 124 | } |
| @@ -261,11 +261,11 @@ | |
| 261 | if( fossil_strcmp(g.argv[2],"off")==0 ){ |
| 262 | db_unset("last-sync-url", 0); |
| 263 | db_unset("last-sync-pw", 0); |
| 264 | }else{ |
| 265 | url_parse(g.argv[2]); |
| 266 | if( g.urlUser && g.urlPasswd==0 && g.urlIsSsh==0 ){ |
| 267 | url_prompt_for_password(); |
| 268 | } |
| 269 | db_set("last-sync-url", g.urlCanonical, 0); |
| 270 | if( g.urlPasswd ){ |
| 271 | db_set("last-sync-pw", obscure(g.urlPasswd), 0); |
| 272 |
+1
| --- src/url.c | ||
| +++ src/url.c | ||
| @@ -390,9 +390,10 @@ | ||
| 390 | 390 | */ |
| 391 | 391 | void url_get_password_if_needed(void){ |
| 392 | 392 | if( (g.urlUser && g.urlUser[0]) |
| 393 | 393 | && (g.urlPasswd==0 || g.urlPasswd[0]==0) |
| 394 | 394 | && isatty(fileno(stdin)) |
| 395 | + && g.urlIsSsh==0 | |
| 395 | 396 | ){ |
| 396 | 397 | url_prompt_for_password(); |
| 397 | 398 | } |
| 398 | 399 | } |
| 399 | 400 |
| --- src/url.c | |
| +++ src/url.c | |
| @@ -390,9 +390,10 @@ | |
| 390 | */ |
| 391 | void url_get_password_if_needed(void){ |
| 392 | if( (g.urlUser && g.urlUser[0]) |
| 393 | && (g.urlPasswd==0 || g.urlPasswd[0]==0) |
| 394 | && isatty(fileno(stdin)) |
| 395 | ){ |
| 396 | url_prompt_for_password(); |
| 397 | } |
| 398 | } |
| 399 |
| --- src/url.c | |
| +++ src/url.c | |
| @@ -390,9 +390,10 @@ | |
| 390 | */ |
| 391 | void url_get_password_if_needed(void){ |
| 392 | if( (g.urlUser && g.urlUser[0]) |
| 393 | && (g.urlPasswd==0 || g.urlPasswd[0]==0) |
| 394 | && isatty(fileno(stdin)) |
| 395 | && g.urlIsSsh==0 |
| 396 | ){ |
| 397 | url_prompt_for_password(); |
| 398 | } |
| 399 | } |
| 400 |