kes Fix typo in Solaris acl code.

kes  Remove junk from configure.in

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

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 76652a07d9bbd2c3175f1f027c163e320b9eaf85..5bd48358794f1ae3f703f43f35b4a77e920f8a1b 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -279,7 +279,6 @@ fi
 dnl -------------------------------------------------------------------------
 dnl  If the user has not set --htmldir, we default to /usr/share/doc/bacula/html
 dnl -------------------------------------------------------------------------
-dnl z
 if test x$htmldir = x${docdir} ; then
    htmldir=`eval echo ${docdir}bacula/html`
 fi
@@ -287,7 +286,6 @@ fi
 dnl -------------------------------------------------------------------------
 dnl  If the user has not set --docdir, we default to /usr/share/doc/
 dnl -------------------------------------------------------------------------
-dnl z
 if test x$docdir = x'/usr/share/doc/' ; then
    docdir=`eval echo ${docdir}bacula`
 fi

diff --git a/bacula/patches/3.0.0-maxruntime.patch b/bacula/patches/3.0.0-maxruntime.patch
index f232eb360b1ea6aa0514dcf559a2557f1b0fc629..0bfabd5f67c45409146b90c06cd4891af6d78ee4 100644 (file)
--- a/bacula/patches/3.0.0-maxruntime.patch
+++ b/bacula/patches/3.0.0-maxruntime.patch
@@ -1,11 +1,11 @@
 
- This patch can be applied to version 3.0.0. It fixes bug #1268 
- Full Max Run TIme cancels jobs (when Max Run Time = 0).
+ This patch can be applied to version 3.0.1 and fixes a 
+ syntax error that causes builds on older Solarises to fail.
 
- Apply it to version 3.0.0 with:
+ Apply it to version 3.0.1 with:
 
  cd <bacula-source>
- patch -p0 <3.0.0-read-vol-list.patch
+ patch -p0 <3.0.1-solaris-acl.patch
  ./configure <your-options>
  make
  ...
@@ -13,47 +13,3 @@
 
 
 
-Index: src/dird/job.c
-===================================================================
---- src/dird/job.c     (revision 8699)
-+++ src/dird/job.c     (working copy)
-@@ -578,6 +578,7 @@
- {
-    bool cancel = false;
-    JOB *job = jcr->job;
-+   utime_t run_time;
- 
-    if (job_canceled(jcr) || jcr->JobStatus == JS_Created) {
-       return false;
-@@ -586,20 +587,25 @@
-        job->IncMaxRunTime == 0 && job->DiffMaxRunTime == 0) {
-       return false;
-    }
--   Dmsg6(200, "check_maxruntime %u - %u >= %u|%u|%u|%u\n\n",
--         watchdog_time, jcr->start_time, job->MaxRunTime, job->FullMaxRunTime, 
-+   run_time = watchdog_time - jcr->start_time;
-+   Dmsg7(200, "check_maxruntime %llu-%u=%llu >= %llu|%llu|%llu|%llu\n",
-+         watchdog_time, jcr->start_time, run_time, job->MaxRunTime, job->FullMaxRunTime, 
-          job->IncMaxRunTime, job->DiffMaxRunTime);
- 
-    if (jcr->get_JobLevel() == L_FULL && job->FullMaxRunTime != 0 &&
--         (watchdog_time - jcr->start_time) >= job->FullMaxRunTime) {
-+         run_time >= job->FullMaxRunTime) {
-+      Dmsg0(200, "check_maxwaittime: FullMaxcancel\n");
-       cancel = true;
-    } else if (jcr->get_JobLevel() == L_DIFFERENTIAL && job->DiffMaxRunTime != 0 &&
--         (watchdog_time - jcr->start_time) >= job->DiffMaxRunTime) {
-+         run_time >= job->DiffMaxRunTime) {
-+      Dmsg0(200, "check_maxwaittime: DiffMaxcancel\n");
-       cancel = true;
-    } else if (jcr->get_JobLevel() == L_INCREMENTAL && job->IncMaxRunTime != 0 &&
--         (watchdog_time - jcr->start_time) >= job->IncMaxRunTime) {
-+         run_time >= job->IncMaxRunTime) {
-+      Dmsg0(200, "check_maxwaittime: IncMaxcancel\n");
-       cancel = true;
--   } else if ((watchdog_time - jcr->start_time) >= job->MaxRunTime) {
-+   } else if (job->MaxRunTime > 0 && run_time >= job->MaxRunTime) {
-+      Dmsg0(200, "check_maxwaittime: Maxcancel\n");
-       cancel = true;
-    }
-  

diff --git a/bacula/patches/3.0.1-solaris-acl.patch b/bacula/patches/3.0.1-solaris-acl.patch
new file mode 100644 (file)
index 0000000..db8d055
--- /dev/null
+++ b/bacula/patches/3.0.1-solaris-acl.patch
@@ -0,0 +1,28 @@
+
+ This patch can be applied to version 3.0.1 and fixes a 
+ syntax error that causes builds on older Solarises to fail.
+
+ Apply it to version 3.0.1 with:
+
+ cd <bacula-source>
+ patch -p0 <3.0.1-solaris-acl.patch
+ ./configure <your-options>
+ make
+ ...
+ make install
+
+
+
+Index: src/filed/acl.c
+===================================================================
+--- src/filed/acl.c    (revision 8810)
++++ src/filed/acl.c    (working copy)
+@@ -1141,7 +1141,7 @@
+ /*
+  * OS specific functions for handling different types of acl streams.
+  */
+-static bool solaris_build_acl_streams(JCR *jcr, FF_PKT *ff_pkt);
++static bool solaris_build_acl_streams(JCR *jcr, FF_PKT *ff_pkt)
+ {
+    int n;
+    aclent_t *acls;

diff --git a/bacula/src/filed/acl.c b/bacula/src/filed/acl.c
index 607c23d1e5e350134af22aa5309a3358d71aee87..8155bb7f39d4eebc124519f15fae5490c6434536 100644 (file)
--- a/bacula/src/filed/acl.c
+++ b/bacula/src/filed/acl.c
@@ -1141,7 +1141,7 @@ static bool acl_is_trivial(int count, aclent_t *entries)
 /*
  * OS specific functions for handling different types of acl streams.
  */
-static bool solaris_build_acl_streams(JCR *jcr, FF_PKT *ff_pkt);
+static bool solaris_build_acl_streams(JCR *jcr, FF_PKT *ff_pkt)
 {
    int n;
    aclent_t *acls;

diff --git a/bacula/technotes b/bacula/technotes
index 376f85eb0891ea663ff10d713d8b209c98f8596d..9990e66cadcedac28291336e33cb310882f4e428 100644 (file)
--- a/bacula/technotes
+++ b/bacula/technotes
@@ -2,9 +2,12 @@
           
 General:
 
-06Apr09
+07May09
+kes  Fix typo in Solaris acl code.
+kes  Remove junk from configure.in
+06May09
 kes  Update projects file.
-04Apr09
+04May09
 kes  Add --with-bsrdir and --with-logdir for placement of Bacula bsr
      files and Bacula log files.