Fossil SCM
Prompt for the password whenever a URL is supplied that contains a username but no password.
Commit
99a98377ecc0c4b8ce3f79007122330ba229dd27
Parent
03ed08364b252a5…
1 file changed
+5
-1
+5
-1
| --- src/sync.c | ||
| +++ src/sync.c | ||
| @@ -100,11 +100,15 @@ | ||
| 100 | 100 | if( !g.dontKeepUrl ){ |
| 101 | 101 | db_set("last-sync-url", g.urlCanonical, 0); |
| 102 | 102 | if( g.urlPasswd ) db_set("last-sync-pw", g.urlPasswd, 0); |
| 103 | 103 | } |
| 104 | 104 | if( g.urlUser!=0 && g.urlPasswd==0 ){ |
| 105 | - g.urlPasswd = mprintf("%s", zPw); | |
| 105 | + if( zPw==0 ){ | |
| 106 | + url_prompt_for_password(); | |
| 107 | + }else{ | |
| 108 | + g.urlPasswd = mprintf("%s", zPw); | |
| 109 | + } | |
| 106 | 110 | } |
| 107 | 111 | user_select(); |
| 108 | 112 | if( g.argc==2 ){ |
| 109 | 113 | printf("Server: %s\n", g.urlCanonical); |
| 110 | 114 | } |
| 111 | 115 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -100,11 +100,15 @@ | |
| 100 | if( !g.dontKeepUrl ){ |
| 101 | db_set("last-sync-url", g.urlCanonical, 0); |
| 102 | if( g.urlPasswd ) db_set("last-sync-pw", g.urlPasswd, 0); |
| 103 | } |
| 104 | if( g.urlUser!=0 && g.urlPasswd==0 ){ |
| 105 | g.urlPasswd = mprintf("%s", zPw); |
| 106 | } |
| 107 | user_select(); |
| 108 | if( g.argc==2 ){ |
| 109 | printf("Server: %s\n", g.urlCanonical); |
| 110 | } |
| 111 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -100,11 +100,15 @@ | |
| 100 | if( !g.dontKeepUrl ){ |
| 101 | db_set("last-sync-url", g.urlCanonical, 0); |
| 102 | if( g.urlPasswd ) db_set("last-sync-pw", g.urlPasswd, 0); |
| 103 | } |
| 104 | if( g.urlUser!=0 && g.urlPasswd==0 ){ |
| 105 | if( zPw==0 ){ |
| 106 | url_prompt_for_password(); |
| 107 | }else{ |
| 108 | g.urlPasswd = mprintf("%s", zPw); |
| 109 | } |
| 110 | } |
| 111 | user_select(); |
| 112 | if( g.argc==2 ){ |
| 113 | printf("Server: %s\n", g.urlCanonical); |
| 114 | } |
| 115 |