Fossil

Check-in [8ad6aa53]
Login

Check-in [8ad6aa53]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Added missing db_protect() when importing (config export user) data via (config import), as reported in forum post dea06dd696359a59.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 8ad6aa53a41adf1b57c3af942bb79fce604109774dab55fec798fea4e0fc7955
User & Date: stephan 2021-08-28 15:11:10
References
2021-08-28
15:19
Minor legibility improvement for the previous commit [8ad6aa53a4]. ... (check-in: db8c5a92 user: stephan tags: trunk)
Context
2021-08-28
15:19
Minor legibility improvement for the previous commit [8ad6aa53a4]. ... (check-in: db8c5a92 user: stephan tags: trunk)
15:11
Added missing db_protect() when importing (config export user) data via (config import), as reported in forum post dea06dd696359a59. ... (check-in: 8ad6aa53 user: stephan tags: trunk)
2021-08-27
12:31
Fix login redirects for the forum. Forum post 7663482abad5a3ea. ... (check-in: c717d280 user: drh tags: trunk)
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/configure.c.

︙︙
806
807
808
809
810
811
812

813
814
815
816
817
818

819
820
821
822
823
824
825

  if( strncmp(zMethod, "import", n)==0
       || strncmp(zMethod, "merge", n)==0 ){
    Blob in;
    int groupMask;
    if( g.argc!=4 ) usage(mprintf("%s FILENAME",zMethod));
    blob_read_from_file(&in, g.argv[3], ExtFILE);
    db_begin_transaction();

    if( zMethod[0]=='i' ){
      groupMask = CONFIGSET_ALL | CONFIGSET_OVERWRITE;
    }else{
      groupMask = CONFIGSET_ALL;
    }
    configure_receive_all(&in, groupMask);

    db_end_transaction(0);
  }else
  if( strncmp(zMethod, "pull", n)==0
   || strncmp(zMethod, "push", n)==0
   || strncmp(zMethod, "sync", n)==0
  ){
    int mask;








>






>








806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827

  if( strncmp(zMethod, "import", n)==0
       || strncmp(zMethod, "merge", n)==0 ){
    Blob in;
    int groupMask;
    if( g.argc!=4 ) usage(mprintf("%s FILENAME",zMethod));
    blob_read_from_file(&in, g.argv[3], ExtFILE);
    db_begin_transaction();
    db_unprotect(PROTECT_USER);
    if( zMethod[0]=='i' ){
      groupMask = CONFIGSET_ALL | CONFIGSET_OVERWRITE;
    }else{
      groupMask = CONFIGSET_ALL;
    }
    configure_receive_all(&in, groupMask);
    db_protect_pop();
    db_end_transaction(0);
  }else
  if( strncmp(zMethod, "pull", n)==0
   || strncmp(zMethod, "push", n)==0
   || strncmp(zMethod, "sync", n)==0
  ){
    int mask;
︙︙