Fossil SCM
Wait to record the sync password until after the user has actually entered the sync password. Ticket [8b46db87f1bfa942b]
Commit
328fc92ceb318278b74382888c58cdf202d89933
Parent
a04a6508708f78c…
1 file changed
+4
-4
+4
-4
| --- src/sync.c | ||
| +++ src/sync.c | ||
| @@ -103,21 +103,21 @@ | ||
| 103 | 103 | if( zUrl==0 ){ |
| 104 | 104 | if( urlOptional ) fossil_exit(0); |
| 105 | 105 | usage("URL"); |
| 106 | 106 | } |
| 107 | 107 | url_parse(zUrl); |
| 108 | - if( !g.dontKeepUrl ){ | |
| 109 | - db_set("last-sync-url", g.urlCanonical, 0); | |
| 110 | - if( g.urlPasswd ) db_set("last-sync-pw", obscure(g.urlPasswd), 0); | |
| 111 | - } | |
| 112 | 108 | if( g.urlUser!=0 && g.urlPasswd==0 ){ |
| 113 | 109 | if( zPw==0 ){ |
| 114 | 110 | url_prompt_for_password(); |
| 115 | 111 | }else{ |
| 116 | 112 | g.urlPasswd = mprintf("%s", zPw); |
| 117 | 113 | } |
| 118 | 114 | } |
| 115 | + if( !g.dontKeepUrl ){ | |
| 116 | + db_set("last-sync-url", g.urlCanonical, 0); | |
| 117 | + if( g.urlPasswd ) db_set("last-sync-pw", obscure(g.urlPasswd), 0); | |
| 118 | + } | |
| 119 | 119 | user_select(); |
| 120 | 120 | if( g.argc==2 ){ |
| 121 | 121 | printf("Server: %s\n", g.urlCanonical); |
| 122 | 122 | } |
| 123 | 123 | url_enable_proxy("via proxy: "); |
| 124 | 124 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -103,21 +103,21 @@ | |
| 103 | if( zUrl==0 ){ |
| 104 | if( urlOptional ) fossil_exit(0); |
| 105 | usage("URL"); |
| 106 | } |
| 107 | url_parse(zUrl); |
| 108 | if( !g.dontKeepUrl ){ |
| 109 | db_set("last-sync-url", g.urlCanonical, 0); |
| 110 | if( g.urlPasswd ) db_set("last-sync-pw", obscure(g.urlPasswd), 0); |
| 111 | } |
| 112 | if( g.urlUser!=0 && g.urlPasswd==0 ){ |
| 113 | if( zPw==0 ){ |
| 114 | url_prompt_for_password(); |
| 115 | }else{ |
| 116 | g.urlPasswd = mprintf("%s", zPw); |
| 117 | } |
| 118 | } |
| 119 | user_select(); |
| 120 | if( g.argc==2 ){ |
| 121 | printf("Server: %s\n", g.urlCanonical); |
| 122 | } |
| 123 | url_enable_proxy("via proxy: "); |
| 124 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -103,21 +103,21 @@ | |
| 103 | if( zUrl==0 ){ |
| 104 | if( urlOptional ) fossil_exit(0); |
| 105 | usage("URL"); |
| 106 | } |
| 107 | url_parse(zUrl); |
| 108 | if( g.urlUser!=0 && g.urlPasswd==0 ){ |
| 109 | if( zPw==0 ){ |
| 110 | url_prompt_for_password(); |
| 111 | }else{ |
| 112 | g.urlPasswd = mprintf("%s", zPw); |
| 113 | } |
| 114 | } |
| 115 | if( !g.dontKeepUrl ){ |
| 116 | db_set("last-sync-url", g.urlCanonical, 0); |
| 117 | if( g.urlPasswd ) db_set("last-sync-pw", obscure(g.urlPasswd), 0); |
| 118 | } |
| 119 | user_select(); |
| 120 | if( g.argc==2 ){ |
| 121 | printf("Server: %s\n", g.urlCanonical); |
| 122 | } |
| 123 | url_enable_proxy("via proxy: "); |
| 124 |