Fossil

Differences From Artifact [aacc5b4b80]:

• File src/url.c — part of check-in [a01c714c3a] at 2013-11-02 06:17:53 on branch url-password-fixes — 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. (user: andybradford size: 14024)

To Artifact [b322c409a1]:

• File src/url.c — part of check-in [34b2f0675b] at 2013-11-02 06:19:20 on branch url-password-fixes — Only prompt to save the password if there is a tty. (user: andybradford size: 14049)

226
227
228
229
230
231
232
233
234
235
236
237
238
239
240

    g.urlName = mprintf("%b", &cfile);
    g.urlCanonical = mprintf("file://%T", g.urlName);
    blob_reset(&cfile);
  }else if( g.urlUser!=0 && g.urlPasswd==0 && (urlFlags & URL_PROMPT_PW) ){
    url_prompt_for_password();
    bPrompted = 1;
  }else if( g.urlUser!=0 && ( urlFlags & URL_ASK_REMEMBER_PW ) &&
            save_password_prompt() ){
    g.urlFlags = urlFlags |= URL_REMEMBER_PW;
  }
  if( urlFlags & URL_REMEMBER ){
    if( bSetUrl ){
      db_set("last-sync-url", g.urlCanonical, 0);
    }
    if( !bPrompted && g.urlPasswd && g.urlUser ){

|

226
227
228
229
230
231
232
233
234
235
236
237
238
239
240

    g.urlName = mprintf("%b", &cfile);
    g.urlCanonical = mprintf("file://%T", g.urlName);
    blob_reset(&cfile);
  }else if( g.urlUser!=0 && g.urlPasswd==0 && (urlFlags & URL_PROMPT_PW) ){
    url_prompt_for_password();
    bPrompted = 1;
  }else if( g.urlUser!=0 && ( urlFlags & URL_ASK_REMEMBER_PW ) &&
            isatty(fileno(stdin)) && save_password_prompt() ){
    g.urlFlags = urlFlags |= URL_REMEMBER_PW;
  }
  if( urlFlags & URL_REMEMBER ){
    if( bSetUrl ){
      db_set("last-sync-url", g.urlCanonical, 0);
    }
    if( !bPrompted && g.urlPasswd && g.urlUser ){