From 53b6ff32b8df0310f9813e38bdf108b54dd79787 Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@eb.homelinux.org>
Date: Thu, 28 Aug 2008 11:23:21 +0000
Subject: [PATCH] ebl  Modify catalog scripts to have an easier packaging
 integration,      using default variables.      Make difference between
 SQLite3 and SQLite in db_get_type()

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7514 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/src/cats/grant_mysql_privileges.in     | 10 +--
 .../src/cats/grant_postgresql_privileges.in   | 84 +++++++++----------
 bacula/src/cats/make_mysql_tables.in          |  2 +-
 bacula/src/cats/make_postgresql_tables.in     |  2 +-
 bacula/src/cats/sqlite.c                      |  5 +-
 bacula/technotes-2.5                          |  4 +
 6 files changed, 57 insertions(+), 50 deletions(-)

diff --git a/bacula/src/cats/grant_mysql_privileges.in b/bacula/src/cats/grant_mysql_privileges.in
index bf89fe060a..bb53b46a94 100644
--- a/bacula/src/cats/grant_mysql_privileges.in
+++ b/bacula/src/cats/grant_mysql_privileges.in
@@ -2,19 +2,19 @@
 #
 # shell script to grant privileges to the bacula database
 #
-USER=@db_user@
+db_user=${db_user-@db_user@}
 bindir=@SQL_BINDIR@
-db_name=@db_name@
+db_name=${db_name-@db_name@}
 
 if $bindir/mysql $* -u root -f <<END-OF-DATA
 use mysql
-grant all privileges on ${db_name}.* to ${USER}@localhost;
-grant all privileges on ${db_name}.* to ${USER}@"%";
+grant all privileges on ${db_name}.* to ${db_user}@localhost;
+grant all privileges on ${db_name}.* to ${db_user}@"%";
 select * from user;
 flush privileges;
 END-OF-DATA
 then
-   echo "Privileges for ${USER} granted on ${db_name}."
+   echo "Privileges for ${db_user} granted on ${db_name}."
    exit 0
 else
    echo "Error creating privileges."
diff --git a/bacula/src/cats/grant_postgresql_privileges.in b/bacula/src/cats/grant_postgresql_privileges.in
index 3be65e7c07..c3d6e106c8 100644
--- a/bacula/src/cats/grant_postgresql_privileges.in
+++ b/bacula/src/cats/grant_postgresql_privileges.in
@@ -2,60 +2,60 @@
 #
 # shell script to grant privileges to the bacula database
 #
-USER=@db_user@
+db_user=${db_user-@db_user@}
 bindir=@SQL_BINDIR@
-db_name=@db_name@
+db_name=${db_name-@db_name@}
 
 if $bindir/psql -f - -d ${db_name} $* <<END-OF-DATA
 
-create user ${USER};
+create user ${db_user};
 
 -- for tables
-grant all on unsavedfiles to ${USER};
-grant all on basefiles	  to ${USER};
-grant all on jobmedia	  to ${USER};
-grant all on file	  to ${USER};
-grant all on job	  to ${USER};
-grant all on media	  to ${USER};
-grant all on client	  to ${USER};
-grant all on pool	  to ${USER};
-grant all on fileset	  to ${USER};
-grant all on path	  to ${USER};
-grant all on filename	  to ${USER};
-grant all on counters	  to ${USER};
-grant all on version	  to ${USER};
-grant all on cdimages	  to ${USER};
-grant all on mediatype	  to ${USER};
-grant all on storage	  to ${USER};
-grant all on device	  to ${USER};
-grant all on status	  to ${USER};
-grant all on location	  to ${USER};
-grant all on locationlog  to ${USER};
-grant all on log	  to ${USER};
-grant all on jobstat	  to ${USER};
+grant all on unsavedfiles to ${db_user};
+grant all on basefiles	  to ${db_user};
+grant all on jobmedia	  to ${db_user};
+grant all on file	  to ${db_user};
+grant all on job	  to ${db_user};
+grant all on media	  to ${db_user};
+grant all on client	  to ${db_user};
+grant all on pool	  to ${db_user};
+grant all on fileset	  to ${db_user};
+grant all on path	  to ${db_user};
+grant all on filename	  to ${db_user};
+grant all on counters	  to ${db_user};
+grant all on version	  to ${db_user};
+grant all on cdimages	  to ${db_user};
+grant all on mediatype	  to ${db_user};
+grant all on storage	  to ${db_user};
+grant all on device	  to ${db_user};
+grant all on status	  to ${db_user};
+grant all on location	  to ${db_user};
+grant all on locationlog  to ${db_user};
+grant all on log	  to ${db_user};
+grant all on jobstat	  to ${db_user};
 
 -- for sequences on those tables
 
