Fossil SCM

In /setup_uedit, rename the locally-shadowed zCap to aCap to avoid confusion in a pending change. No functional changes.

stephan 2025-03-08 11:17 trunk
Commit 74b149f2e25916f0d0d491ce3fad438574026d4974f46a18ba090b4a5e78492c
Parent af57f63dee2822a…
1 file changed +9 -9
~ src/setupuser.c
M src/setupuser.c
+9 -9
--- src/setupuser.c
+++ src/setupuser.c
@@ -393,30 +393,30 @@
393393
 }else if( !cgi_csrf_safe(2) ){
394394
 /* This might be a cross-site request forgery, so ignore it */
395395
 }else{
396396
 /* We have all the information we need to make the change to the user */
397397
 char c;
398
- char zCap[70], zNm[4];
398
+ char aCap[70], zNm[4];
399399
 zNm[0] = 'a';
400400
 zNm[2] = 0;
401401
 for(i=0, c='a'; c<='z'; c++){
402402
 zNm[1] = c;
403403
 a[c&0x7f] = ((c!='s' && c!='y') || g.perm.Setup) && P(zNm)!=0;
404
- if( a[c&0x7f] ) zCap[i++] = c;
404
+ if( a[c&0x7f] ) aCap[i++] = c;
405405
 }
406406
 for(c='0'; c<='9'; c++){
407407
 zNm[1] = c;
408408
 a[c&0x7f] = P(zNm)!=0;
409
- if( a[c&0x7f] ) zCap[i++] = c;
409
+ if( a[c&0x7f] ) aCap[i++] = c;
410410
 }
411411
 for(c='A'; c<='Z'; c++){
412412
 zNm[1] = c;
413413
 a[c&0x7f] = P(zNm)!=0;
414
- if( a[c&0x7f] ) zCap[i++] = c;
414
+ if( a[c&0x7f] ) aCap[i++] = c;
415415
 }
416416
417
- zCap[i] = 0;
417
+ aCap[i] = 0;
418418
 zPw = P("pw");
419419
 zLogin = P("login");
420420
 if( strlen(zLogin)==0 ){
421421
 const char *zRef = cgi_referer("setup_ulist");
422422
 style_header("User Creation Error");
@@ -447,11 +447,11 @@
447447
 cgi_csrf_verify();
448448
 db_unprotect(PROTECT_USER);
449449
 db_multi_exec(
450450
 "REPLACE INTO user(uid,login,info,pw,cap,mtime) "
451451
 "VALUES(nullif(%d,0),%Q,%Q,%Q,%Q,now())",
452
- uid, zLogin, P("info"), zPw, zCap
452
+ uid, zLogin, P("info"), zPw, &aCap[0]
453453
 );
454454
 if( zOldLogin && fossil_strcmp(zLogin, zOldLogin)!=0 ){
455455
 if( alert_tables_exist() ){
456456
 /* Rename matching subscriber entry, else the user cannot
457457
 re-subscribe with their same email address. */
@@ -461,11 +461,11 @@
461461
 admin_log( "Renamed user [%q] to [%q].", zOldLogin, zLogin );
462462
 }
463463
 db_protect_pop();
464464
 setup_incr_cfgcnt();
465465
 admin_log( "Updated user [%q] with capabilities [%q].",
466
- zLogin, zCap );
466
+ zLogin, &aCap[0] );
467467
 if( atoi(PD("all","0"))>0 ){
468468
 Blob sql;
469469
 char *zErr = 0;
470470
 blob_zero(&sql);
471471
 if( zOldLogin==0 ){
@@ -496,20 +496,20 @@
496496
 "(SELECT value FROM config WHERE name='project-code')),pw),"
497497
 " info=%Q,"
498498
 " cap=%Q,"
499499
 " mtime=now()"
500500
 " WHERE login=%Q;",
501
- zLogin, P("pw"), zLogin, P("info"), zCap,
501
+ zLogin, P("pw"), zLogin, P("info"), &aCap[0],
502502
 zOldLogin
503503
 );
504504
 db_unprotect(PROTECT_USER);
505505
 login_group_sql(blob_str(&sql), "<li> ", " </li>\n", &zErr);
506506
 db_protect_pop();
507507
 blob_reset(&sql);
508508
 admin_log( "Updated user [%q] in all login groups "
509509
 "with capabilities [%q].",
510
- zLogin, zCap );
510
+ zLogin, &aCap[0] );
511511
 if( zErr ){
512512
 const char *zRef = cgi_referer("setup_ulist");
513513
 style_header("User Change Error");
514514
 admin_log( "Error updating user '%q': %s'.", zLogin, zErr );
515515
 @ <span class="loginError">%h(zErr)</span>
516516
--- src/setupuser.c
+++ src/setupuser.c
@@ -393,30 +393,30 @@
393 }else if( !cgi_csrf_safe(2) ){
394 /* This might be a cross-site request forgery, so ignore it */
395 }else{
396 /* We have all the information we need to make the change to the user */
397 char c;
398 char zCap[70], zNm[4];
399 zNm[0] = 'a';
400 zNm[2] = 0;
401 for(i=0, c='a'; c<='z'; c++){
402 zNm[1] = c;
403 a[c&0x7f] = ((c!='s' && c!='y') || g.perm.Setup) && P(zNm)!=0;
404 if( a[c&0x7f] ) zCap[i++] = c;
405 }
406 for(c='0'; c<='9'; c++){
407 zNm[1] = c;
408 a[c&0x7f] = P(zNm)!=0;
409 if( a[c&0x7f] ) zCap[i++] = c;
410 }
411 for(c='A'; c<='Z'; c++){
412 zNm[1] = c;
413 a[c&0x7f] = P(zNm)!=0;
414 if( a[c&0x7f] ) zCap[i++] = c;
415 }
416
417 zCap[i] = 0;
418 zPw = P("pw");
419 zLogin = P("login");
420 if( strlen(zLogin)==0 ){
421 const char *zRef = cgi_referer("setup_ulist");
422 style_header("User Creation Error");
@@ -447,11 +447,11 @@
447 cgi_csrf_verify();
448 db_unprotect(PROTECT_USER);
449 db_multi_exec(
450 "REPLACE INTO user(uid,login,info,pw,cap,mtime) "
451 "VALUES(nullif(%d,0),%Q,%Q,%Q,%Q,now())",
452 uid, zLogin, P("info"), zPw, zCap
453 );
454 if( zOldLogin && fossil_strcmp(zLogin, zOldLogin)!=0 ){
455 if( alert_tables_exist() ){
456 /* Rename matching subscriber entry, else the user cannot
457 re-subscribe with their same email address. */
@@ -461,11 +461,11 @@
461 admin_log( "Renamed user [%q] to [%q].", zOldLogin, zLogin );
462 }
463 db_protect_pop();
464 setup_incr_cfgcnt();
465 admin_log( "Updated user [%q] with capabilities [%q].",
466 zLogin, zCap );
467 if( atoi(PD("all","0"))>0 ){
468 Blob sql;
469 char *zErr = 0;
470 blob_zero(&sql);
471 if( zOldLogin==0 ){
@@ -496,20 +496,20 @@
496 "(SELECT value FROM config WHERE name='project-code')),pw),"
497 " info=%Q,"
498 " cap=%Q,"
499 " mtime=now()"
500 " WHERE login=%Q;",
501 zLogin, P("pw"), zLogin, P("info"), zCap,
502 zOldLogin
503 );
504 db_unprotect(PROTECT_USER);
505 login_group_sql(blob_str(&sql), "<li> ", " </li>\n", &zErr);
506 db_protect_pop();
507 blob_reset(&sql);
508 admin_log( "Updated user [%q] in all login groups "
509 "with capabilities [%q].",
510 zLogin, zCap );
511 if( zErr ){
512 const char *zRef = cgi_referer("setup_ulist");
513 style_header("User Change Error");
514 admin_log( "Error updating user '%q': %s'.", zLogin, zErr );
515 @ <span class="loginError">%h(zErr)</span>
516
--- src/setupuser.c
+++ src/setupuser.c
@@ -393,30 +393,30 @@
393 }else if( !cgi_csrf_safe(2) ){
394 /* This might be a cross-site request forgery, so ignore it */
395 }else{
396 /* We have all the information we need to make the change to the user */
397 char c;
398 char aCap[70], zNm[4];
399 zNm[0] = 'a';
400 zNm[2] = 0;
401 for(i=0, c='a'; c<='z'; c++){
402 zNm[1] = c;
403 a[c&0x7f] = ((c!='s' && c!='y') || g.perm.Setup) && P(zNm)!=0;
404 if( a[c&0x7f] ) aCap[i++] = c;
405 }
406 for(c='0'; c<='9'; c++){
407 zNm[1] = c;
408 a[c&0x7f] = P(zNm)!=0;
409 if( a[c&0x7f] ) aCap[i++] = c;
410 }
411 for(c='A'; c<='Z'; c++){
412 zNm[1] = c;
413 a[c&0x7f] = P(zNm)!=0;
414 if( a[c&0x7f] ) aCap[i++] = c;
415 }
416
417 aCap[i] = 0;
418 zPw = P("pw");
419 zLogin = P("login");
420 if( strlen(zLogin)==0 ){
421 const char *zRef = cgi_referer("setup_ulist");
422 style_header("User Creation Error");
@@ -447,11 +447,11 @@
447 cgi_csrf_verify();
448 db_unprotect(PROTECT_USER);
449 db_multi_exec(
450 "REPLACE INTO user(uid,login,info,pw,cap,mtime) "
451 "VALUES(nullif(%d,0),%Q,%Q,%Q,%Q,now())",
452 uid, zLogin, P("info"), zPw, &aCap[0]
453 );
454 if( zOldLogin && fossil_strcmp(zLogin, zOldLogin)!=0 ){
455 if( alert_tables_exist() ){
456 /* Rename matching subscriber entry, else the user cannot
457 re-subscribe with their same email address. */
@@ -461,11 +461,11 @@
461 admin_log( "Renamed user [%q] to [%q].", zOldLogin, zLogin );
462 }
463 db_protect_pop();
464 setup_incr_cfgcnt();
465 admin_log( "Updated user [%q] with capabilities [%q].",
466 zLogin, &aCap[0] );
467 if( atoi(PD("all","0"))>0 ){
468 Blob sql;
469 char *zErr = 0;
470 blob_zero(&sql);
471 if( zOldLogin==0 ){
@@ -496,20 +496,20 @@
496 "(SELECT value FROM config WHERE name='project-code')),pw),"
497 " info=%Q,"
498 " cap=%Q,"
499 " mtime=now()"
500 " WHERE login=%Q;",
501 zLogin, P("pw"), zLogin, P("info"), &aCap[0],
502 zOldLogin
503 );
504 db_unprotect(PROTECT_USER);
505 login_group_sql(blob_str(&sql), "<li> ", " </li>\n", &zErr);
506 db_protect_pop();
507 blob_reset(&sql);
508 admin_log( "Updated user [%q] in all login groups "
509 "with capabilities [%q].",
510 zLogin, &aCap[0] );
511 if( zErr ){
512 const char *zRef = cgi_referer("setup_ulist");
513 style_header("User Change Error");
514 admin_log( "Error updating user '%q': %s'.", zLogin, zErr );
515 @ <span class="loginError">%h(zErr)</span>
516

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button