Fossil SCM
Don't prompt for password if user is not set.
Commit
fb0f926ed6a26c7f526deb85e1e4368bad21b3b0
Parent
90ee2ee528941db…
1 file changed
+4
-4
+4
-4
| --- src/sync.c | ||
| +++ src/sync.c | ||
| @@ -51,14 +51,14 @@ | ||
| 51 | 51 | } |
| 52 | 52 | url_parse(0, URL_REMEMBER); |
| 53 | 53 | if( g.urlProtocol==0 ) return 0; |
| 54 | 54 | if( ( g.urlUser!=0 || g.zFossilUser!=0 ) && g.urlPasswd==0 ){ |
| 55 | 55 | g.urlPasswd = unobscure(db_get("last-sync-pw", 0)); |
| 56 | - } | |
| 57 | - if( g.urlIsSsh && g.urlPasswd==0 ){ | |
| 58 | - g.urlFlags |= URL_PROMPT_PW; | |
| 59 | - url_prompt_for_password(); | |
| 56 | + if( g.urlIsSsh && g.urlPasswd==0 ){ | |
| 57 | + g.urlFlags |= URL_PROMPT_PW; | |
| 58 | + url_prompt_for_password(); | |
| 59 | + } | |
| 60 | 60 | } |
| 61 | 61 | #if 0 /* Disabled for now */ |
| 62 | 62 | if( (flags & AUTOSYNC_PULL)!=0 && db_get_boolean("auto-shun",1) ){ |
| 63 | 63 | /* When doing an automatic pull, also automatically pull shuns from |
| 64 | 64 | ** the server if pull_shuns is enabled. |
| 65 | 65 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -51,14 +51,14 @@ | |
| 51 | } |
| 52 | url_parse(0, URL_REMEMBER); |
| 53 | if( g.urlProtocol==0 ) return 0; |
| 54 | if( ( g.urlUser!=0 || g.zFossilUser!=0 ) && g.urlPasswd==0 ){ |
| 55 | g.urlPasswd = unobscure(db_get("last-sync-pw", 0)); |
| 56 | } |
| 57 | if( g.urlIsSsh && g.urlPasswd==0 ){ |
| 58 | g.urlFlags |= URL_PROMPT_PW; |
| 59 | url_prompt_for_password(); |
| 60 | } |
| 61 | #if 0 /* Disabled for now */ |
| 62 | if( (flags & AUTOSYNC_PULL)!=0 && db_get_boolean("auto-shun",1) ){ |
| 63 | /* When doing an automatic pull, also automatically pull shuns from |
| 64 | ** the server if pull_shuns is enabled. |
| 65 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -51,14 +51,14 @@ | |
| 51 | } |
| 52 | url_parse(0, URL_REMEMBER); |
| 53 | if( g.urlProtocol==0 ) return 0; |
| 54 | if( ( g.urlUser!=0 || g.zFossilUser!=0 ) && g.urlPasswd==0 ){ |
| 55 | g.urlPasswd = unobscure(db_get("last-sync-pw", 0)); |
| 56 | if( g.urlIsSsh && g.urlPasswd==0 ){ |
| 57 | g.urlFlags |= URL_PROMPT_PW; |
| 58 | url_prompt_for_password(); |
| 59 | } |
| 60 | } |
| 61 | #if 0 /* Disabled for now */ |
| 62 | if( (flags & AUTOSYNC_PULL)!=0 && db_get_boolean("auto-shun",1) ){ |
| 63 | /* When doing an automatic pull, also automatically pull shuns from |
| 64 | ** the server if pull_shuns is enabled. |
| 65 |