From 5de97d6f0ee8002de6c0c1a907b86a2c2f42f9bc Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 7 Dec 2005 18:20:58 +0000
Subject: [PATCH] - Modify most restore error messages to be queued so that
 they   appear at the end of the job rather than mixted with the restore  
 listing where they could be lost.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2650 91ce42f0-d328-0410-95d8-f526ca767f89
---
 .../examples/nagios_plugin_check_bacula.tgz   | Bin 0 -> 5827 bytes
 bacula/kernstodo                              |   1 +
 bacula/kes-1.39                               |   3 +
 bacula/projects                               | 801 +++++++++---------
 bacula/src/filed/restore.c                    |  16 +-
 bacula/src/findlib/create_file.c              |  40 +-
 bacula/src/lib/message.h                      |   1 +
 bacula/src/version.h                          |   4 +-
 8 files changed, 433 insertions(+), 433 deletions(-)
 create mode 100644 bacula/examples/nagios_plugin_check_bacula.tgz

diff --git a/bacula/examples/nagios_plugin_check_bacula.tgz b/bacula/examples/nagios_plugin_check_bacula.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..d9aaa6215917b513866047025751ee1b69ecbd5b
GIT binary patch
literal 5827
zcmV;!7Ch-6iwFRSH;h971MEEecN#~p{nh*xDoImt0RuM4EsoP*9yXtO9Tw+t(p<jv
z?gHB^yL>x~9p5JRZ@<z!_GSEt<EFQ#<s^ok(P%UpNu!Yjr5$5o86T!+y0Lcjo$vmL
zSGl}bepajDJAcXdihAa4mGbW1Zh3dNR>k&8b#J%&9n}61YErK?3v?ggJKytyo8Y`)
zVfo*Jpl|ysCHG%n<1*dAHuS(M84ol^xl%4a-P^ln|8eKbPig;mtCii|r+oiw)mr5{
zC_m8rH@^Pn`@gfD0s033hg<|8CIYtSmSE(2=eB9FR0mwx!9olK=-7@0x@&?Kc)mWj
zz|^g!=dx0W9AID@o})83^lW3H2L))X=g55M_q(qmu*t$^;Ct)9b}jJNE>4U8AXxa8
zZt^LXH0aDyO}>RR`MMi~a~<l;HXzX12L`5xXmI1Ky6D}>(1HP)-s;k~=ZgSx%{)}m
zLcxjUyP(-;XSyRM`j@wG;kE93u>4F$k+$-^xvwt)KhAJ!VBRda(0ywkF1<Avx{Cyv
zHVb_FY#mr&2ZU<J^9jMyGws<WwXI##@^J;Y3d>(I@MiqsXmAQgmTURC1EcksgUjgI
zhUGGgh9e_Z)W{Z=31^plM2Be5Bn{B<5Ha7KeXwj2SU9(QM!Qud400NYvjCnCIXxiC
zeehN^E|271f`i&04lQk5e6&UrY?q^5cq`f!M2IWAupNhXY0a$J+9?nU1cuk$$?@=X
z0*%32c-<I}8-vN)eJ)D4<zSs#0+qd7IW}U(RngX7BISgk-yS!QaY*B^+v`r=68)X-
zWYE?$=nTiufKg*S={8S$jWLW)$D^UvE&*s3k;PefJ%eF}$d(>5(X;~Hc9>Z9TijHJ
zw4q2W^mCL*%dqToq)Z0`Md<pCqrnQb?s)E;FA{+xHtvHx1J^@MxbSV1mB0(PltypZ
z)dF-~qf~&}&oHr&MHY-4-LRkt+L|!z?v@LvUo1dS&aVcPtCdQnSlKN<E5NDNC~+Og
zJhENGS(_GQh21YLvaz=Ki9kJ>bI&$`S*~dZvz&o?9RRAZ58JaPQeP^S^80a^1jyNX
zhP|kEsB_CDDgz^^fL7bGk)3ETh$OVaXj#OVR(HIx9LIb2o-D!vWRK|yeqg9yj$^y?
zU)`)gIkwo!<Gbg3%bV~GPa=$n5D%m>3{UFWYbZ;aF>VdGiHkieN#G`jPfwe7%206{
zb3&6MLThzen^qMPee3eH)>WLTb?u6E0Y}ZzT*1=0f~6C~f;g&Ia1fG?=c6#vvS(;b
zT?18MwssAYO2$QsA0%kgBmW^>8kad6SrYdyrl#!89csho32ftYLCOq%boHgB9#=YJ
z7oKnCGryBm6Q;mnQ^!MoO<fB~Ie^1KdorE$wCP|tXz$0teB3ge?pioL$C*x6bxO0o
z>o?v^2aSGv+G`JvCdcphxg|J5d*>Rf%Ule!03oH!{vXSm#XIwPj-FbkY=vsd61@T|
za&}@bEi!&W9P}BP-Wn`z!B@f%AcQ|fi3)650y!+f^o)6^q`WJ~S@*Pz{IAJLT`QQ*
zNE=0;(x?JlB>|04?t266(R69nrgI!f+a$&*&KKZGij{fz^eF@46^-6BGPzaxJp3-l
zp_y7GmVwI?<m1b?f;FDUW&Zp*B$O`<<>s7b$;0ylDBlm^jo>sB-|pp#<|)2dvUwq9
zM#Almn)1a;9==bIb9F}9QrXXZ-l#Asvx8>TwYZ9H)*vRprvhB*5i^zEFf-DkZAfVm
z2a)2tLF6A;&xEXV#%$w(Om5sI(A4VGOD&yNiOyTf=M>|266zRfpqbD_*}g#wRnPvz
zDIoDYu76yoVoFH;;Q<g@jeF|C^*T$_+)HJX10O_VuP7`tzlpvwQ>trtIEEq-w&cHF
zRpai!ZF)LG*p!maLM5I3g_JbD=zD1B>`&Ct*)1A6`!*UnyRU}MzJZ3$zKw>?l!kV$
zXlUo28v18PQU1EGRQ#{6f3V10m2CIn=D0cjSKg~VtA1B0SNHa+&-V8ADE_xstL*&~
z|N9oNN0~<euVj$uao4OvOauz&P$}*4@YqiI=bdT|D&>0R=X&jDaL+^-585AB@Hq1*
z^RnL@_WQ%Z%S?v(2HH<J*eYdSjT)0<G|2d|L?7#0_z9<^u-tl;L8EVRP$-qK70m}(
z-VDC0)*aEY;2|d;mEOT~=3Jae3K}~FI8K}p=S-&6K0G}-c*)<8vYG8OG<IvpssrA&
zGv<1^ysRTZ8Kk^B8IHAaQ$s|F2#5j6sJMb19{%eJte1rKGMspef<QixLV<Vo8~O@N
z1j?upx#-TLh+YZ3iJ3iLW6#R>@HAwZ_M6GLA!mDu@4c=z!No{2rp?i)(`y`Q2QLxq
z?KIu|G6d|kHo?i(m+<n<wAVdE_)JMV?R2_t+FE@JSC6YGjgE(dxAjb^H5^Qujd7cJ
zhE9cy1pslBWlBcLt7o<z=bCTc<l%9y)$VBG9l4)}qJf_kRn(rQ6hXR=b3%H=XDJ^X
zNq5lfownNaxv5Y*&pawV)GLDm5lMeyTj8ZPX-vA!X>&M0{%pOpjD-i;1AOrT6b4Md
zqqNRF4?PilWkYz#W-@WGdc*_T-8_lAW1rD~1Ssh-R?1C^b1iHt_QW{x0p*TC(Sye?
z)7XE_Y>BfJnTZ>X109?O|1N0)-1$6YP^u&Yh&Z_w@lyd?g?8q5grJrvl(c4<EyIlZ
z#9U9F05Yu8J(_m9y|#9M-9lCKJ4l`EI&L>w?Xh-%gSF#!uZLVnVa^zirMoCtFCXW|
z{Z2l~YJ+07^ry59sDJ1sZle}%m(KJLu>HUI0bO5IB>Z4~<R2<fh22cXw{%A!2L2YI
z5A-=hPEdqf0)()cEp%i8iv<yL$V%-CZy5RAI6(mo!S`WiXSQ;jGZK6s<SdG(VMEb}
z<|{3a6I<usU|yUE{pWxSJ()t3weA4Lyw{tK#>1m=qn~0l>9ICxb;o%`dS<&q1`^hG
z?JAUN_NzleLgGV_7&0iDwX}<9K)of8PR@BmohO@6!Axs~jyjqf+hTPDK1HKCH&A~2
zeK@lWeT~m=Di!$m5?3gIf5Z!l#oQkQK)3k=P~_HefL*e{S~5gIaa_vKILreX{bsTo
z7M5<}u}G)SzZuf?V~j9nlhKP4#4Wj`m$CyvlprDU$r~=w&e8}W$^BQ+UPNauN-giz
z+O0ffcmDekw1zMkPN3E9wI}WRPT}!mFtdpP@FINVW82N+Ar4Lt1=o%feF+Xy2s018
z?F*KL7bz^<@Dw#<@BOXzHl7|yyh@CVvuN>Biluo<i772`pZY8Z_gBCqna5cWX_Elq
z2DfNIR`Zq?S{=&2P*DED_b9&ptDfbMs3y3-4|RZi5y$_Z+*wlof70=JpgC^#|Era1
zWmowByX9)R@{IETm0Il||NmROV)_4pKDRvvBWFFwb3S3&qbz=N;iC}Sx{E5uycKe<
z068O%SA<#&DsiDm$`rp-l<7`U+bLJ^PLT=IM;p@ewG9(S`Dk={eBHnN<C5_`bic9h
zhScsoa`H4jOv{%lU!9eYapA9*l_xfHhHm2Y!zJf$-^f&sUNZH;a`c5SNYURbNB_vg
z0}yZ3bW>?hhbK@@HQ~k%x`QLAq}rR~F78gF2h~)^>EL8Ad_5p%nKHoL<;wGebl&&Y
zv@W|Xsk?utfH~U~FTWYfHR&-GYG>CWx=Xs7S37W#FqUQx(c3r~J}tL_{uUrAf!M~+
zyu3itXnJ=aqNvkdc47IFHcjO2&voC{&+y(I%jd_i!jk@q5iLE?Bkd5i65a7mr?qpn
zreJvTA93$eH3dHyvLHa-$3#g$Mh)VeSTkgFP9`m8D<9W6%dr6Ms$YO<E|a~JVMolF
z>}#YxK!bzE^eP18XlR}T{_4t8rj9r3S9pc&4hQ%tmxaR?iZ5jIR8qnJp~FWbPKnCo
zc?9o@CK{Eq^?d4}opatp@fb}ed8jRw=_n3F5~Mf+(g2Q12I&#_IYGbRPxOgHUQorE
z8cs!Qi7_pBF1l#c#lkigVNS&p#MLRT^@*9EW@ch!AD$C_F&m!=O`P0wJTn;Ce6g<L
zHjg9a6T?s7`O>Tv7dl(K2$Koiw(152nrMDONn+Rtp3}O;tn?|lK5}ZU)DlhCh496!
zK(H7%i)j`&Im0gydvWOzMtF%t;g*%;erNLqI38+~=}@C=yf&e1nD~VIpXaGM6!(XC
z315b85`7(+DoZ0LzJ3XP$?sxORQq&YJeFrvhBXp(U8>TMma)XqIc}N!xe;o!KR<u>
zK32_QEO=T2b#mO+fRPO~c}ug`Z4V~cLKaapX?XW)V+&a~Y6{bYBz^CywetI@szvP3
zyK1~miVM#uqF)~CSzRDxIZ7+?tv;ZXO9&$D&^vP0BRJm*3=hwwgXFm(hN1A=bC<g#
z=z$dAw|$W)^4CTH{Z_5%A^Sceqs*GIpBTU=q|az{e5Ca$72?DOW0%eiGJQfYWQV}5
zo=Qxg&KwHn9LT&;qHBTn)v+jStaXp3-J^j5L0;osGsrzjfG>6SA+JEh#5o)|>W)wZ
zBhUg2PJ2CBT7#4t=!fK17X`>>RlN=JA9qhj8)UARtDHc(yyP`GQ=8?4sF08plIMI@
zfD*q<k4siI(ZMk<**r%iBnUw(gN{fpho<HL=2n1iWpbM1daK^AkLo9Nv%dHxE7EUN
z((-#or2^46!r_R5H*TSB7<kWzACG^m^QSGfS`x$pd9H{X=jVNAzJ>Sr_^?)bm=M<6
z2lmqgV-kJ)=#d&NrCSd?J9pcllk}9dp|=e(#h|U&>9T1)itOd$Fe(E}eaQFZ@QN7o
zng3ODiVX@UUf{&3reESs=;Y~ZCm`y!)XBZiAFPjdkgJ3V-p^sKm1G5q2mCtX3Ols3
zL!tveMU5)YOTba$Hk?2_@+lH_BCkrkLMwyH6qzQp5nbHh+!L}8dDV2fLT}p=jd%e~
z8jbBd&<5dVIhKoil@Et?Y*%-3p;1A_jj+-=n6r_`zj1p3Hau5p>2N?En}7N#mLHd{
z4(b29-`=Al{ZOuc%obvH%YGlO{Ws!PHNIT*&6K|kzo^0qnJYJzt4Jxb2!;;Lfs_p%
z<03dN#XM8ao3`ZPQNp7{3OK#(i<lT%wd<gMu9PeL0<G-RP17fz06R&c_v3w`?{Gj1
zO>`|xzr;P0gZN1!QFE8H6kM*TdpyPI+f6*q_G6tmC*FGv0(hbh!l<`3rQ!nYBikk<
z?lWK4W~MRojyw~GX-R9{%(OHZa&0%{n(S13OR`ONZf2b9{1VoY7tlCrU(Y$^9^9LE
zv%B(+yC$X1Ev!pHA?K<g=S1IT#)-bod=q_N!ZzVgUC%Y?X5EEpk|~k>RK~56FlfZI
zI1zEV7d(vICvh`;vJ}_Bth{gWytlFT@fu2Zj{=03!8ng^#j+7YibSzme)xzIVq|ur
zs~}6p+T(tAfHoZMA(}8Mpn~?WL-tD!G#rmvNvyF-UST!yszz6{)QV(Tk6e%N>E%`P
zYOF!r?62IVmD?g6>g|Lxy*-Qh(c4UVYSO!*(Zv_ERno}w^E28qb&QfE<`nw87^Orh
zRUfrEIwFQBuA0RcN{snKEE*wj$)i3ZNGwK?Gb3`;`o4gic%UUo(JW5U>@E~ZlcY!@
zMb1eke*s0QpiPn}7AK0`NL1+Lhz@y9XWPE-(bo)wGVnMF-ZNbf1q+&vO(`O}4y$tH
z5?wvh1#g{3PisqQCh7dzsE!m?!a{-`UC7+^GJ4oHg;~RAzCLO4ve{S_f1Fz}*Imdd
zcQs7479lL#5M3;lPHaQ`YI&1xY*G*OB59gPJ+5v(g2V|$P+>Ae6|KCyl=;7G`0W@W
z4_RKBi3%bQ3vtO&jnbXLk;1hOd8Dvpd2=KrSJer-IY%OW`a1e!6|+b?M}38O*(%P)
ztHcwEmcVc=`JwJ%zu3J{`@W9;WLZ8rwjBGFHK=Conng%F*RCUWC;0+hEkv3s)K+b@
z(p$tPl{OWc5VL+(B2L<q<cT=(BS9y|s$)y&Epq3uL0Jt5Bj`nF>Mju|c}bzJAK3RK
zwX&W$O^_P8k)rQ69d`VD6G!yc7f=*OCCIAde??g#ArZVhm%B7uDM1ll5Vqf85z&`+
zq}h8{elJ}|0TzbOm7!Eo@-SkNt3(?>h;n2fmAvwj<%Gq{!;8>gMYrU_auBDbqKLeP
zB=!wKe({bOwUlp0)k|T?@)hnNt4|qK6(9$nN<SIhxh>pyybQ0o`^nvEX6Wv0)A%sX
zj+an0^gQ5F5%+$iUCBNrx2S$)hBs`A!4utg+V&q9&l9Zgvd!1+=2qzH-Y_Q;6`Kto
z6Vjf*JUk(s@!$eL{02gME5DSWb&m#(o)q)6c5=e;Y9B(khb;jLVT|SqohtoRgy+xE
zS#80K7g_1Hr^H!8Qr~C%9};*Y38V3_KbnM8+)6}jkO&qyVS=U<()IOZ9k(0f$zi(@
zQ5O33N!Ln1A5QVa9t{UtJD->*CIL6B>D0A8u28@5^hqrVND4_;)a=v1o9fK4?UV+K
zSvN???{v`+L^j4Px@>&<BsYIN9*%`#T*vm9UU2Ao5);~k2$MWEHXFV#vEDYDiq!_*
zDs88Jzw;E~uE%)7-OhVuAcZweOHItkZj>bzNsBDBbgGwA$?zu|3|tyoFoV8plbAbl
zr2p(vn7`%gruwhN1I=;E_djZT&uXdff7GhwXaCfHeT$d)YGXGnentCj&*<k<M4?MS
z8Bb|kzWBFX5>;S?sVFg(7Q71Vsr+WifAMdYRO{7py<ACuv*fS)n=PO-9_+gRZ??z+
ztH0lGwxo)~{^mc~l8ODm##qIxDLTri2muMW41W}fS^rtnH4hg>+`(Ie^%1Wr9D{||
z4CDsmabkYrkJXoeD6@zbxgZ+V9Y{WkIEZ|Zkp}tH>5jDtkE}~Xvc1>9=6Iq4QZIDo
zK3LXDFn7(9c_z{Lc|W68N|oCXhUfJ_iY|-RBG*7wAbbJUvYfurYM~#i$){06(_Rn9
zE%`WkJ5uDMdw6m>;*(O9RO07jc#VOK@QR7>1Hi)c!@>t1S>ySR^zzgiPaC)+J}RXs
zrV#l(8T=CglsgPniIMnd75UsaJUOvSoyg=O(rvj^H#TL=xpp|JfTs1-j_gQ_o~VCO
zlBmjER85DJsB3uUqktlxubZ6zTn&fd^YhvyG)mDo>=hgO+K~p^@@l`Ci@flSmnf+S
zfGYWT5KgY?OC8ey>BU2ZEqEEwxt>^+EY`zou`hs#1sp1cqtj}N70PeA?<a5s^6T%!
z4Ha2J`^_wTFj)$fb|+NH;W4cP6$Za%du5U#y}OZ0h%n}6u_g*$^V+faFA2y3vW?oY
zVV}NQiYa1fUAI1wvABMD+AYhA)yFA&!op4aqgN=*n5g09zeeTC?@o~pQG<TwozsdV
zyDFBw=7;Ev3W#j^vwb`CZ7v*r8X7>Q*+78_HkH0yymC!-nYJI#xT)s<YuAo$C<I|B
zfG*?)j^h}{-F@6Pzy|NbbAC+|QcMc8SN^Q6`!>Ji`S@H(k7WMoS<`IJKHhp)v#_e!
zc)v?4aw}f5a*ZR$Dnzvh<MzC=kkD>d9J4j@3+skR#q<Di-CMJ=e;?if000000002^
Nycdv3)NcTI008XGXAuAZ

literal 0
HcmV?d00001

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 39432750a7..0e1013f55a 100644
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -17,6 +17,7 @@ Document:
 - %d and %v only valid on Director, not for ClientRunBefore/After.
 
 For 1.39:
+- Make hardlink code at line 240 of find_one.c use binary search.
 - Queue warning/error messages during restore so that they
   are reported at the end of the report rather than being
   hidden in the file listing ...
diff --git a/bacula/kes-1.39 b/bacula/kes-1.39
index 1195f3cf6a..125c05baee 100644
--- a/bacula/kes-1.39
+++ b/bacula/kes-1.39
@@ -7,6 +7,9 @@ Changes to 1.39.2:
 07Dec05
 - Remove warning message about multiple saves of hardlinked files
   from find_one.c as it can generate too many warning messages.
+- Modify most restore error messages to be queued so that they
+  appear at the end of the job rather than mixted with the restore
+  listing where they could be "lost".
 06Dec05
 - Reset timeout values before select() per patch from 
   Frank Sweetser for problems with non-blocking sockets.
diff --git a/bacula/projects b/bacula/projects
index 6c3450ed37..312a3b6501 100644
--- a/bacula/projects
+++ b/bacula/projects
@@ -1,39 +1,53 @@
                 
 Projects:
                      Bacula Projects Roadmap 
-                       29 November 2005
+                       07 December 2005
+                    (prioritized by user vote)
 
 Summary:
-Item 1:   Implement Migration that moves Jobs from one Pool to another.
-Item 2:   Implement extraction of Win32 BackupWrite data.
-Item 3:   Implement a Bacula GUI/management tool using Python.
-Item 4:   Implement a Python interface to the Bacula catalog.
-Item 5:   Implement more Python events in Bacula.
-Item 6:   Implement Base jobs.
-Item 7:   Add Plug-ins to the FileSet Include statements.
-Item 8:   Implement huge exclude list support using hashing.
-Item 9:   Implement data encryption (as opposed to comm encryption)
-Item 10:  Permit multiple Media Types in an Autochanger
-Item 11:  Allow different autochanger definitions for one autochanger.
-Item 12:  Implement red/black binary tree routines.
-Item 13:  Improve Baculas tape and drive usage and cleaning management.
-Item 14:  Merge multiple backups (Synthetic Backup or Consolidation).
-Item 15:  Automatic disabling of devices
-Item 16:  Directive/mode to backup only file changes, not entire file
-Item 17:  Quick release of FD-SD connection after backup.
-Item 18:  Add support for FileSets in user directories  CACHEDIR.TAG
-Item 19:  Implement new {Client}Run{Before|After}Job feature.
-Item 20:  Allow FD to initiate a backup
-Item 21:  Multiple threads in file daemon for the same job
-Item 22:  Archival (removal) of User Files to Tape
-Item 23:  Deletion of Disk-Based  BaculaVolumes
-Item 24:  Accurate restoration of renamed/deleted files from
-Item 25:  Implement creation and maintenance of copy pools
+Item  1:  Implement data encryption (as opposed to comm encryption)
+Item  2:  Implement Migration that moves Jobs from one Pool to another.
+Item  3:  Accurate restoration of renamed/deleted files from
+Item  4:  Implement a Bacula GUI/management tool using Python.
+Item  5:  Implement Base jobs.
+Item  6:  Allow FD to initiate a backup
+Item  7:  Improve Bacula's tape and drive usage and cleaning management.
+Item  8:  Implement creation and maintenance of copy pools
+Item  9:  Implement new {Client}Run{Before|After}Job feature.
+Item 10:  Merge multiple backups (Synthetic Backup or Consolidation).
+Item 11:  Deletion of Disk-Based Bacula Volumes
+Item 12:  Directive/mode to backup only file changes, not entire file
+Item 13:  Multiple threads in file daemon for the same job
+Item 14:  Implement red/black binary tree routines.
+Item 15:  Add support for FileSets in user directories  CACHEDIR.TAG
+Item 16:  Implement extraction of Win32 BackupWrite data.
+Item 17:  Implement a Python interface to the Bacula catalog.
+Item 18:  Archival (removal) of User Files to Tape
+Item 19:  Add Plug-ins to the FileSet Include statements.
+Item 20:  Implement more Python events in Bacula.
+Item 21:  Quick release of FD-SD connection after backup.
+Item 22:  Permit multiple Media Types in an Autochanger
+Item 23:  Allow different autochanger definitions for one autochanger.
+Item 24:  Automatic disabling of devices
+Item 25:  Implement huge exclude list support using hashing.
 
 
 Below, you will find more information on future projects:
 
-Item 1:   Implement Migration that moves Jobs from one Pool to another.
+Item  1:  Implement data encryption (as opposed to comm encryption)
+  Date:   28 October 2005
+  Origin: Sponsored by Landon and 13 contributors to EFF.
+  Status: Landon Fuller is currently implementing this.
+                  
+  What:   Currently the data that is stored on the Volume is not
+          encrypted. For confidentiality, encryption of data at
+          the File daemon level is essential. 
+          Data encryption encrypts the data in the File daemon and
+          decrypts the data in the File daemon during a restore.
+
+  Why:    Large sites require this.
+
+Item 2:   Implement Migration that moves Jobs from one Pool to another.
   Origin: Sponsored by Riege Software International GmbH. Contact:
           Daniel Holtkamp <holtkamp at riege dot com>
   Date:   28 October 2005
@@ -61,25 +75,34 @@ Item 1:   Implement Migration that moves Jobs from one Pool to another.
            Number of Jobs
            Number of Volumes
 
+Item  3:  Accurate restoration of renamed/deleted files from
+          Incremental/Differential backups
+  Date:   28 November 2005
+  Origin: Martin Simmons (martin at lispworks dot com)
+  Status:
 
-Item 2:   Implement extraction of Win32 BackupWrite data.
-  Origin: Thorsten Engel <thorsten.engel at matrix-computer dot com>
-  Date:   28 October 2005
-  Status: Assigned to Thorsten. Implemented in current CVS
+  What:   When restoring a fileset for a specified date (including "most
+          recent"), Bacula should give you exactly the files and directories
+          that existed at the time of the last backup prior to that date.
 
-  What:   This provides the Bacula File daemon with code that
-          can pick apart the stream output that Microsoft writes
-          for BackupWrite data, and thus the data can be read
-          and restored on non-Win32 machines.
+          Currently this only works if the last backup was a Full backup.
+          When the last backup was Incremental/Differential, files and
+          directories that have been renamed or deleted since the last Full
+          backup are not currently restored correctly.  Ditto for files with
+          extra/fewer hard links than at the time of the last Full backup.
 
-  Why:    BackupWrite data is the portable=no option in Win32
-          FileSets, and in previous Baculas, this data could
-          only be extracted using a Win32 FD. With this new code,
-          the Windows data can be extracted and restored on
-          any OS.
+  Why:    Incremental/Differential would be much more useful if this worked.
+
+  Notes:  Item 14 (Merging of multiple backups into a single one) seems to
+          rely on this working, otherwise the merged backups will not be
+          truly equivalent to a Full backup.  
 
+          Kern: notes shortened. This can be done without the need for 
+          inodes. It is essentially the same as the current Verify job,
+          but one additional database record must be written, which does 
+          not need any database change.
 
-Item 3:   Implement a Bacula GUI/management tool using Python.
+Item 4:   Implement a Bacula GUI/management tool using Python.
   Origin: Kern
   Date:   28 October 2005
   Status: 
@@ -101,40 +124,7 @@ Item 3:   Implement a Bacula GUI/management tool using Python.
  Notes:   This is currently being implemented using Python-GTK by       
           Lucas Di Pentima <lucas at lunix dot com dot ar>
 
-
-Item 4:   Implement a Python interface to the Bacula catalog.
-  Date:   28 October 2005
-  Origin: Kern
-  Status: 
-
-  What:   Implement an interface for Python scripts to access
-          the catalog through Bacula.
-
-  Why:    This will permit users to customize Bacula through
-          Python scripts.
-
-Item 5:   Implement more Python events in Bacula.
-  Date:   28 October 2005
-  Origin: 
-  Status: 
-
-  What:   Allow Python scripts to be called at more places 
-          within Bacula and provide additional access to Bacula
-          internal variables.
-
-  Why:    This will permit users to customize Bacula through
-          Python scripts.
-
-  Notes:  Recycle event
-          Scratch pool event
-          NeedVolume event
-          MediaFull event
-           
-          Also add a way to get a listing of currently running
-          jobs (possibly also scheduled jobs).
-
-
-Item 6:   Implement Base jobs.
+Item 5:   Implement Base jobs.
   Date:   28 October 2005
   Origin: Kern
   Status: 
@@ -168,101 +158,19 @@ Item 6:   Implement Base jobs.
           FD a list of files/attribs, and the FD must search the
           list and compare it for each file to be saved.
 
-Item 7:   Add Plug-ins to the FileSet Include statements.
-  Date:   28 October 2005
-  Origin:
-  Status: Partially coded in 1.37 -- much more to do.
-
-  What:   Allow users to specify wild-card and/or regular
-          expressions to be matched in both the Include and
-          Exclude directives in a FileSet.  At the same time,
-          allow users to define plug-ins to be called (based on
-          regular expression/wild-card matching).
-
-  Why:    This would give the users the ultimate ability to control
-          how files are backed up/restored.  A user could write a
-          plug-in knows how to backup his Oracle database without
-          stopping/starting it, for example.
-
-Item 8:   Implement huge exclude list support using hashing.
-  Date:   28 October 2005
-  Origin: Kern
-  Status: 
-
-  What:   Allow users to specify very large exclude list (currently
-          more than about 1000 files is too many).
-
-  Why:    This would give the users the ability to exclude all
-          files that are loaded with the OS (e.g. using rpms
-          or debs). If the user can restore the base OS from
-          CDs, there is no need to backup all those files. A
-          complete restore would be to restore the base OS, then
-          do a Bacula restore. By excluding the base OS files, the
-          backup set will be *much* smaller.
-
-
-Item  9:  Implement data encryption (as opposed to comm encryption)
-  Date:   28 October 2005
-  Origin: Sponsored by Landon and 13 contributors to EFF.
-  Status: Landon Fuller is currently implementing this.
-                  
-  What:   Currently the data that is stored on the Volume is not
-          encrypted. For confidentiality, encryption of data at
-          the File daemon level is essential. 
-          Data encryption encrypts the data in the File daemon and
-          decrypts the data in the File daemon during a restore.
-
-  Why:    Large sites require this.
-
-Item 10:  Permit multiple Media Types in an Autochanger
-  Origin: Kern
-  Status: Now implemented
-
-  What:   Modify the Storage daemon so that multiple Media Types
-          can be specified in an autochanger. This would be somewhat
-          of a simplistic implementation in that each drive would
-          still be allowed to have only one Media Type.  However,
-          the Storage daemon will ensure that only a drive with
-          the Media Type that matches what the Director specifies
-          is chosen.
-
-  Why:    This will permit user with several different drive types
-          to make full use of their autochangers.
-
-Item 11:  Allow different autochanger definitions for one autochanger.
-  Date:   28 October 2005
-  Origin: Kern
-  Status: 
-
-  What:   Currently, the autochanger script is locked based on
-          the autochanger. That is, if multiple drives are being
-          simultaneously used, the Storage daemon ensures that only
-          one drive at a time can access the mtx-changer script.
-          This change would base the locking on the control device,
-          rather than the autochanger. It would then permit two autochanger
-          definitions for the same autochanger, but with different 
-          drives. Logically, the autochanger could then be "partitioned"
-          for different jobs, clients, or class of jobs, and if the locking
-          is based on the control device (e.g. /dev/sg0) the mtx-changer
-          script will be locked appropriately.
-
-  Why:    This will permit users to partition autochangers for specific
-          use. It would also permit implementation of multiple Media
-          Types with no changes to the Storage daemon.
-
-Item 12:  Implement red/black binary tree routines.
-  Date:   28 October 2005
-  Origin: Kern
-  Status: 
+Item  6:  Allow FD to initiate a backup
+  Origin: Frank Volf (frank at deze dot org)
+  Date:   17 November 2005
+  Status:
 
-  What:   Implement a red/black binary tree class. This could 
-          then replace the current binary insert/search routines
-          used in the restore in memory tree.  This could significantly
-          speed up the creation of the in memory restore tree.
+   What:  Provide some means, possibly by a restricted console that
+          allows a FD to initiate a backup, and that uses the connection
+          established by the FD to the Director for the backup so that
+          a Director that is firewalled can do the backup.
 
-  Why:    Performance enhancement.
+   Why:   Makes backup of laptops much easier.
 
-Item 13:  Improve Baculas tape and drive usage and cleaning management.
+Item  7:  Improve Bacula's tape and drive usage and cleaning management.
   Date:   8 November 2005, November 11, 2005
   Origin: Adam Thornton <athornton at sinenomine dot net>,
           Arno Lehmann <al at its-lehmann dot de>
@@ -330,169 +238,63 @@ Item 13:  Improve Baculas tape and drive usage and cleaning management.
           sub-projects: Measuring Tape and Drive usage, retiring
           volumes, and handling drive cleaning and TAPEALERTs.
 
+Item  8:  Implement creation and maintenance of copy pools
+  Date:   27 November 2005
+  Origin: David Boyes (dboyes at sinenomine dot net)
+  Status:
 
-Item 14:  Merge multiple backups (Synthetic Backup or Consolidation).
-  Origin: Marc Cousin and Eric Bollengier 
-  Date:   15 November 2005
-  Status: Depends on first implementing project Item 1 (Migration).
+  What:   I would like Bacula to have the capability to write copies
+          of backed-up data on multiple physical volumes selected
+          from different pools without transferring the data
+          multiple times, and to accept any of the copy volumes
+          as valid for restore.
 
-  What:   A merged backup is a backup made without connecting to the Client.
-          It would be a Merge of existing backups into a single backup.
-          In effect, it is like a restore but to the backup medium.
+  Why:    In many cases, businesses are required to keep offsite
+          copies of backup volumes, or just wish for simple
+          protection against a human operator dropping a storage
+          volume and damaging it. The ability to generate multiple
+          volumes in the course of a single backup job allows
+          customers to simple check out one copy and send it
+          offsite, marking it as out of changer or otherwise
+          unavailable. Currently, the library and magazine
+          management capability in Bacula does not make this process
+          simple.
 
-          For instance, say that last Sunday we made a full backup.  Then
-          all week long, we created incremental backups, in order to do
-          them fast.  Now comes Sunday again, and we need another full.
-          The merged backup makes it possible to do instead an incremental
-          backup (during the night for instance), and then create a merged
-          backup during the day, by using the full and incrementals from
-          the week.  The merged backup will be exactly like a full made
-          Sunday night on the tape, but the production interruption on the
-          Client will be minimal, as the Client will only have to send
-          incrementals.
+          Restores would use the copy of the data on the first
+          available volume, in order of copy pool chain definition.
 
-          In fact, if it's done correctly, you could merge all the
-          Incrementals into single Incremental, or all the Incrementals
-          and the last Differential into a new Differential, or the Full,
-          last differential and all the Incrementals into a new Full
-          backup.  And there is no need to involve the Client.
+          This is also a major scalability issue -- as the number of
+          clients increases beyond several thousand, and the volume
+          of data increases, transferring the data multiple times to
+          produce additional copies of the backups will become
+          physically impossible due to transfer speed
+          issues. Generating multiple copies at server side will
+          become the only practical option. 
 
-  Why:    The benefit is that :
-          - the Client just does an incremental ;
-          - the merged backup on tape is just as a single full backup,
-            and can be restored very fast.
+  How:    I suspect that this will require adding a multiplexing
+          SD that appears to be a SD to a specific FD, but 1-n FDs
+          to the specific back end SDs managing the primary and copy
+          pools.  Storage pools will also need to acquire parameters
+          to define the pools to be used for copies. 
 
-          This is also a way of reducing the backup data since the old
-          data can then be pruned (or not) from the catalog, possibly
-          allowing older volumes to be recycled
+  Notes:  I would commit some of my developers' time if we can agree
+          on the design and behavior. 
 
-Item 15:  Automatic disabling of devices
-   Date:   2005-11-11
-   Origin: Peter Eriksson <peter at ifm.liu dot se>
-   Status:
+Item  9:  Implement new {Client}Run{Before|After}Job feature.
+  Date:   26 September 2005
+  Origin: Phil Stracchino <phil.stracchino at speakeasy dot net>
+  Status: 
 
-   What:  After a configurable amount of fatal errors with a tape drive
-          Bacula should automatically disable further use of a certain
-          tape drive. There should also be "disable"/"enable" commands in
-          the "bconsole" tool.
+  What:   Some time ago, there was a discussion of RunAfterJob and
+          ClientRunAfterJob, and the fact that they do not run after failed
+          jobs.  At the time, there was a suggestion to add a
+          RunAfterFailedJob directive (and, presumably, a matching
+          ClientRunAfterFailedJob directive), but to my knowledge these
+          were never implemented.
 
-   Why:   On a multi-drive jukebox there is a possibility of tape drives
-          going bad during large backups (needing a cleaning tape run,
-          tapes getting stuck). It would be advantageous if Bacula would
-          automatically disable further use of a problematic tape drive
-          after a configurable amount of errors has occurred.
-
-          An example: I have a multi-drive jukebox (6 drives, 380+ slots)
-          where tapes occasionally get stuck inside the drive. Bacula will
-          notice that the "mtx-changer" command will fail and then fail
-          any backup jobs trying to use that drive. However, it will still
-          keep on trying to run new jobs using that drive and fail -
-          forever, and thus failing lots and lots of jobs... Since we have
-          many drives Bacula could have just automatically disabled
-          further use of that drive and used one of the other ones
-          instead.
-
-
-Item 16:  Directive/mode to backup only file changes, not entire file
-  Date:   11 November 2005
-  Origin: Joshua Kugler <joshua dot kugler at uaf dot edu>
-          Marek Bajon <mbajon at bimsplus dot com dot pl>
-  Status: RFC
-
-  What:   Currently when a file changes, the entire file will be backed up in
-          the next incremental or full backup.  To save space on the tapes
-          it would be nice to have a mode whereby only the changes to the
-          file would be backed up when it is changed.
-
-  Why:    This would save lots of space when backing up large files such as 
-          logs, mbox files, Outlook PST files and the like.
-
-  Notes:  This would require the usage of disk-based volumes as comparing 
-          files would not be feasible using a tape drive.
-
-Item 17:  Quick release of FD-SD connection after backup.
-  Origin: Frank Volf (frank at deze dot org)
-  Date:   17 November 2005
-  Status:
-
-   What:  In the Bacula implementation a backup is finished after all data
-          and attributes are successfully written to storage.  When using a
-          tape backup it is very annoying that a backup can take a day,
-          simply because the current tape (or whatever) is full and the
-          administrator has not put a new one in.  During that time the
-          system cannot be taken off-line, because there is still an open
-          session between the storage daemon and the file daemon on the
-          client.
-
-          Although this is a very good strategy for making "safe backups"
-          This can be annoying for e.g.  laptops, that must remain
-          connected until the backup is completed.
-
-          Using a new feature called "migration" it will be possible to
-          spool first to harddisk (using a special 'spool' migration
-          scheme) and then migrate the backup to tape.
-
-          There is still the problem of getting the attributes committed.
-          If it takes a very long time to do, with the current code, the
-          job has not terminated, and the File daemon is not freed up.  The
-          Storage daemon should release the File daemon as soon as all the
-          file data and all the attributes have been sent to it (the SD).
-          Currently the SD waits until everything is on tape and all the
-          attributes are transmitted to the Director before signaling
-          completion to the FD. I don't think I would have any problem
-          changing this.  The reason is that even if the FD reports back to
-          the Dir that all is OK, the job will not terminate until the SD
-          has done the same thing -- so in a way keeping the SD-FD link
-          open to the very end is not really very productive ...
-
-   Why:   Makes backup of laptops much easier.
-
-
-Item 18:  Add support for FileSets in user directories  CACHEDIR.TAG
-  Origin: Norbert Kiesel <nkiesel at tbdnetworks dot com>
-  Date:   21 November 2005
-  Status:
-
-  What:   CACHDIR.TAG is a proposal for identifying directories which
-          should be ignored for archiving/backup.  It works by ignoring
-          directory trees which have a file named CACHEDIR.TAG with a
-          specific content.  See
-          http://www.brynosaurus.com/cachedir/spec.html
-          for details.
-
-          From Peter Eriksson:
-          I suggest that if this is implemented (I've also asked for this
-          feature some year ago) that it is made compatible with Legato
-          Networkers ".nsr" files where you can specify a lot of options on
-          how to handle files/directories (including denying further
-          parsing of .nsr files lower down into the directory trees).  A
-          PDF version of the .nsr man page can be viewed at:
-
-          http://www.ifm.liu.se/~peter/nsr.pdf
-
-  Why:    It's a nice alternative to "exclude" patterns for directories
-          which don't have regular pathnames.  Also, it allows users to
-          control backup for themselves.  Implementation should be pretty
-          simple.  GNU tar >= 1.14 or so supports it, too.
-
-  Notes:  I envision this as an optional feature to a fileset
-          specification.
-
-Item 19:  Implement new {Client}Run{Before|After}Job feature.
-  Date:   26 September 2005
-  Origin: Phil Stracchino <phil.stracchino at speakeasy dot net>
-  Status: 
-
-  What:   Some time ago, there was a discussion of RunAfterJob and
-          ClientRunAfterJob, and the fact that they do not run after failed
-          jobs.  At the time, there was a suggestion to add a
-          RunAfterFailedJob directive (and, presumably, a matching
-          ClientRunAfterFailedJob directive), but to my knowledge these
-          were never implemented.
-
-          An alternate way of approaching the problem has just occurred to
-          me.  Suppose the RunBeforeJob and RunAfterJob directives were
-          expanded in a manner something like this example:
+          An alternate way of approaching the problem has just occurred to
+          me.  Suppose the RunBeforeJob and RunAfterJob directives were
+          expanded in a manner something like this example:
 
           RunBeforeJob {
               Command = "/opt/bacula/etc/checkhost %c"
@@ -561,19 +363,80 @@ Item 19:  Implement new {Client}Run{Before|After}Job feature.
           line so that the same script can be used both before/after.
           David Boyes.
 
-Item 20:  Allow FD to initiate a backup
-  Origin: Frank Volf (frank at deze dot org)
-  Date:   17 November 2005
-  Status:
+Item 10:  Merge multiple backups (Synthetic Backup or Consolidation).
+  Origin: Marc Cousin and Eric Bollengier 
+  Date:   15 November 2005
+  Status: Depends on first implementing project Item 1 (Migration).
 
-   What:  Provide some means, possibly by a restricted console that
-          allows a FD to initiate a backup, and that uses the connection
-          established by the FD to the Director for the backup so that
-          a Director that is firewalled can do the backup.
+  What:   A merged backup is a backup made without connecting to the Client.
+          It would be a Merge of existing backups into a single backup.
+          In effect, it is like a restore but to the backup medium.
 
-   Why:   Makes backup of laptops much easier.
+          For instance, say that last Sunday we made a full backup.  Then
+          all week long, we created incremental backups, in order to do
+          them fast.  Now comes Sunday again, and we need another full.
+          The merged backup makes it possible to do instead an incremental
+          backup (during the night for instance), and then create a merged
+          backup during the day, by using the full and incrementals from
+          the week.  The merged backup will be exactly like a full made
+          Sunday night on the tape, but the production interruption on the
+          Client will be minimal, as the Client will only have to send
+          incrementals.
+
+          In fact, if it's done correctly, you could merge all the
+          Incrementals into single Incremental, or all the Incrementals
+          and the last Differential into a new Differential, or the Full,
+          last differential and all the Incrementals into a new Full
+          backup.  And there is no need to involve the Client.
+
+  Why:    The benefit is that :
+          - the Client just does an incremental ;
+          - the merged backup on tape is just as a single full backup,
+            and can be restored very fast.
+
+          This is also a way of reducing the backup data since the old
+          data can then be pruned (or not) from the catalog, possibly
+          allowing older volumes to be recycled
+
+Item 11:  Deletion of Disk-Based Bacula Volumes
+  Date:   Nov 25, 2005
+  Origin: Ross Boylan <RossBoylan at stanfordalumni dot org> (edited
+          by Kern)
+  Status:         
+
+   What:  Provide a way for Bacula to automatically remove Volumes
+          from the filesystem, or optionally to truncate them.
+          Obviously, the Volume must be pruned prior removal.
+
+  Why:    This would allow users more control over their Volumes and
+          prevent disk based volumes from consuming too much space.
+
+  Notes:  The following two directives might do the trick:
+
+          Volume Data Retention = <time period>
+          Remove Volume After = <time period>
+
+          The migration project should also remove a Volume that is
+          migrated. This might also work for tape Volumes.
 
-Item 21:  Multiple threads in file daemon for the same job
+Item 12:  Directive/mode to backup only file changes, not entire file
+  Date:   11 November 2005
+  Origin: Joshua Kugler <joshua dot kugler at uaf dot edu>
+          Marek Bajon <mbajon at bimsplus dot com dot pl>
+  Status: RFC
+
+  What:   Currently when a file changes, the entire file will be backed up in
+          the next incremental or full backup.  To save space on the tapes
+          it would be nice to have a mode whereby only the changes to the
+          file would be backed up when it is changed.
+
+  Why:    This would save lots of space when backing up large files such as 
+          logs, mbox files, Outlook PST files and the like.
+
+  Notes:  This would require the usage of disk-based volumes as comparing 
+          files would not be feasible using a tape drive.
+
+Item 13:  Multiple threads in file daemon for the same job
   Date:   27 November 2005
   Origin: Ove Risberg (Ove.Risberg at octocode dot com)
   Status:
@@ -598,7 +461,78 @@ Item 21:  Multiple threads in file daemon for the same job
   Notes:  I am willing to try to implement this but I will probably
           need some help and advice.  (No problem -- Kern)
 
-Item 22:  Archival (removal) of User Files to Tape
+Item 14:  Implement red/black binary tree routines.
+  Date:   28 October 2005
+  Origin: Kern
+  Status: 
+
+  What:   Implement a red/black binary tree class. This could 
+          then replace the current binary insert/search routines
+          used in the restore in memory tree.  This could significantly
+          speed up the creation of the in memory restore tree.
+
+  Why:    Performance enhancement.
+
+Item 15:  Add support for FileSets in user directories  CACHEDIR.TAG
+  Origin: Norbert Kiesel <nkiesel at tbdnetworks dot com>
+  Date:   21 November 2005
+  Status:
+
+  What:   CACHDIR.TAG is a proposal for identifying directories which
+          should be ignored for archiving/backup.  It works by ignoring
+          directory trees which have a file named CACHEDIR.TAG with a
+          specific content.  See
+          http://www.brynosaurus.com/cachedir/spec.html
+          for details.
+
+          From Peter Eriksson:
+          I suggest that if this is implemented (I've also asked for this
+          feature some year ago) that it is made compatible with Legato
+          Networkers ".nsr" files where you can specify a lot of options on
+          how to handle files/directories (including denying further
+          parsing of .nsr files lower down into the directory trees).  A
+          PDF version of the .nsr man page can be viewed at:
+
+          http://www.ifm.liu.se/~peter/nsr.pdf
+
+  Why:    It's a nice alternative to "exclude" patterns for directories
+          which don't have regular pathnames.  Also, it allows users to
+          control backup for themselves.  Implementation should be pretty
+          simple.  GNU tar >= 1.14 or so supports it, too.
+
+  Notes:  I envision this as an optional feature to a fileset
+          specification.
+
+
+Item 16:  Implement extraction of Win32 BackupWrite data.
+  Origin: Thorsten Engel <thorsten.engel at matrix-computer dot com>
+  Date:   28 October 2005
+  Status: Assigned to Thorsten. Implemented in current CVS
+
+  What:   This provides the Bacula File daemon with code that
+          can pick apart the stream output that Microsoft writes
+          for BackupWrite data, and thus the data can be read
+          and restored on non-Win32 machines.
+
+  Why:    BackupWrite data is the portable=no option in Win32
+          FileSets, and in previous Baculas, this data could
+          only be extracted using a Win32 FD. With this new code,
+          the Windows data can be extracted and restored on
+          any OS.
+
+
+Item 18:  Implement a Python interface to the Bacula catalog.
+  Date:   28 October 2005
+  Origin: Kern
+  Status: 
+
+  What:   Implement an interface for Python scripts to access
+          the catalog through Bacula.
+
+  Why:    This will permit users to customize Bacula through
+          Python scripts.
+
+Item 18:  Archival (removal) of User Files to Tape
 
   Date:   Nov. 24/2005 
 
@@ -627,100 +561,161 @@ Item 22:  Archival (removal) of User Files to Tape
           access time.  Then after another 6 months (or possibly as one
           storage pool gets full) data is migrated to Tape.
 
+Item 19:  Add Plug-ins to the FileSet Include statements.
+  Date:   28 October 2005
+  Origin:
+  Status: Partially coded in 1.37 -- much more to do.
 
-Item 23:  Deletion of Disk-Based Bacula Volumes
-  Date:   Nov 25, 2005
-  Origin: Ross Boylan <RossBoylan at stanfordalumni dot org> (edited
-          by Kern)
-  Status:         
+  What:   Allow users to specify wild-card and/or regular
+          expressions to be matched in both the Include and
+          Exclude directives in a FileSet.  At the same time,
+          allow users to define plug-ins to be called (based on
+          regular expression/wild-card matching).
 
-   What:  Provide a way for Bacula to automatically remove Volumes
-          from the filesystem, or optionally to truncate them.
-          Obviously, the Volume must be pruned prior removal.
+  Why:    This would give the users the ultimate ability to control
+          how files are backed up/restored.  A user could write a
+          plug-in knows how to backup his Oracle database without
+          stopping/starting it, for example.
 
-  Why:    This would allow users more control over their Volumes and
-          prevent disk based volumes from consuming too much space.
+Item 20:  Implement more Python events in Bacula.
+  Date:   28 October 2005
+  Origin: 
+  Status: 
 
-  Notes:  The following two directives might do the trick:
+  What:   Allow Python scripts to be called at more places 
+          within Bacula and provide additional access to Bacula
+          internal variables.
 
-          Volume Data Retention = <time period>
-          Remove Volume After = <time period>
+  Why:    This will permit users to customize Bacula through
+          Python scripts.
 
-          The migration project should also remove a Volume that is
-          migrated. This might also work for tape Volumes.
+  Notes:  Recycle event
+          Scratch pool event
+          NeedVolume event
+          MediaFull event
+           
+          Also add a way to get a listing of currently running
+          jobs (possibly also scheduled jobs).
 
 
-Item 24:  Accurate restoration of renamed/deleted files from
-          Incremental/Differential backups
-  Date:   28 November 2005
-  Origin: Martin Simmons (martin at lispworks dot com)
+Item 21:  Quick release of FD-SD connection after backup.
+  Origin: Frank Volf (frank at deze dot org)
+  Date:   17 November 2005
   Status:
 
-  What:   When restoring a fileset for a specified date (including "most
-          recent"), Bacula should give you exactly the files and directories
-          that existed at the time of the last backup prior to that date.
+   What:  In the Bacula implementation a backup is finished after all data
+          and attributes are successfully written to storage.  When using a
+          tape backup it is very annoying that a backup can take a day,
+          simply because the current tape (or whatever) is full and the
+          administrator has not put a new one in.  During that time the
+          system cannot be taken off-line, because there is still an open
+          session between the storage daemon and the file daemon on the
+          client.
 
-          Currently this only works if the last backup was a Full backup.
-          When the last backup was Incremental/Differential, files and
-          directories that have been renamed or deleted since the last Full
-          backup are not currently restored correctly.  Ditto for files with
-          extra/fewer hard links than at the time of the last Full backup.
+          Although this is a very good strategy for making "safe backups"
+          This can be annoying for e.g.  laptops, that must remain
+          connected until the backup is completed.
 
-  Why:    Incremental/Differential would be much more useful if this worked.
+          Using a new feature called "migration" it will be possible to
+          spool first to harddisk (using a special 'spool' migration
+          scheme) and then migrate the backup to tape.
 
-  Notes:  Item 14 (Merging of multiple backups into a single one) seems to
-          rely on this working, otherwise the merged backups will not be
-          truely equivalent to a Full backup.  
+          There is still the problem of getting the attributes committed.
+          If it takes a very long time to do, with the current code, the
+          job has not terminated, and the File daemon is not freed up.  The
+          Storage daemon should release the File daemon as soon as all the
+          file data and all the attributes have been sent to it (the SD).
+          Currently the SD waits until everything is on tape and all the
+          attributes are transmitted to the Director before signaling
+          completion to the FD. I don't think I would have any problem
+          changing this.  The reason is that even if the FD reports back to
+          the Dir that all is OK, the job will not terminate until the SD
+          has done the same thing -- so in a way keeping the SD-FD link
+          open to the very end is not really very productive ...
 
-          Kern: notes shortened. This can be done without the need for 
-          inodes. It is essentially the same as the current Verify job,
-          but one additional database record must be written, which does 
-          not need any database change.
+   Why:   Makes backup of laptops much easier.
 
-Item 25:  Implement creation and maintenance of copy pools
-  Date:   27 November 2005
-  Origin: David Boyes (dboyes at sinenomine dot net)
-  Status:
+Item 22:  Permit multiple Media Types in an Autochanger
+  Origin: Kern
+  Status: Now implemented
 
-  What:   I would like Bacula to have the capability to write copies
-          of backed-up data on multiple physical volumes selected
-          from different pools without transferring the data
-          multiple times, and to accept any of the copy volumes
-          as valid for restore.
+  What:   Modify the Storage daemon so that multiple Media Types
+          can be specified in an autochanger. This would be somewhat
+          of a simplistic implementation in that each drive would
+          still be allowed to have only one Media Type.  However,
+          the Storage daemon will ensure that only a drive with
+          the Media Type that matches what the Director specifies
+          is chosen.
 
-  Why:    In many cases, businesses are required to keep offsite
-          copies of backup volumes, or just wish for simple
-          protection against a human operator dropping a storage
-          volume and damaging it. The ability to generate multiple
-          volumes in the course of a single backup job allows
-          customers to simple check out one copy and send it
-          offsite, marking it as out of changer or otherwise
-          unavailable. Currently, the library and magazine
-          management capability in Bacula does not make this process
-          simple.
+  Why:    This will permit user with several different drive types
+          to make full use of their autochangers.
 
-          Restores would use the copy of the data on the first
-          available volume, in order of copy pool chain definition.
+Item 23:  Allow different autochanger definitions for one autochanger.
+  Date:   28 October 2005
+  Origin: Kern
+  Status: 
 
-          This is also a major scalability issue -- as the number of
-          clients increases beyond several thousand, and the volume
-          of data increases, transferring the data multiple times to
-          produce additional copies of the backups will become
-          physically impossible due to transfer speed
-          issues. Generating multiple copies at server side will
-          become the only practical option. 
+  What:   Currently, the autochanger script is locked based on
+          the autochanger. That is, if multiple drives are being
+          simultaneously used, the Storage daemon ensures that only
+          one drive at a time can access the mtx-changer script.
+          This change would base the locking on the control device,
+          rather than the autochanger. It would then permit two autochanger
+          definitions for the same autochanger, but with different 
+          drives. Logically, the autochanger could then be "partitioned"
+          for different jobs, clients, or class of jobs, and if the locking
+          is based on the control device (e.g. /dev/sg0) the mtx-changer
+          script will be locked appropriately.
 
-  How:    I suspect that this will require adding a multiplexing
-          SD that appears to be a SD to a specific FD, but 1-n FDs
-          to the specific back end SDs managing the primary and copy
-          pools.  Storage pools will also need to acquire parameters
-          to define the pools to be used for copies. 
+  Why:    This will permit users to partition autochangers for specific
+          use. It would also permit implementation of multiple Media
+          Types with no changes to the Storage daemon.
+
+Item 24:  Automatic disabling of devices
+   Date:   2005-11-11
+   Origin: Peter Eriksson <peter at ifm.liu dot se>
+   Status:
+
+   What:  After a configurable amount of fatal errors with a tape drive
+          Bacula should automatically disable further use of a certain
+          tape drive. There should also be "disable"/"enable" commands in
+          the "bconsole" tool.
+
+   Why:   On a multi-drive jukebox there is a possibility of tape drives
+          going bad during large backups (needing a cleaning tape run,
+          tapes getting stuck). It would be advantageous if Bacula would
+          automatically disable further use of a problematic tape drive
+          after a configurable amount of errors has occurred.
+
+          An example: I have a multi-drive jukebox (6 drives, 380+ slots)
+          where tapes occasionally get stuck inside the drive. Bacula will
+          notice that the "mtx-changer" command will fail and then fail
+          any backup jobs trying to use that drive. However, it will still
+          keep on trying to run new jobs using that drive and fail -
+          forever, and thus failing lots and lots of jobs... Since we have
+          many drives Bacula could have just automatically disabled
+          further use of that drive and used one of the other ones
+          instead.
+
+Item 25:  Implement huge exclude list support using hashing.
+  Date:   28 October 2005
+  Origin: Kern
+  Status: 
+
+  What:   Allow users to specify very large exclude list (currently
+          more than about 1000 files is too many).
+
+  Why:    This would give the users the ability to exclude all
+          files that are loaded with the OS (e.g. using rpms
+          or debs). If the user can restore the base OS from
+          CDs, there is no need to backup all those files. A
+          complete restore would be to restore the base OS, then
+          do a Bacula restore. By excluding the base OS files, the
+          backup set will be *much* smaller.
 
-  Notes:  I would commit some of my developers' time if we can agree
-          on the design and behavior. 
 ===============================================
 Not in Dec 2005 Vote:
-Item n:   One line summary ...
+Item n:   Allow skipping execution of Jobs
   Date:   29 November 2005
   Origin: Florian Schnabel <florian.schnabel at docufy dot de>
   Status:
diff --git a/bacula/src/filed/restore.c b/bacula/src/filed/restore.c
index 353233e364..4ca022dee0 100644
--- a/bacula/src/filed/restore.c
+++ b/bacula/src/filed/restore.c
@@ -54,7 +54,7 @@ int bclose_chksize(JCR *jcr, BFILE *bfd, off_t osize)
    fsize = blseek(bfd, 0, SEEK_CUR);
    bclose(bfd);                              /* first close file */
    if (fsize > 0 && fsize != osize) {
-      Jmsg3(jcr, M_ERROR, 0, _("Size of data or stream of %s not correct. Original %s, restored %s.\n"),
+      Qmsg3(jcr, M_ERROR, 0, _("Size of data or stream of %s not correct. Original %s, restored %s.\n"),
             jcr->last_fname, edit_uint64(osize, ec1),
             edit_uint64(fsize, ec2));
       return -1;
@@ -371,7 +371,7 @@ void do_restore(JCR *jcr)
          pm_strcpy(jcr->acl_text, sd->msg);
          Dmsg2(400, "Restoring ACL type 0x%2x <%s>\n", BACL_TYPE_ACCESS, jcr->acl_text);
          if (bacl_set(jcr, BACL_TYPE_ACCESS) != 0) {
-               Jmsg1(jcr, M_WARNING, 0, _("Can't restore ACL of %s\n"), jcr->last_fname);
+               Qmsg1(jcr, M_WARNING, 0, _("Can't restore ACL of %s\n"), jcr->last_fname);
          }
 #else 
          non_support_acl++;
@@ -383,7 +383,7 @@ void do_restore(JCR *jcr)
          pm_strcpy(jcr->acl_text, sd->msg);
          Dmsg2(400, "Restoring ACL type 0x%2x <%s>\n", BACL_TYPE_DEFAULT, jcr->acl_text);
          if (bacl_set(jcr, BACL_TYPE_DEFAULT) != 0) {
-               Jmsg1(jcr, M_WARNING, 0, _("Can't restore default ACL of %s\n"), jcr->last_fname);
+               Qmsg1(jcr, M_WARNING, 0, _("Can't restore default ACL of %s\n"), jcr->last_fname);
          }
 #else 
          non_support_acl++;
@@ -530,13 +530,13 @@ int verify_signature(JCR *jcr, SIGNATURE *sig)
 
          /* Checksum the entire file */
          if (find_one_file(jcr, jcr->ff, do_file_digest, jcr, jcr->last_fname, (dev_t)-1, 1) != 0) {
-            Jmsg(jcr, M_ERROR, 0, _("Signature validation failed for %s: \n"), jcr->last_fname);
+            Qmsg(jcr, M_ERROR, 0, _("Signature validation failed for %s: \n"), jcr->last_fname);
             return false;
          }
 
          /* Verify the signature */
          if ((err = crypto_sign_verify(sig, keypair, digest)) != CRYPTO_ERROR_NONE) {
-            Jmsg2(jcr, M_ERROR, 0, _("Signature validation failed for %s: %s\n"), jcr->last_fname, crypto_strerror(err));
+            Qmsg2(jcr, M_ERROR, 0, _("Signature validation failed for %s: %s\n"), jcr->last_fname, crypto_strerror(err));
             crypto_digest_free(digest);
             return false;
          }
@@ -550,7 +550,7 @@ int verify_signature(JCR *jcr, SIGNATURE *sig)
          continue;
       default:
          /* Something strange happened (that shouldn't happen!)... */
-         Jmsg2(jcr, M_ERROR, 0, _("Signature validation failed for %s: %s\n"), jcr->last_fname, crypto_strerror(err));
+         Qmsg2(jcr, M_ERROR, 0, _("Signature validation failed for %s: %s\n"), jcr->last_fname, crypto_strerror(err));
          if (digest) {
             crypto_digest_free(digest);
          }
@@ -613,7 +613,7 @@ int32_t extract_data(JCR *jcr, BFILE *bfd, POOLMEM *buf, int32_t buflen,
       Dmsg2(100, "Comp_len=%d msglen=%d\n", compress_len, wsize);
       if ((stat=uncompress((Byte *)jcr->compress_buf, &compress_len,
                   (const Byte *)wbuf, (uLong)rsize)) != Z_OK) {
-         Jmsg(jcr, M_ERROR, 0, _("Uncompression error on file %s. ERR=%s\n"),
+         Qmsg(jcr, M_ERROR, 0, _("Uncompression error on file %s. ERR=%s\n"),
                jcr->last_fname, zlib_strerror(stat));
          return -1;
       }
@@ -621,7 +621,7 @@ int32_t extract_data(JCR *jcr, BFILE *bfd, POOLMEM *buf, int32_t buflen,
       wsize = compress_len;
       Dmsg2(100, "Write uncompressed %d bytes, total before write=%s\n", compress_len, edit_uint64(jcr->JobBytes, ec1));
 #else
-      Jmsg(jcr, M_ERROR, 0, _("GZIP data stream found, but GZIP not configured!\n"));
+      Qmsg(jcr, M_ERROR, 0, _("GZIP data stream found, but GZIP not configured!\n"));
       return -1;
 #endif
    } else {
diff --git a/bacula/src/findlib/create_file.c b/bacula/src/findlib/create_file.c
index 223d99ecd6..7eef249f35 100644
--- a/bacula/src/findlib/create_file.c
+++ b/bacula/src/findlib/create_file.c
@@ -83,20 +83,20 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
       switch (replace) {
       case REPLACE_IFNEWER:
          if (attr->statp.st_mtime <= mstatp.st_mtime) {
-            Jmsg(jcr, M_SKIPPED, 0, _("File skipped. Not newer: %s\n"), attr->ofname);
+            Qmsg(jcr, M_SKIPPED, 0, _("File skipped. Not newer: %s\n"), attr->ofname);
             return CF_SKIP;
          }
          break;
 
       case REPLACE_IFOLDER:
          if (attr->statp.st_mtime >= mstatp.st_mtime) {
-            Jmsg(jcr, M_SKIPPED, 0, _("File skipped. Not older: %s\n"), attr->ofname);
+            Qmsg(jcr, M_SKIPPED, 0, _("File skipped. Not older: %s\n"), attr->ofname);
             return CF_SKIP;
          }
          break;
 
       case REPLACE_NEVER:
-         Jmsg(jcr, M_SKIPPED, 0, _("File skipped. Already exists: %s\n"), attr->ofname);
+         Qmsg(jcr, M_SKIPPED, 0, _("File skipped. Already exists: %s\n"), attr->ofname);
          return CF_SKIP;
 
       case REPLACE_ALWAYS:
@@ -121,7 +121,7 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
          /* Get rid of old copy */
          if (unlink(attr->ofname) == -1) {
             berrno be;
-            Jmsg(jcr, M_ERROR, 0, _("File %s already exists and could not be replaced. ERR=%s.\n"),
+            Qmsg(jcr, M_ERROR, 0, _("File %s already exists and could not be replaced. ERR=%s.\n"),
                attr->ofname, be.strerror());
             /* Continue despite error */
          }
@@ -173,7 +173,7 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
          }
          Dmsg1(50, "Create file: %s\n", attr->ofname);
          if (is_bopen(bfd)) {
-            Jmsg1(jcr, M_ERROR, 0, _("bpkt already open fid=%d\n"), bfd->fid);
+            Qmsg1(jcr, M_ERROR, 0, _("bpkt already open fid=%d\n"), bfd->fid);
             bclose(bfd);
          }
          /*
@@ -195,7 +195,7 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
                attr->ofname[pnl] = 0;                 /* terminate path */
                Dmsg1(000, "Do chdir %s\n", attr->ofname);
                if (save_cwd(&cwd) != 0) {
-                  Jmsg0(jcr, M_ERROR, 0, _("Could not save_dirn"));
+                  Qmsg0(jcr, M_ERROR, 0, _("Could not save_dirn"));
                   attr->ofname[pnl] = savechr;
                   return CF_ERROR;
                }
@@ -204,7 +204,7 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
                   *e = 0;
                   if (chdir(p) < 0) {
                      berrno be;
-                     Jmsg2(jcr, M_ERROR, 0, _("Could not chdir to %s: ERR=%s\n"),
+                     Qmsg2(jcr, M_ERROR, 0, _("Could not chdir to %s: ERR=%s\n"),
                            attr->ofname, be.strerror());
                      restore_cwd(&cwd, NULL, NULL);
                      free_cwd(&cwd);
@@ -217,7 +217,7 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
                }
                if (chdir(p) < 0) {
                   berrno be;
-                  Jmsg2(jcr, M_ERROR, 0, _("Could not chdir to %s: ERR=%s\n"),
+                  Qmsg2(jcr, M_ERROR, 0, _("Could not chdir to %s: ERR=%s\n"),
                         attr->ofname, be.strerror());
                   restore_cwd(&cwd, NULL, NULL);
                   free_cwd(&cwd);
@@ -237,7 +237,7 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
                   return CF_EXTRACT;
                }
             }
-            Jmsg2(jcr, M_ERROR, 0, _("Could not create %s: ERR=%s\n"),
+            Qmsg2(jcr, M_ERROR, 0, _("Could not create %s: ERR=%s\n"),
                   attr->ofname, be.strerror(bfd->berrno));
             return CF_ERROR;
          }
@@ -250,7 +250,7 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
             Dmsg1(200, "Restore fifo: %s\n", attr->ofname);
             if (mkfifo(attr->ofname, attr->statp.st_mode) != 0 && errno != EEXIST) {
                berrno be;
-               Jmsg2(jcr, M_ERROR, 0, _("Cannot make fifo %s: ERR=%s\n"),
+               Qmsg2(jcr, M_ERROR, 0, _("Cannot make fifo %s: ERR=%s\n"),
                      attr->ofname, be.strerror());
                return CF_ERROR;
             }
@@ -258,7 +258,7 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
             Dmsg1(200, "Restore node: %s\n", attr->ofname);
             if (mknod(attr->ofname, attr->statp.st_mode, attr->statp.st_rdev) != 0 && errno != EEXIST) {
                berrno be;
-               Jmsg2(jcr, M_ERROR, 0, _("Cannot make node %s: ERR=%s\n"),
+               Qmsg2(jcr, M_ERROR, 0, _("Cannot make node %s: ERR=%s\n"),
                      attr->ofname, be.strerror());
                return CF_ERROR;
             }
@@ -274,12 +274,12 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
                tid = NULL;
             }
             if (is_bopen(bfd)) {
-               Jmsg1(jcr, M_ERROR, 0, _("bpkt already open fid=%d\n"), bfd->fid);
+               Qmsg1(jcr, M_ERROR, 0, _("bpkt already open fid=%d\n"), bfd->fid);
             }
             if ((bopen(bfd, attr->ofname, mode, 0)) < 0) {
                berrno be;
                be.set_errno(bfd->berrno);
-               Jmsg2(jcr, M_ERROR, 0, _("Could not open %s: ERR=%s\n"),
+               Qmsg2(jcr, M_ERROR, 0, _("Could not open %s: ERR=%s\n"),
                      attr->ofname, be.strerror());
                stop_thread_timer(tid);
                return CF_ERROR;
@@ -294,7 +294,7 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
          Dmsg2(130, "FT_LNK should restore: %s -> %s\n", attr->ofname, attr->olname);
          if (symlink(attr->olname, attr->ofname) != 0 && errno != EEXIST) {
             berrno be;
-            Jmsg3(jcr, M_ERROR, 0, _("Could not symlink %s -> %s: ERR=%s\n"),
+            Qmsg3(jcr, M_ERROR, 0, _("Could not symlink %s -> %s: ERR=%s\n"),
                   attr->ofname, attr->olname, be.strerror());
             return CF_ERROR;
          }
@@ -304,7 +304,7 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
          Dmsg2(130, "Hard link %s => %s\n", attr->ofname, attr->olname);
          if (link(attr->olname, attr->ofname) != 0) {
             berrno be;
-            Jmsg3(jcr, M_ERROR, 0, _("Could not hard link %s -> %s: ERR=%s\n"),
+            Qmsg3(jcr, M_ERROR, 0, _("Could not hard link %s -> %s: ERR=%s\n"),
                   attr->ofname, attr->olname, be.strerror());
             return CF_ERROR;
          }
@@ -325,7 +325,7 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
        */
       if (!is_portable_backup(bfd)) {
          if (is_bopen(bfd)) {
-            Jmsg1(jcr, M_ERROR, 0, _("bpkt already open fid=%d\n"), bfd->fid);
+            Qmsg1(jcr, M_ERROR, 0, _("bpkt already open fid=%d\n"), bfd->fid);
          }
          if ((bopen(bfd, attr->ofname, O_WRONLY|O_BINARY, 0)) < 0) {
             berrno be;
@@ -336,7 +336,7 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
                return CF_SKIP;
             }
 #endif
-            Jmsg2(jcr, M_ERROR, 0, _("Could not open %s: ERR=%s\n"),
+            Qmsg2(jcr, M_ERROR, 0, _("Could not open %s: ERR=%s\n"),
                   attr->ofname, be.strerror());
             return CF_ERROR;
          }
@@ -355,10 +355,10 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
    case FT_NORECURSE:
    case FT_NOFSCHG:
    case FT_NOOPEN:
-      Jmsg2(jcr, M_ERROR, 0, _("Original file %s not saved: type=%d\n"), attr->fname, attr->type);
+      Qmsg2(jcr, M_ERROR, 0, _("Original file %s not saved: type=%d\n"), attr->fname, attr->type);
       break;
    default:
-      Jmsg2(jcr, M_ERROR, 0, _("Unknown file type %d; not restored: %s\n"), attr->type, attr->fname);
+      Qmsg2(jcr, M_ERROR, 0, _("Unknown file type %d; not restored: %s\n"), attr->type, attr->fname);
       break;
    }
    return CF_ERROR;
@@ -389,7 +389,7 @@ static int separate_path_and_file(JCR *jcr, char *fname, char *ofile)
       /* The filename length must not be zero here because we
        *  are dealing with a file (i.e. FT_REGE or FT_REG).
        */
-      Jmsg1(jcr, M_ERROR, 0, _("Zero length filename: %s\n"), fname);
+      Qmsg1(jcr, M_ERROR, 0, _("Zero length filename: %s\n"), fname);
       return -1;
    }
    pnl = f - ofile - 1;
diff --git a/bacula/src/lib/message.h b/bacula/src/lib/message.h
index 677efbb9c2..e49a697418 100644
--- a/bacula/src/lib/message.h
+++ b/bacula/src/lib/message.h
@@ -128,6 +128,7 @@ struct MQUEUE_ITEM {
 void d_msg(const char *file, int line, int level, const char *fmt,...);
 void e_msg(const char *file, int line, int type, int level, const char *fmt,...);
 void Jmsg(JCR *jcr, int type, time_t mtime, const char *fmt,...);
+void Qmsg(JCR *jcr, int type, time_t mtime, const char *fmt,...);
 
 extern int debug_level;
 extern int verbose;
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 11206d2373..5284968573 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "1.39.2"
-#define BDATE   "06 December 2005"
-#define LSMDATE "06Dec05"
+#define BDATE   "07 December 2005"
+#define LSMDATE "07Dec05"
 
 /* Debug flags */
 #undef  DEBUG
-- 
2.39.5