[Bacula-commits] bacula/src/stored acquire.c, 1.145, 1.146 bcopy.c, 1.49, 1.50 bextract.c, 1.91, 1.92 bls.c, 1.102, 1.103 bscan.c, 1.111, 1.112 btape.c, 1.156, 1.157 spool.c, 1.50, 1.51 stored.c, 1.86, 1.87

[Kern S. <ke...@us...>]

Update of /cvsroot/bacula/bacula/src/stored
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8110/src/stored

Modified Files:
	acquire.c bcopy.c bextract.c bls.c bscan.c btape.c spool.c 
	stored.c 
Log Message:
kes  More copyright changes.
kes  Make sure we don't detach from the despool read device since it
     is a temporary structure where the condition variables are not
     initialized.  Bug #711.

Index: btape.c
===================================================================
RCS file: /cvsroot/bacula/bacula/src/stored/btape.c,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- btape.c	24 Nov 2006 09:58:28 -0000	1.156
+++ btape.c	27 Nov 2006 10:03:02 -0000	1.157
@@ -2601,7 +2601,7 @@
 "       -s          turn off signals\n"
 "       -v          be verbose\n"
 "       -?          print this message.\n"
-"\n"), BYEAR, VERSION, BDATE);
+"\n"), 2000, VERSION, BDATE);
 
 }
 

Index: bscan.c
===================================================================
RCS file: /cvsroot/bacula/bacula/src/stored/bscan.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- bscan.c	21 Nov 2006 17:03:46 -0000	1.111
+++ bscan.c	27 Nov 2006 10:03:02 -0000	1.112
@@ -129,7 +129,7 @@
 "       -v                verbose\n"
 "       -V <Volumes>      specify Volume names (separated by |)\n"
 "       -w <dir>          specify working directory (default from conf file)\n"
-"       -?                print this message\n\n"), BYEAR, VERSION, BDATE);
+"       -?                print this message\n\n"), 2001, VERSION, BDATE);
    exit(1);
 }
 

Index: acquire.c
===================================================================
RCS file: /cvsroot/bacula/bacula/src/stored/acquire.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- acquire.c	21 Nov 2006 17:03:45 -0000	1.145
+++ acquire.c	27 Nov 2006 10:03:01 -0000	1.146
@@ -642,7 +642,9 @@
 void free_dcr(DCR *dcr)
 {
 
-   detach_dcr_from_dev(dcr);
+   if (dcr->dev) {
+      detach_dcr_from_dev(dcr);
+   }
 
    if (dcr->block) {
       free_block(dcr->block);

Index: bextract.c
===================================================================
RCS file: /cvsroot/bacula/bacula/src/stored/bextract.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- bextract.c	21 Nov 2006 17:03:46 -0000	1.91
+++ bextract.c	27 Nov 2006 10:03:01 -0000	1.92
@@ -85,7 +85,7 @@
 "       -p              proceed inspite of I/O errors\n"
 "       -v              verbose\n"
 "       -V <volumes>    specify Volume names (separated by |)\n"
-"       -?              print this message\n\n"), BYEAR, VERSION, BDATE);
+"       -?              print this message\n\n"), 2000, VERSION, BDATE);
    exit(1);
 }
 

Index: spool.c
===================================================================
RCS file: /cvsroot/bacula/bacula/src/stored/spool.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- spool.c	21 Nov 2006 17:03:47 -0000	1.50
+++ spool.c	27 Nov 2006 10:03:03 -0000	1.51
@@ -320,6 +320,7 @@
    free_pool_memory(rdev->errmsg);
    /* Be careful to NULL the jcr and free rdev after free_dcr() */
    rdcr->jcr = NULL;
+   rdcr->dev = NULL;
    free_dcr(rdcr);
    free(rdev);
    dcr->spooling = true;           /* turn on spooling again */

Index: stored.c
===================================================================
RCS file: /cvsroot/bacula/bacula/src/stored/stored.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- stored.c	21 Nov 2006 17:03:47 -0000	1.86
+++ stored.c	27 Nov 2006 10:03:03 -0000	1.87
@@ -90,7 +90,7 @@
 "        -u <user>   userid to <user>\n"
 "        -v          verbose user messages\n"
 "        -?          print this message.\n"
-"\n"), BYEAR, VERSION, BDATE);
+"\n"), 2000, VERSION, BDATE);
    exit(1);
 }
 

Index: bcopy.c
===================================================================
RCS file: /cvsroot/bacula/bacula/src/stored/bcopy.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- bcopy.c	21 Nov 2006 17:03:45 -0000	1.49
+++ bcopy.c	27 Nov 2006 10:03:01 -0000	1.50
@@ -79,7 +79,7 @@
 "       -p                proceed inspite of errors\n"
 "       -v                verbose\n"
 "       -w <dir>          specify working directory (default /tmp)\n"
-"       -?                print this message\n\n"), BYEAR, VERSION, BDATE);
+"       -?                print this message\n\n"), 2002, VERSION, BDATE);
    exit(1);
 }
 

Index: bls.c
===================================================================
RCS file: /cvsroot/bacula/bacula/src/stored/bls.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- bls.c	21 Nov 2006 17:03:46 -0000	1.102
+++ bls.c	27 Nov 2006 10:03:01 -0000	1.103
@@ -89,7 +89,7 @@
 "       -p              proceed inspite of errors\n"
 "       -v              be verbose\n"
 "       -V              specify Volume names (separated by |)\n"
-"       -?              print this message\n\n"), BYEAR, VERSION, BDATE);
+"       -?              print this message\n\n"), 2000, VERSION, BDATE);
    exit(1);
 }