Fossil SCM
Added missing db_protect() when importing (config export user) data via (config import), as reported in [forum:dea06dd696359a59 | forum post dea06dd696359a59].
Commit
8ad6aa53a41adf1b57c3af942bb79fce604109774dab55fec798fea4e0fc7955
Parent
c717d2803e19a12…
1 file changed
+2
+2
| --- src/configure.c | ||
| +++ src/configure.c | ||
| @@ -808,16 +808,18 @@ | ||
| 808 | 808 | Blob in; |
| 809 | 809 | int groupMask; |
| 810 | 810 | if( g.argc!=4 ) usage(mprintf("%s FILENAME",zMethod)); |
| 811 | 811 | blob_read_from_file(&in, g.argv[3], ExtFILE); |
| 812 | 812 | db_begin_transaction(); |
| 813 | + db_unprotect(PROTECT_USER); | |
| 813 | 814 | if( zMethod[0]=='i' ){ |
| 814 | 815 | groupMask = CONFIGSET_ALL | CONFIGSET_OVERWRITE; |
| 815 | 816 | }else{ |
| 816 | 817 | groupMask = CONFIGSET_ALL; |
| 817 | 818 | } |
| 818 | 819 | configure_receive_all(&in, groupMask); |
| 820 | + db_protect_pop(); | |
| 819 | 821 | db_end_transaction(0); |
| 820 | 822 | }else |
| 821 | 823 | if( strncmp(zMethod, "pull", n)==0 |
| 822 | 824 | || strncmp(zMethod, "push", n)==0 |
| 823 | 825 | || strncmp(zMethod, "sync", n)==0 |
| 824 | 826 |
| --- src/configure.c | |
| +++ src/configure.c | |
| @@ -808,16 +808,18 @@ | |
| 808 | Blob in; |
| 809 | int groupMask; |
| 810 | if( g.argc!=4 ) usage(mprintf("%s FILENAME",zMethod)); |
| 811 | blob_read_from_file(&in, g.argv[3], ExtFILE); |
| 812 | db_begin_transaction(); |
| 813 | if( zMethod[0]=='i' ){ |
| 814 | groupMask = CONFIGSET_ALL | CONFIGSET_OVERWRITE; |
| 815 | }else{ |
| 816 | groupMask = CONFIGSET_ALL; |
| 817 | } |
| 818 | configure_receive_all(&in, groupMask); |
| 819 | db_end_transaction(0); |
| 820 | }else |
| 821 | if( strncmp(zMethod, "pull", n)==0 |
| 822 | || strncmp(zMethod, "push", n)==0 |
| 823 | || strncmp(zMethod, "sync", n)==0 |
| 824 |
| --- src/configure.c | |
| +++ src/configure.c | |
| @@ -808,16 +808,18 @@ | |
| 808 | Blob in; |
| 809 | int groupMask; |
| 810 | if( g.argc!=4 ) usage(mprintf("%s FILENAME",zMethod)); |
| 811 | blob_read_from_file(&in, g.argv[3], ExtFILE); |
| 812 | db_begin_transaction(); |
| 813 | db_unprotect(PROTECT_USER); |
| 814 | if( zMethod[0]=='i' ){ |
| 815 | groupMask = CONFIGSET_ALL | CONFIGSET_OVERWRITE; |
| 816 | }else{ |
| 817 | groupMask = CONFIGSET_ALL; |
| 818 | } |
| 819 | configure_receive_all(&in, groupMask); |
| 820 | db_protect_pop(); |
| 821 | db_end_transaction(0); |
| 822 | }else |
| 823 | if( strncmp(zMethod, "pull", n)==0 |
| 824 | || strncmp(zMethod, "push", n)==0 |
| 825 | || strncmp(zMethod, "sync", n)==0 |
| 826 |