kes Fix client-only build.

kes  Integrate client-only fixes for bsys (initgroups) and conio from
     Sergey Svishchev <svs@ropnet.ru> for the AIX platform.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5149 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index 6bff27a406607b772ed85f31c86be9a6d44c2b72..797f5d987e3d7e55f005aa71d2c2fe5218502062 100644 (file)
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -2,6 +2,9 @@
 
 General:
 12Jul07
+kes  Fix client-only build.
+kes  Integrate client-only fixes for bsys (initgroups) and conio from
+     Sergey Svishchev <svs@ropnet.ru> for the AIX platform.
 kes  Make arguments to get_scratch_volume() in same order as other
      such calls.
 kes  Rework the prune_volumes() subroutine so that after purging and

diff --git a/bacula/src/cats/bdb.c b/bacula/src/cats/bdb.c
index 789271f519ddfb29724bb7c3bbafaf9ccc210c50..60f57849ea8df70df7fbd1440a102eda22f16e45 100644 (file)
--- a/bacula/src/cats/bdb.c
+++ b/bacula/src/cats/bdb.c
@@ -72,6 +72,20 @@ static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 #define DB_CLIENT_FILENAME   "client.db"
 #define DB_FILESET_FILENAME  "fileset.db"
 
+dbid_list::dbid_list() 
+{
+   memset(this, 0, sizeof(dbid_list));
+   max_ids = 1000;
+   DBId = (DBId_t *)malloc(max_ids * sizeof(DBId_t));
+   num_ids = num_seen = tot_ids = 0;
+   PurgedFiles = NULL;
+}
+
+dbid_list::~dbid_list() 
+{ 
+   free(DBId);
+}
+
 static POOLMEM *make_filename(B_DB *mdb, char *name)
 {
    char sep;

diff --git a/bacula/src/cats/bdb_create.c b/bacula/src/cats/bdb_create.c
index a4f4633ee20e6db8403fb1c6781a18808b96f7a4..035e7553668bfe0cb84a27162b7361ee4494c786 100644 (file)
--- a/bacula/src/cats/bdb_create.c
+++ b/bacula/src/cats/bdb_create.c
@@ -62,10 +62,10 @@ bool db_create_pool_record(B_DB *mdb, POOL_DBR *pr);
  * -----------------------------------------------------------------------
  */
 
-int db_create_file_attributes_record(JCR *jcr, B_DB *mdb, ATTR_DBR *ar)
+bool db_create_file_attributes_record(JCR *jcr, B_DB *mdb, ATTR_DBR *ar)
 {
    /* *****FIXME***** implement this */
-   return 1;
+   return true;
 }
 
 int db_create_file_item(JCR *jcr, B_DB *mdb, ATTR_DBR *ar)
@@ -312,5 +312,10 @@ bool db_create_fileset_record(JCR *jcr, B_DB *mdb, FILESET_DBR *fsr)
 int db_create_counter_record(JCR *jcr, B_DB *mdb, COUNTER_DBR *cr)
 { return 0; }
 
+bool db_write_batch_file_records(JCR *jcr) { return false; }
+bool my_batch_start(JCR *jcr, B_DB *mdb) { return false; }
+bool my_batch_end(JCR *jcr, B_DB *mdb, const char *error) { return false; }
+bool my_batch_insert(JCR *jcr, B_DB *mdb, ATTR_DBR *ar) { return false; }
+                                 
 
 #endif /* HAVE_BACULA_DB */

diff --git a/bacula/src/console/conio.c b/bacula/src/console/conio.c
index 967045136e116a03f43f915379321ebb7fca8205..f8dbfa9be9e00b3753028c757942c7920dd079df 100755 (executable)
--- a/bacula/src/console/conio.c
+++ b/bacula/src/console/conio.c
@@ -69,6 +69,9 @@ extern "C" char *tgetstr (const char*, char**);
 extern "C" char *tgoto (const char *, int, int);
 #elif HAVE_HPUX_OS
 #include <term.h>
+#elif HAVE_AIX_OS 
+#include <curses.h>
+#include <term.h>
 #elif defined (__digital__) && defined (__unix__)
 extern "C" int tgetent(void *, const char *);
 extern "C" int tgetnum(const char *);
@@ -82,7 +85,7 @@ extern "C" char *tgoto (const char *, int, int);
 
 
 /* From termios library */
-#ifdef HAVE_HPUX_OS
+#if defined(HAVE_HPUX_OS) || defined(HAVE_AIX_OS)
 static char *BC;
 static char *UP;
 #else

diff --git a/bacula/src/lib/bsys.c b/bacula/src/lib/bsys.c
index 8c0d88094be1a4e5484ff7f75b18e0275b9c72ae..d094e8701104830be8c0f6025c9d9bcd0fcb34fe 100644 (file)
--- a/bacula/src/lib/bsys.c
+++ b/bacula/src/lib/bsys.c
@@ -43,6 +43,11 @@
 #include <grp.h>
 #endif
 
+#ifdef HAVE_AIX_OS
+extern "C" int initgroups(char *,int);
+#endif
+
+
 static pthread_mutex_t timer_mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t timer = PTHREAD_COND_INITIALIZER;
 

diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index 8f97ec55741c8b0cd42a12183cb031fdc8ba957d..5e48a0a57f94271b51558862a815f778d2ea00a3 100644 (file)
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,7 +1,11 @@
               Technical notes on version 2.1
 
 General:
+Release 2.1.26 beta
 12Jul07
+kes  Fix client-only build.
+kes  Integrate client-only fixes for bsys (initgroups) and conio from
+     Sergey Svishchev <svs@ropnet.ru> for the AIX platform.
 kes  Make arguments to get_scratch_volume() in same order as other
      such calls.
 kes  Rework the prune_volumes() subroutine so that after purging and