From: drh <drh@noemail.net>
Date: Mon, 14 Jun 2004 11:58:37 +0000 (+0000)
Subject: Do not authenticate statements when reading the schema.  Backport of bug
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d5398b08952d8f1bfd63cb529615f6581aa3728;p=thirdparty%2Fsqlite.git

Do not authenticate statements when reading the schema.  Backport of bug
fix in (1588) to version 2. (CVS 1591)

FossilOrigin-Name: 24adf9ed5988d6e110a750f75b767fad163689c6
---

diff --git a/manifest b/manifest
index f7ce99512d..8b2f11e1b8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s2.8.14\s(CVS\s1554)
-D 2004-06-09T23:20:06
+C Do\snot\sauthenticate\sstatements\swhen\sreading\sthe\sschema.\s\sBackport\sof\sbug\nfix\sin\s(1588)\sto\sversion\s2.\s(CVS\s1591)
+D 2004-06-14T11:58:37
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -22,7 +22,7 @@ F sqlite.1 83f4a9d37bdf2b7ef079a82d54eaf2e3509ee6ea
 F sqlite.def fc4f5734786fe4743cfe2aa98eb2da4b089edb5f
 F sqlite.pc.in 30552343140c53304c2a658c080fbe810cd09ca2
 F src/attach.c 026702566f941bf2bb158a0aaa86bfeb65910aa6
-F src/auth.c 4fa3b05bd19445d1c474d6751c4a508d6ea0abe1
+F src/auth.c f73ae6f7260e3409e9b164a2bb9efffc38054081
 F src/btree.c 08a05b925b348c05d79b9b062b79e50d565678de
 F src/btree.h 41cb3ff6ebc3f6da2d0a074e39ff8c7a2287469f
 F src/btree_rb.c 99feb3ff835106d018a483a1ce403e5cf9c718bc
@@ -188,7 +188,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 7538d2e5297bdeaf07c6d6e37053c654501ef286
-R 4b97b7f3ad71d7fa0ea85a53f9d1556a
+P 7d3937743f88acad8859fbbbb1c03271a939bc0b
+R 18025706e1348c88f79d57e0222aa7e4
 U drh
-Z 6e7d236761f1e0f27c9fd9bb6ff1ebec
+Z 1300c540e4cc9cf82e1d8566d79bb8e0
diff --git a/manifest.uuid b/manifest.uuid
index 1b78cb6c25..3ecfb76539 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7d3937743f88acad8859fbbbb1c03271a939bc0b
\ No newline at end of file
+24adf9ed5988d6e110a750f75b767fad163689c6
\ No newline at end of file
diff --git a/src/auth.c b/src/auth.c
index 8f8077dd94..8bc25f7ba8 100644
--- a/src/auth.c
+++ b/src/auth.c
@@ -14,7 +14,7 @@
 ** systems that do not need this facility may omit it by recompiling
 ** the library with -DSQLITE_OMIT_AUTHORIZATION=1
 **
-** $Id: auth.c,v 1.12 2004/02/22 18:40:57 drh Exp $
+** $Id: auth.c,v 1.12.2.1 2004/06/14 11:58:37 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -174,7 +174,7 @@ int sqliteAuthCheck(
   sqlite *db = pParse->db;
   int rc;
 
-  if( db->xAuth==0 ){
+  if( db->init.busy || db->xAuth==0 ){
     return SQLITE_OK;
   }
   rc = db->xAuth(db->pAuthArg, code, zArg1, zArg2, zArg3, pParse->zAuthContext);