Fossil SCM
It appears that calls to url_parse(0,x) are used to establish who the user is using user_select(). In this case we should not overwrite a password that has been provided prior to calling user_select() with one from the database.
Commit
a01c714c3ae01318e3eda1078b314ac527a5e224
Parent
8bdc3ccd2bb8bb6…
1 file changed
+3
-1
+3
-1
| --- src/url.c | ||
| +++ src/url.c | ||
| @@ -76,11 +76,13 @@ | ||
| 76 | 76 | int bSetUrl = 1; |
| 77 | 77 | |
| 78 | 78 | if( zUrl==0 ){ |
| 79 | 79 | zUrl = db_get("last-sync-url", 0); |
| 80 | 80 | if( zUrl==0 ) return; |
| 81 | - g.urlPasswd = unobscure(db_get("last-sync-pw", 0)); | |
| 81 | + if( g.urlPasswd==0 ){ | |
| 82 | + g.urlPasswd = unobscure(db_get("last-sync-pw", 0)); | |
| 83 | + } | |
| 82 | 84 | bSetUrl = 0; |
| 83 | 85 | } |
| 84 | 86 | |
| 85 | 87 | if( strncmp(zUrl, "http://", 7)==0 |
| 86 | 88 | || strncmp(zUrl, "https://", 8)==0 |
| 87 | 89 |
| --- src/url.c | |
| +++ src/url.c | |
| @@ -76,11 +76,13 @@ | |
| 76 | int bSetUrl = 1; |
| 77 | |
| 78 | if( zUrl==0 ){ |
| 79 | zUrl = db_get("last-sync-url", 0); |
| 80 | if( zUrl==0 ) return; |
| 81 | g.urlPasswd = unobscure(db_get("last-sync-pw", 0)); |
| 82 | bSetUrl = 0; |
| 83 | } |
| 84 | |
| 85 | if( strncmp(zUrl, "http://", 7)==0 |
| 86 | || strncmp(zUrl, "https://", 8)==0 |
| 87 |
| --- src/url.c | |
| +++ src/url.c | |
| @@ -76,11 +76,13 @@ | |
| 76 | int bSetUrl = 1; |
| 77 | |
| 78 | if( zUrl==0 ){ |
| 79 | zUrl = db_get("last-sync-url", 0); |
| 80 | if( zUrl==0 ) return; |
| 81 | if( g.urlPasswd==0 ){ |
| 82 | g.urlPasswd = unobscure(db_get("last-sync-pw", 0)); |
| 83 | } |
| 84 | bSetUrl = 0; |
| 85 | } |
| 86 | |
| 87 | if( strncmp(zUrl, "http://", 7)==0 |
| 88 | || strncmp(zUrl, "https://", 8)==0 |
| 89 |