-grant select, update on filename_filenameid_seq    to ${USER};
-grant select, update on path_pathid_seq 	   to ${USER};
-grant select, update on fileset_filesetid_seq	   to ${USER};
-grant select, update on pool_poolid_seq 	   to ${USER};
-grant select, update on client_clientid_seq	   to ${USER};
-grant select, update on media_mediaid_seq	   to ${USER};
-grant select, update on job_jobid_seq		   to ${USER};
-grant select, update on file_fileid_seq 	   to ${USER};
-grant select, update on jobmedia_jobmediaid_seq    to ${USER};
-grant select, update on basefiles_baseid_seq	   to ${USER};
-grant select, update on storage_storageid_seq	   to ${USER};
-grant select, update on mediatype_mediatypeid_seq  to ${USER};
-grant select, update on device_deviceid_seq	   to ${USER};
-grant select, update on location_locationid_seq    to ${USER};
-grant select, update on locationlog_loclogid_seq   to ${USER};
-grant select, update on log_logid_seq		   to ${USER};
+grant select, update on filename_filenameid_seq    to ${db_user};
+grant select, update on path_pathid_seq 	   to ${db_user};
+grant select, update on fileset_filesetid_seq	   to ${db_user};
+grant select, update on pool_poolid_seq 	   to ${db_user};
+grant select, update on client_clientid_seq	   to ${db_user};
+grant select, update on media_mediaid_seq	   to ${db_user};
+grant select, update on job_jobid_seq		   to ${db_user};
+grant select, update on file_fileid_seq 	   to ${db_user};
+grant select, update on jobmedia_jobmediaid_seq    to ${db_user};
+grant select, update on basefiles_baseid_seq	   to ${db_user};
+grant select, update on storage_storageid_seq	   to ${db_user};
+grant select, update on mediatype_mediatypeid_seq  to ${db_user};
+grant select, update on device_deviceid_seq	   to ${db_user};
+grant select, update on location_locationid_seq    to ${db_user};
+grant select, update on locationlog_loclogid_seq   to ${db_user};
+grant select, update on log_logid_seq		   to ${db_user};
 
 END-OF-DATA
 then
-   echo "Privileges for ${USER} granted on ${db_name}."
+   echo "Privileges for ${db_user} granted on ${db_name}."
    exit 0
 else
    echo "Error creating privileges."
diff --git a/bacula/src/cats/make_mysql_tables.in b/bacula/src/cats/make_mysql_tables.in
index 32a5b4d984..14a1d6c012 100644
--- a/bacula/src/cats/make_mysql_tables.in
+++ b/bacula/src/cats/make_mysql_tables.in
@@ -3,7 +3,7 @@
 # shell script to create Bacula MySQL tables
 #
 bindir=@SQL_BINDIR@
-db_name=@db_name@
+db_name=${db_name-@db_name@}
 
 if $bindir/mysql $* -f <<END-OF-DATA
 USE ${db_name};
diff --git a/bacula/src/cats/make_postgresql_tables.in b/bacula/src/cats/make_postgresql_tables.in
index d63e2de699..9e1518e767 100644
--- a/bacula/src/cats/make_postgresql_tables.in
+++ b/bacula/src/cats/make_postgresql_tables.in
@@ -3,7 +3,7 @@
 # shell script to create Bacula PostgreSQL tables
 #
 bindir=@SQL_BINDIR@
-db_name=@db_name@
+db_name=${db_name-@db_name@}
 
 $bindir/psql -f - -d ${db_name} $* <<END-OF-DATA
 
diff --git a/bacula/src/cats/sqlite.c b/bacula/src/cats/sqlite.c
index af9860091f..b6e78359de 100644
--- a/bacula/src/cats/sqlite.c
+++ b/bacula/src/cats/sqlite.c
@@ -59,14 +59,17 @@ static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 
 int QueryDB(const char *file, int line, JCR *jcr, B_DB *db, char *select_cmd);
 
-
 /*
  * Retrieve database type
  */
 const char *
 db_get_type(void)
 {
+#ifdef HAVE_SQLITE3
+   return "SQLite3";
+#else
    return "SQLite";
+#endif
 }
 
 /*
diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 35b0f93fef..cf913e2c74 100644
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -32,6 +32,10 @@ separator in console (!$%&'()*+,-/:;<>?[]^`{|}~)
 
 
 General:
+28Aug08
+ebl  Modify catalog scripts to have an easier packaging integration,
+     using default variables.
+     Make difference between SQLite3 and SQLite in db_get_type()
 27Aug08
 kes  Apply most of changes in a patch from:
       Michael Stapelberg <michael+bacula@stapelberg.de>
-- 
2.39.5