From: drh <drh@noemail.net>
Date: Tue, 23 Aug 2016 14:42:15 +0000 (+0000)
Subject: Fix the SQLITE_USER_AUTHENTICATION login check so that the SQLITE_AUTH_USER
X-Git-Tag: version-3.15.0~133
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ae3ab00368c04d370eb3004e6580cf4f6791541;p=thirdparty%2Fsqlite.git

Fix the SQLITE_USER_AUTHENTICATION login check so that the SQLITE_AUTH_USER
error code correctly propagates and is not overwritten by SQLITE_ERROR.

FossilOrigin-Name: c640489db2037f1a284d7b85fa753ccdac1b8f79
---

diff --git a/manifest b/manifest
index f6da52a9f5..eb702b7169 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssupport\sfor\sthe\sSQLITE_DBCONFIG_MAINDBNAME\sconfiguration\soption.
-D 2016-08-22T20:10:01.543
+C Fix\sthe\sSQLITE_USER_AUTHENTICATION\slogin\scheck\sso\sthat\sthe\sSQLITE_AUTH_USER\nerror\scode\scorrectly\spropagates\sand\sis\snot\soverwritten\sby\sSQLITE_ERROR.
+D 2016-08-23T14:42:15.107
 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -331,7 +331,7 @@ F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
 F src/btree.c 2551bd3ecb8b8988fb8b23aabadfb214dbc38e46
 F src/btree.h 075c45707c0f8f8af118f739f36df8098a08b7da
 F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
-F src/build.c d32cacbb59a403b68e1c2ec962ca31b6f3aad4fc
+F src/build.c c2ccfcdd99e18894a8750e215b8d9c5398a3c073
 F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7
@@ -1511,8 +1511,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 083f9e6270fa4faa402b91231271da4f3915c79f 12d5e38d269ede27cd38a031a395915301fffe56
-R a6e4b4d3ce0ef3f2cf848bb14d9b8323
-T +closed 12d5e38d269ede27cd38a031a395915301fffe56
+P 7839519349c7371cdb4e16a215eacd27004cbc62
+R 9d6fb42ced27e9f36e142aa6e0d35f69
 U drh
-Z 7e1aff0002b8c240c3859f075858093c
+Z 4b4f28634d508607542ad65188ee7936
diff --git a/manifest.uuid b/manifest.uuid
index b5392b6178..4b339d677c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7839519349c7371cdb4e16a215eacd27004cbc62
\ No newline at end of file
+c640489db2037f1a284d7b85fa753ccdac1b8f79
\ No newline at end of file
diff --git a/src/build.c b/src/build.c
index 15c005f4ea..ca4802cd0a 100644
--- a/src/build.c
+++ b/src/build.c
@@ -153,8 +153,8 @@ void sqlite3FinishCoding(Parse *pParse){
     if( pParse->nTableLock>0 && db->init.busy==0 ){
       sqlite3UserAuthInit(db);
       if( db->auth.authLevel<UAUTH_User ){
-        pParse->rc = SQLITE_AUTH_USER;
         sqlite3ErrorMsg(pParse, "user not authenticated");
+        pParse->rc = SQLITE_AUTH_USER;
         return;
       }
     }