The quoting changes we have been talking about are ready to be committed. I've run the regression tests many times over the past week or so.
Sometimes a tests will fail, but when rerunning the test manually, it passes. I'll be committing this into trunk later today. If you start seeing very funny stuff, please let me know. the main changes are to db_escape_string(): -void db_escape_string(char *snew, char *old, int len) +void db_escape_string(JCR *jcr, B_DB *db, char *snew, char *old, int len) We pass in jcr so we can invoke Jmsg if a string translation error occurs. We pass in db so we can access the database. You might know that jcr also contains a pointer to db, but not all code that uses db_escape_string() contains a jcr instance. So we pass in both, using NULL for jcr. split_path_and_filename() in src/dird/ua_restore.c was also modified so ua is passed in, fromwhich we can get both jcr and db. The regression tests appear below: Configuration on Wed Sep 12 07:26:29 EDT 2007: Host: i386-unknown-freebsd7.0 -- freebsd 7.0- CURRENT Bacula version: 2.3.3 (06 September 2007) Source code location: . Install binaries: /usr/home/dan/src/BaculaRegressionTesting/bin Install config files: /usr/home/dan/src/BaculaRegressionTesting/bin Scripts directory: /usr/home/dan/src/BaculaRegressionTesting/bin Working directory: /usr/home/dan/src/BaculaRegressionTesting/working PID directory: /usr/home/dan/src/BaculaRegressionTesting/working Subsys directory: /usr/home/dan/src/BaculaRegressionTesting/working Man directory: /usr/home/dan/src/BaculaRegressionTesting/bin Data directory: /usr/share C Compiler: gcc 4.2.0 C++ Compiler: /usr/bin/g++ 4.2.0 Compiler flags: -g -O2 -Wall -fno-strict-aliasing -fno- exceptions -fno-rtti Linker flags: -O Libraries: -lpthread Statically Linked Tools: no Statically Linked FD: no Statically Linked SD: no Statically Linked DIR: no Statically Linked CONS: no Database type: PostgreSQL Database lib: -L/usr/local/lib -lpq -lcrypt Database name: regress Database user: regress Job Output Email: [EMAIL PROTECTED] Traceback Email: [EMAIL PROTECTED] SMTP Host Address: localhost Director Port: 8101 File daemon Port: 8102 Storage daemon Port: 8103 Director User: Director Group: Storage Daemon User: Storage DaemonGroup: File Daemon User: File Daemon Group: SQL binaries Directory /usr/local/bin Large file support: yes Bacula conio support: yes -ltermcap readline support: no TCP Wrappers support: no TLS support: yes Encryption support: yes ZLIB support: yes enable-smartalloc: yes bat support: no enable-gnome: no enable-bwx-console: no enable-tray-monitor: client-only: no build-dird: yes build-stored: yes ACL support: yes Python support: no Batch insert enabled: no Test results Start non-root disk tests ===== auto-label-test OK 07:30:40 ===== ===== backup-bacula-test OK 07:32:51 ===== ===== bextract-test OK 07:34:30 ===== ===== big-vol-test OK 07:36:30 ===== ===== bscan-test OK 07:38:49 ===== ===== bsr-opt-test OK 07:40:08 ===== ===== compressed-test OK 07:41:38 ===== ===== compressed-encrypt-test OK 07:43:20 ===== ===== concurrent-jobs-test OK 07:44:42 ===== ===== data-encrypt-test OK 07:46:51 ===== ===== encrypt-bug-test OK 07:47:39 ===== ===== fifo-test OK 07:49:27 ===== ===== backup-to-null OK 07:51:03 ===== ===== regexwhere-test OK 07:52:26 ===== ===== differential-test OK 07:53:22 ===== ===== four-concurrent-jobs-test OK 07:57:16 ===== ===== four-jobs-test OK 07:59:45 ===== ===== incremental-test OK 08:01:08 ===== ===== query-test OK 08:02:41 ===== ===== recycle-test OK 08:06:38 ===== ===== restore2-by-file-test OK 08:08:08 ===== ===== restore-by-file-test OK 08:08:53 ===== ===== restore-disk-seek-test OK 08:09:44 ===== ===== six-vol-test OK 08:10:45 ===== ===== span-vol-test OK 08:12:21 ===== ===== sparse-compressed-test OK 08:13:57 ===== ===== sparse-test OK 08:15:32 ===== ===== two-jobs-test OK 08:17:47 ===== ===== two-vol-test OK 08:19:19 ===== ===== verify-cat-test OK 08:20:54 ===== ===== verify-vol-test OK 08:22:30 ===== ===== weird-files2-test OK 08:23:16 ===== ===== weird-files-test OK 08:24:00 ===== ===== migration-job-test OK 08:27:15 ===== ===== migration-jobspan-test OK 08:29:39 ===== ===== migration-volume-test OK 08:32:08 ===== ===== migration-time-test OK 08:36:30 ===== ===== hardlink-test OK 08:37:33 ===== ===== tls-test OK 08:39:22 ===== End non-root disk tests Start non-root virtual disk autochangertests ===== two-pool-test OK 08:46:01 ===== ===== fast-two-pool-test OK 08:52:58 ===== ===== two-volume-test OK 08:54:46 ===== ===== incremental-2disk OK 08:55:47 ===== !!!! Fatal Error in log output !!!! ===== 2drive-incremental-2disk OK 09:06:57 ===== ===== 2drive-concurrent-test OK 09:10:48 ===== ===== incremental-2media OK 09:12:46 ===== ===== three-pool-disk OK 09:17:03 ===== ===== 2drive-3pool-disk OK 09:21:13 ===== End non-root virtual disk autochangertests End do_file tests ===== incremental-2disk OK 09:23:00 ===== $ tests/incremental-2disk psql:<stdin>:2: ERROR: CREATE USER: user name "regress" already exists === Starting incremental-2disk at 09:22:23 === ===== incremental-2disk OK 09:23:00 ===== $ -- Dan Langille - http://www.langille.org/ Available for hire: http://www.freebsddiary.org/dan_langille.php ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ Bacula-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/bacula-devel
