Fossil SCM
Fix the "fossil tls-config remove-exception" command so that it works without triggering authorizer exceptions. [forum:/forumpost/64d919b2cf|Forum post 64d919b2cf].
Commit
156c890a2e71d980b3f1b4565b24584130e7677df8b9a79c5f11fe4813ddf45f
Parent
160bd677316cc8d…
1 file changed
+2
-2
+2
-2
| --- src/http_ssl.c | ||
| +++ src/http_ssl.c | ||
| @@ -586,18 +586,16 @@ | ||
| 586 | 586 | Blob sql; |
| 587 | 587 | char *zSep = "("; |
| 588 | 588 | db_begin_transaction(); |
| 589 | 589 | blob_init(&sql, 0, 0); |
| 590 | 590 | if( g.argc==4 && find_option("all",0,0)!=0 ){ |
| 591 | - db_unprotect(PROTECT_CONFIG); | |
| 592 | 591 | blob_append_sql(&sql, |
| 593 | 592 | "DELETE FROM global_config WHERE name GLOB 'cert:*';\n" |
| 594 | 593 | "DELETE FROM global_config WHERE name GLOB 'trusted:*';\n" |
| 595 | 594 | "DELETE FROM config WHERE name GLOB 'cert:*';\n" |
| 596 | 595 | "DELETE FROM config WHERE name GLOB 'trusted:*';\n" |
| 597 | 596 | ); |
| 598 | - db_protect_pop(); | |
| 599 | 597 | }else{ |
| 600 | 598 | if( g.argc<4 ){ |
| 601 | 599 | usage("remove-exception DOMAIN-NAME ..."); |
| 602 | 600 | } |
| 603 | 601 | blob_append_sql(&sql,"DELETE FROM global_config WHERE name IN "); |
| @@ -614,11 +612,13 @@ | ||
| 614 | 612 | zSep/*safe-for-%s*/, g.argv[i], g.argv[i]); |
| 615 | 613 | zSep = ","; |
| 616 | 614 | } |
| 617 | 615 | blob_append_sql(&sql,");"); |
| 618 | 616 | } |
| 617 | + db_unprotect(PROTECT_CONFIG); | |
| 619 | 618 | db_exec_sql(blob_str(&sql)); |
| 619 | + db_protect_pop(); | |
| 620 | 620 | db_commit_transaction(); |
| 621 | 621 | blob_reset(&sql); |
| 622 | 622 | }else |
| 623 | 623 | /*default*/{ |
| 624 | 624 | fossil_fatal("unknown sub-command \"%s\".\nshould be one of:" |
| 625 | 625 |
| --- src/http_ssl.c | |
| +++ src/http_ssl.c | |
| @@ -586,18 +586,16 @@ | |
| 586 | Blob sql; |
| 587 | char *zSep = "("; |
| 588 | db_begin_transaction(); |
| 589 | blob_init(&sql, 0, 0); |
| 590 | if( g.argc==4 && find_option("all",0,0)!=0 ){ |
| 591 | db_unprotect(PROTECT_CONFIG); |
| 592 | blob_append_sql(&sql, |
| 593 | "DELETE FROM global_config WHERE name GLOB 'cert:*';\n" |
| 594 | "DELETE FROM global_config WHERE name GLOB 'trusted:*';\n" |
| 595 | "DELETE FROM config WHERE name GLOB 'cert:*';\n" |
| 596 | "DELETE FROM config WHERE name GLOB 'trusted:*';\n" |
| 597 | ); |
| 598 | db_protect_pop(); |
| 599 | }else{ |
| 600 | if( g.argc<4 ){ |
| 601 | usage("remove-exception DOMAIN-NAME ..."); |
| 602 | } |
| 603 | blob_append_sql(&sql,"DELETE FROM global_config WHERE name IN "); |
| @@ -614,11 +612,13 @@ | |
| 614 | zSep/*safe-for-%s*/, g.argv[i], g.argv[i]); |
| 615 | zSep = ","; |
| 616 | } |
| 617 | blob_append_sql(&sql,");"); |
| 618 | } |
| 619 | db_exec_sql(blob_str(&sql)); |
| 620 | db_commit_transaction(); |
| 621 | blob_reset(&sql); |
| 622 | }else |
| 623 | /*default*/{ |
| 624 | fossil_fatal("unknown sub-command \"%s\".\nshould be one of:" |
| 625 |
| --- src/http_ssl.c | |
| +++ src/http_ssl.c | |
| @@ -586,18 +586,16 @@ | |
| 586 | Blob sql; |
| 587 | char *zSep = "("; |
| 588 | db_begin_transaction(); |
| 589 | blob_init(&sql, 0, 0); |
| 590 | if( g.argc==4 && find_option("all",0,0)!=0 ){ |
| 591 | blob_append_sql(&sql, |
| 592 | "DELETE FROM global_config WHERE name GLOB 'cert:*';\n" |
| 593 | "DELETE FROM global_config WHERE name GLOB 'trusted:*';\n" |
| 594 | "DELETE FROM config WHERE name GLOB 'cert:*';\n" |
| 595 | "DELETE FROM config WHERE name GLOB 'trusted:*';\n" |
| 596 | ); |
| 597 | }else{ |
| 598 | if( g.argc<4 ){ |
| 599 | usage("remove-exception DOMAIN-NAME ..."); |
| 600 | } |
| 601 | blob_append_sql(&sql,"DELETE FROM global_config WHERE name IN "); |
| @@ -614,11 +612,13 @@ | |
| 612 | zSep/*safe-for-%s*/, g.argv[i], g.argv[i]); |
| 613 | zSep = ","; |
| 614 | } |
| 615 | blob_append_sql(&sql,");"); |
| 616 | } |
| 617 | db_unprotect(PROTECT_CONFIG); |
| 618 | db_exec_sql(blob_str(&sql)); |
| 619 | db_protect_pop(); |
| 620 | db_commit_transaction(); |
| 621 | blob_reset(&sql); |
| 622 | }else |
| 623 | /*default*/{ |
| 624 | fossil_fatal("unknown sub-command \"%s\".\nshould be one of:" |
| 625 |