Merge branch 'master' of ssh://bacula.git.sourceforge.net/gitroot/bacula/bacula

diff --git a/bacula/manpages/bconsole.8 b/bacula/manpages/bconsole.8
index 46b0cc79a968827805bae45e72b903dd26cc9afb..a765b2ec4886c0fc9b47ab62c4fe703803a12421 100644 (file)
--- a/bacula/manpages/bconsole.8
+++ b/bacula/manpages/bconsole.8
@@ -28,7 +28,7 @@ Set debug level to \fInn\fP.
 Print timestamp in debug output.
 .TP
 .B \-n
-No conio (for debugging).
+No conio (for scripting).
 .TP
 .B \-s
 No signals (for debugging).

diff --git a/bacula/src/lib/lockmgr.h b/bacula/src/lib/lockmgr.h
index 1fe7c16563331537db7adaddd6ca0fd9b7cbae14..405b51ede1d8573c4084b10c2a1f23c84f7a6c77 100644 (file)
--- a/bacula/src/lib/lockmgr.h
+++ b/bacula/src/lib/lockmgr.h
@@ -195,7 +195,7 @@ int lmgr_thread_create(pthread_t *thread,
 # define lmgr_do_lock(m, prio, f, l)
 # define lmgr_do_unlock(m)
 # define lmgr_cleanup_main()
-# define bthread_mutex_set_priority(a)
+# define bthread_mutex_set_priority(a,b)
 # define bthread_mutex_lock(a)          pthread_mutex_lock(a)
 # define bthread_mutex_unlock(a)        pthread_mutex_unlock(a)
 # define lmgr_cond_wait(a,b)            pthread_cond_wait(a,b)

diff --git a/bacula/technotes b/bacula/technotes
index 4bb41b853d6d9f574896bf585b6e167f82a5f2bb..28b1796501d9e90333e401fd55f326a0cffb1dcf 100644 (file)
--- a/bacula/technotes
+++ b/bacula/technotes
@@ -2,6 +2,10 @@
           
 General:
 
+10Dec09
+ebl  Update the lock manager to detect possible race condition
+     on the fly. You can activate it with USE_LOCKMGR_PRIORITY in
+     version.h
 08Dec09
 ebl  Fix bug #1431 about bad reload command.
      Still an object to free in this case.