X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fbutil.c;h=ed91e0497fcdfe44e1e699ea9989eb4b9c639580;hb=bdcddd32cafd978761406b7ad3ca006597c8f1d7;hp=ab5f957aa16f56c288dd700b94720048bf69a7f4;hpb=925ed2975de48562445c3aeb56d2d245604e18c1;p=bacula%2Fbacula diff --git a/bacula/src/stored/butil.c b/bacula/src/stored/butil.c index ab5f957aa1..ed91e0497f 100644 --- a/bacula/src/stored/butil.c +++ b/bacula/src/stored/butil.c @@ -1,27 +1,14 @@ -/* - * - * Utility routines for "tool" programs such as bscan, bls, - * bextract, ... Some routines also used by Bacula. - * - * Kern Sibbald, MM - * - * Normally nothing in this file is called by the Storage - * daemon because we interact more directly with the user - * i.e. printf, ... - * - * Version $Id$ - */ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2006 Free Software Foundation Europe e.V. + Copyright (C) 2000-2007 Free Software Foundation Europe e.V. The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. This program is Free Software; you can redistribute it and/or modify it under the terms of version two of the GNU General Public - License as published by the Free Software Foundation plus additions - that are listed in the file LICENSE. + License as published by the Free Software Foundation and included + in the file LICENSE. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -38,6 +25,19 @@ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ftf@fsfeurope.org. */ +/* + * + * Utility routines for "tool" programs such as bscan, bls, + * bextract, ... Some routines also used by Bacula. + * + * Kern Sibbald, MM + * + * Normally nothing in this file is called by the Storage + * daemon because we interact more directly with the user + * i.e. printf, ... + * + * Version $Id$ + */ #include "bacula.h" #include "stored.h" @@ -175,8 +175,7 @@ static DCR *setup_to_access_device(JCR *jcr, char *dev_name, return NULL; } device->dev = dev; - dcr = new_dcr(jcr, dev); - jcr->dcr = dcr; + jcr->dcr = dcr = new_dcr(jcr, NULL, dev); if (VolName[0]) { bstrncpy(dcr->VolumeName, VolName, sizeof(dcr->VolumeName)); }