Differences From Artifact [58a793626f]:

• File src/user.c — part of check-in [5fdad9bd8c] at 2014-03-31 16:48:57 on branch trunk — Get rid of the GLOBAL_URL() kludge. Change the global "g" variable to contain an instance of the UrlData object instead of individual fields of the UrlData object. (user: drh size: 14436) [more...]

To Artifact [811c206e39]:

• File src/user.c — part of check-in [4306f0f3d6] at 2014-06-06 09:27:38 on branch trunk — When doing "fossil user default <username>", don't try to check the current default user for validity. (user: jan.nijtmans size: 14438) [more...]

246
247
248
249
250
251
252
253
254

255
256
257
258
259
260
261

    db_multi_exec(
      "INSERT INTO user(login,pw,cap,info,mtime)"
      "VALUES(%B,%Q,%B,%B,now())",
      &login, zPw, &caps, &contact
    );
    free(zPw);
  }else if( n>=2 && strncmp(g.argv[2],"default",n)==0 ){
    user_select();
    if( g.argc==3 ){

      fossil_print("%s\n", g.zLogin);
    }else{
      if( !db_exists("SELECT 1 FROM user WHERE login=%Q", g.argv[3]) ){
        fossil_fatal("no such user: %s", g.argv[3]);
      }
      if( g.localOpen ){
        db_lset("default-user", g.argv[3]);

<

>

246
247
248
249
250
251
252

253
254
255
256
257
258
259
260
261

    db_multi_exec(
      "INSERT INTO user(login,pw,cap,info,mtime)"
      "VALUES(%B,%Q,%B,%B,now())",
      &login, zPw, &caps, &contact
    );
    free(zPw);
  }else if( n>=2 && strncmp(g.argv[2],"default",n)==0 ){

    if( g.argc==3 ){
      user_select();
      fossil_print("%s\n", g.zLogin);
    }else{
      if( !db_exists("SELECT 1 FROM user WHERE login=%Q", g.argv[3]) ){
        fossil_fatal("no such user: %s", g.argv[3]);
      }
      if( g.localOpen ){
        db_lset("default-user", g.argv[3]);