Fossil SCM
Flag the th1-setup setting as sensitive because it can, when built with --with-tcl, contain arbitrary tcl. Remove the following settings from the list of syncable settings because they will no longer sync because they're flagged as sensitive: tcl, tcl-setup, th1-setup, th1-docs.
Commit
6a114c4870d5185ffb5189327480ef9186c6c3eb57e7200c6eda38c523f2ad9b
Parent
f3ce75f8180998e…
2 files changed
-9
+1
-1
-9
| --- src/configure.c | ||
| +++ src/configure.c | ||
| @@ -118,24 +118,15 @@ | ||
| 118 | 118 | { "adunit-omit-if-user", CONFIGSET_SKIN }, |
| 119 | 119 | { "default-csp", CONFIGSET_SKIN }, |
| 120 | 120 | { "sitemap-extra", CONFIGSET_SKIN }, |
| 121 | 121 | { "safe-html", CONFIGSET_SKIN }, |
| 122 | 122 | |
| 123 | -#ifdef FOSSIL_ENABLE_TH1_DOCS | |
| 124 | - { "th1-docs", CONFIGSET_TH1 }, | |
| 125 | -#endif | |
| 126 | 123 | #ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 127 | 124 | { "th1-hooks", CONFIGSET_TH1 }, |
| 128 | 125 | #endif |
| 129 | - { "th1-setup", CONFIGSET_TH1 }, | |
| 130 | 126 | { "th1-uri-regexp", CONFIGSET_TH1 }, |
| 131 | 127 | |
| 132 | -#ifdef FOSSIL_ENABLE_TCL | |
| 133 | - { "tcl", CONFIGSET_TH1 }, | |
| 134 | - { "tcl-setup", CONFIGSET_TH1 }, | |
| 135 | -#endif | |
| 136 | - | |
| 137 | 128 | { "project-name", CONFIGSET_PROJ }, |
| 138 | 129 | { "short-project-name", CONFIGSET_PROJ }, |
| 139 | 130 | { "project-description", CONFIGSET_PROJ }, |
| 140 | 131 | { "index-page", CONFIGSET_PROJ }, |
| 141 | 132 | { "manifest", CONFIGSET_PROJ }, |
| 142 | 133 |
| --- src/configure.c | |
| +++ src/configure.c | |
| @@ -118,24 +118,15 @@ | |
| 118 | { "adunit-omit-if-user", CONFIGSET_SKIN }, |
| 119 | { "default-csp", CONFIGSET_SKIN }, |
| 120 | { "sitemap-extra", CONFIGSET_SKIN }, |
| 121 | { "safe-html", CONFIGSET_SKIN }, |
| 122 | |
| 123 | #ifdef FOSSIL_ENABLE_TH1_DOCS |
| 124 | { "th1-docs", CONFIGSET_TH1 }, |
| 125 | #endif |
| 126 | #ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 127 | { "th1-hooks", CONFIGSET_TH1 }, |
| 128 | #endif |
| 129 | { "th1-setup", CONFIGSET_TH1 }, |
| 130 | { "th1-uri-regexp", CONFIGSET_TH1 }, |
| 131 | |
| 132 | #ifdef FOSSIL_ENABLE_TCL |
| 133 | { "tcl", CONFIGSET_TH1 }, |
| 134 | { "tcl-setup", CONFIGSET_TH1 }, |
| 135 | #endif |
| 136 | |
| 137 | { "project-name", CONFIGSET_PROJ }, |
| 138 | { "short-project-name", CONFIGSET_PROJ }, |
| 139 | { "project-description", CONFIGSET_PROJ }, |
| 140 | { "index-page", CONFIGSET_PROJ }, |
| 141 | { "manifest", CONFIGSET_PROJ }, |
| 142 |
| --- src/configure.c | |
| +++ src/configure.c | |
| @@ -118,24 +118,15 @@ | |
| 118 | { "adunit-omit-if-user", CONFIGSET_SKIN }, |
| 119 | { "default-csp", CONFIGSET_SKIN }, |
| 120 | { "sitemap-extra", CONFIGSET_SKIN }, |
| 121 | { "safe-html", CONFIGSET_SKIN }, |
| 122 | |
| 123 | #ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 124 | { "th1-hooks", CONFIGSET_TH1 }, |
| 125 | #endif |
| 126 | { "th1-uri-regexp", CONFIGSET_TH1 }, |
| 127 | |
| 128 | { "project-name", CONFIGSET_PROJ }, |
| 129 | { "short-project-name", CONFIGSET_PROJ }, |
| 130 | { "project-description", CONFIGSET_PROJ }, |
| 131 | { "index-page", CONFIGSET_PROJ }, |
| 132 | { "manifest", CONFIGSET_PROJ }, |
| 133 |
M
src/db.c
+1
-1
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -4967,11 +4967,11 @@ | ||
| 4967 | 4967 | ** If enabled, special TH1 commands will be called before and |
| 4968 | 4968 | ** after any Fossil command or web page. |
| 4969 | 4969 | */ |
| 4970 | 4970 | #endif |
| 4971 | 4971 | /* |
| 4972 | -** SETTING: th1-setup width=40 block-text | |
| 4972 | +** SETTING: th1-setup width=40 block-text sensitive | |
| 4973 | 4973 | ** This is the setup script to be evaluated after creating |
| 4974 | 4974 | ** and initializing the TH1 interpreter. By default, this |
| 4975 | 4975 | ** is empty and no extra setup is performed. |
| 4976 | 4976 | */ |
| 4977 | 4977 | /* |
| 4978 | 4978 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -4967,11 +4967,11 @@ | |
| 4967 | ** If enabled, special TH1 commands will be called before and |
| 4968 | ** after any Fossil command or web page. |
| 4969 | */ |
| 4970 | #endif |
| 4971 | /* |
| 4972 | ** SETTING: th1-setup width=40 block-text |
| 4973 | ** This is the setup script to be evaluated after creating |
| 4974 | ** and initializing the TH1 interpreter. By default, this |
| 4975 | ** is empty and no extra setup is performed. |
| 4976 | */ |
| 4977 | /* |
| 4978 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -4967,11 +4967,11 @@ | |
| 4967 | ** If enabled, special TH1 commands will be called before and |
| 4968 | ** after any Fossil command or web page. |
| 4969 | */ |
| 4970 | #endif |
| 4971 | /* |
| 4972 | ** SETTING: th1-setup width=40 block-text sensitive |
| 4973 | ** This is the setup script to be evaluated after creating |
| 4974 | ** and initializing the TH1 interpreter. By default, this |
| 4975 | ** is empty and no extra setup is performed. |
| 4976 | */ |
| 4977 | /* |
| 4978 |