From: drh <drh@noemail.net>
Date: Wed, 25 Sep 2019 11:49:36 +0000 (+0000)
Subject: In the previous check-in, the variable should be openMode, not openFlags.
X-Git-Tag: version-3.30.0~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=edf8a7bf5712a7eaf51c6033d23e29d22aa14df3;p=thirdparty%2Fsqlite.git

In the previous check-in, the variable should be openMode, not openFlags.

FossilOrigin-Name: 77b0db22d6c7a031f332bfcf1c8fcd94e464de9f2396f0327ee761a30ebc8b60
---

diff --git a/manifest b/manifest
index 90533824ee..a1e24119e5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sthe\sunix\sVFS\slayer,\sdo\snot\sattempt\sto\schown()\sthe\sjournal\sto\sbe\sthe\ssame\nas\sthe\sdatabase\sif\srunning\sin\s8+3\sfilename\smode.\s\sAlso,\supdate\sthe\scomments\non\sthe\schown()\sattempt\sto\sbe\smore\sprecise.
-D 2019-09-25T10:36:31.568
+C In\sthe\sprevious\scheck-in,\sthe\svariable\sshould\sbe\sopenMode,\snot\sopenFlags.
+D 2019-09-25T11:49:36.048
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -509,7 +509,7 @@ F src/os.c 20f7b32c1e8839999fa7e79756a6cdc3041b44d7fc635c25a1b9399180d1fbd9
 F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
-F src/os_unix.c 1397a88988042f62c927112ad1b8f2da237af6481bef7baceba239d5626c0fb6
+F src/os_unix.c 134c64afd9aa1c5c9819b59f27cab86acc1d51bda9f723bcb1f51495bce6416f
 F src/os_win.c 035a813cbd17f355bdcad7ab894af214a9c13a1db8aeac902365350b98cd45a7
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 422fd8cfa59fb9173eff36a95878904a0eeb0dcc62ba49350acc8b1e51c4dc7b
@@ -1845,7 +1845,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 489a1eb3aa2f1225b97b50a5f8688cf1a4ab0371973da1badc29616d70386c03
-R a970b333f692ae0da1db4b0608810d83
+P ab853724a7e01ca32167d294c3c80d6632e805bdf39b6d56db82226a00ad72dc
+R 7ebf56a73c5a22a97e2a870cc95fd90d
 U drh
-Z 345f1a3a9cf94b0b740b8d6356f31b97
+Z d397f8051e45872877e380eaa24c2a78
diff --git a/manifest.uuid b/manifest.uuid
index b8ec073444..f50d6ab792 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ab853724a7e01ca32167d294c3c80d6632e805bdf39b6d56db82226a00ad72dc
\ No newline at end of file
+77b0db22d6c7a031f332bfcf1c8fcd94e464de9f2396f0327ee761a30ebc8b60
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index ae9356a717..071d979828 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -6067,11 +6067,11 @@ static int unixOpen(
     ** behinds a journal/WAL that is owned by root and hence make the
     ** database inaccessible to unprivileged processes.
     **
-    ** If openFlags==0, then that means uid and gid are not set correctly
+    ** If openMode==0, then that means uid and gid are not set correctly
     ** (probably because SQLite is configured to use 8+3 filename mode) and
     ** in that case we do not want to attempt the chown().
     */
-    if( openFlags && (flags & (SQLITE_OPEN_WAL|SQLITE_OPEN_MAIN_JOURNAL))!=0 ){
+    if( openMode && (flags & (SQLITE_OPEN_WAL|SQLITE_OPEN_MAIN_JOURNAL))!=0 ){
       robustFchown(fd, uid, gid);
     }
   }