kes Make sure valid argument passed to str_to_utime() where Arno

[bacula/bacula] / bacula / src / stored / stored.h

diff --git a/bacula/src/stored/stored.h b/bacula/src/stored/stored.h
index cfd68b0e834861c74f075df13766fdf171991e83..34569fff88850c38c852ea8d2bc749173c26b56c 100644 (file)
--- a/bacula/src/stored/stored.h
+++ b/bacula/src/stored/stored.h
@@ -7,19 +7,14 @@
    Copyright (C) 2000-2005 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   modify it under the terms of the GNU General Public License
+   version 2 as amended with additional clauses defined in the
+   file LICENSE in the main source directory.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
  */
 
@@ -34,7 +29,7 @@
 # ifdef HAVE_SYS_MTIO_H
 # include <sys/mtio.h>
 # else
-#   ifdef HAVE_SYS_TAPE
+#   ifdef HAVE_SYS_TAPE_H
 #   include <sys/tape.h>
 #   endif
 # endif
@@ -45,9 +40,10 @@
 #include "stored_conf.h"
 #include "bsr.h"
 #include "jcr.h"
+#include "reserve.h"
 #include "protos.h"
 #ifdef HAVE_LIBZ
-#include <zlib.h>                    /* compression headers */
+#include <zlib.h>                     /* compression headers */
 #else
 #define uLongf uint32_t
 #endif
@@ -64,12 +60,10 @@
 int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result);
 #endif
 
+/* Daemon globals from stored.c */
 extern STORES *me;                    /* "Global" daemon resource */
-extern bool forge_on;                /* proceed inspite of I/O errors */
-
-#ifdef debug_tracing
-extern int _rewind_dev(char *file, int line, DEVICE *dev);
-#define rewind_dev(d) _rewind_dev(__FILE__, __LINE__, (d))
-#endif
+extern bool forge_on;                 /* proceed inspite of I/O errors */
+extern pthread_mutex_t device_release_mutex;
+extern pthread_cond_t wait_device_release; /* wait for any device to be released */                           
 
 #endif /* __STORED_H_ */