Add SSL connections to database (PostgreSQL) open code

[bacula/bacula] / bacula / src / cats / protos.h

diff --git a/bacula/src/cats/protos.h b/bacula/src/cats/protos.h
index cc6510c4478a76e3074c41e12fa65e8000601cfb..dacccb93d8abd481f765d6cafd1ad94154d66aff 100644 (file)
--- a/bacula/src/cats/protos.h
+++ b/bacula/src/cats/protos.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
@@ -46,7 +45,11 @@
 BDB *db_init_database(JCR *jcr, const char *db_driver, const char *db_name,
         const char *db_user, const char *db_password,
         const char *db_address, int db_port,
-        const char *db_socket, bool mult_db_connections, bool disable_batch_insert);
+        const char *db_socket,
+        const char *db_ssl_mode, const char *db_ssl_key,
+        const char *db_ssl_cert, const char *db_ssl_ca,
+        const char *db_ssl_capath, const char *db_ssl_cipher,
+        bool mult_db_connections, bool disable_batch_insert);
 
 /* Database prototypes and defines */
 
@@ -73,11 +76,11 @@ BDB *db_init_database(JCR *jcr, const char *db_driver, const char *db_name,
 #define db_start_transaction(jcr, mdb) \
            mdb->bdb_start_transaction(jcr)
 #define db_end_transaction(jcr, mdb) \
-           mdb->bdb_end_transaction(jcr)
+           if (mdb) mdb->bdb_end_transaction(jcr)
 #define db_sql_query(mdb, query, result_handler, ctx) \
            mdb->bdb_sql_query(query, result_handler, ctx)
 #define db_thread_cleanup(mdb) \
-           mdb->bdb_thread_cleanup()
+           if (mdb) mdb->bdb_thread_cleanup()
 
 /* sql.c */
 int db_int64_handler(void *ctx, int num_fields, char **row);
@@ -146,7 +149,8 @@ void bdb_free_restoreobject_record(JCR *jcr, ROBJECT_DBR *rr);
            bdb_disable_batch_insert(disable)
 #define db_create_snapshot_record(jcr, mdb, sr) \
            mdb->bdb_create_snapshot_record(jcr, sr)
-
+#define db_get_job_statistics(jcr, mdb, jr)      \
+           mdb->bdb_get_job_statistics(jcr, jr)
 
 /* sql_delete.c */
 #define db_delete_pool_record(jcr, mdb, pool_dbr) \
@@ -160,6 +164,8 @@ void bdb_free_restoreobject_record(JCR *jcr, ROBJECT_DBR *rr);
 
 
 /* sql_find.c */
+#define db_find_last_job_end_time(jcr, mdb, jr, etime, job) \
+           mdb->bdb_find_last_job_end_time(jcr, jr, etime, job)
 #define db_find_last_job_start_time(jcr, mdb, jr, stime, job, JobLevel) \
            mdb->bdb_find_last_job_start_time(jcr, jr, stime, job, JobLevel)
 #define db_find_job_start_time(jcr, mdb, jr, stime, job) \
@@ -234,8 +240,8 @@ void bdb_free_restoreobject_record(JCR *jcr, ROBJECT_DBR *rr);
            mdb->bdb_list_job_records(jcr, jr, sendit, ctx, type)
 #define db_list_job_totals(jcr, mdb, jr, sendit, ctx) \
            mdb->bdb_list_job_totals(jcr, jr, sendit, ctx)
-#define db_list_files_for_job(jcr, mdb, jobid, sendit, ctx) \
-           mdb->bdb_list_files_for_job(jcr, jobid, sendit, ctx)
+#define db_list_files_for_job(jcr, mdb, jobid, deleted, sendit, ctx)     \
+           mdb->bdb_list_files_for_job(jcr, jobid, deleted, sendit, ctx)
 #define db_list_media_records(jcr, mdb, mdbr, sendit, ctx, type) \
            mdb->bdb_list_media_records(jcr, mdbr, sendit, ctx, type)
 #define db_list_jobmedia_records(jcr, mdb, JobId, sendit, ctx, type) \