From a0980926a635c69a214471698f593274b614b129 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 16 Oct 2004 11:51:32 +0000 Subject: [PATCH] Documentation + - Fix error during restore error reported by Christopher Hull when no tape in the drive (open fails). - Add more precise error reporting to FD when a network error occurs. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1653 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/filed/backup.c | 39 ++++-- bacula/src/lib/bnet.c | 7 +- bacula/src/lib/protos.h | 250 ++++++++++++++++++------------------ bacula/src/stored/acquire.c | 5 +- bacula/src/stored/append.c | 13 +- bacula/src/stored/spool.c | 2 +- bacula/src/version.h | 4 +- 7 files changed, 171 insertions(+), 149 deletions(-) diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c index 84df57311c..209f95102e 100644 --- a/bacula/src/filed/backup.c +++ b/bacula/src/filed/backup.c @@ -281,7 +281,7 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr) P(jcr->mutex); jcr->JobFiles++; /* increment number of files sent */ ff_pkt->FileIndex = jcr->JobFiles; /* return FileIndex */ - pm_strcpy(&jcr->last_fname, ff_pkt->fname); + pm_strcpy(jcr->last_fname, ff_pkt->fname); V(jcr->mutex); /* @@ -289,10 +289,12 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr) * */ if (!bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, attr_stream)) { + berrno be; if (is_bopen(&ff_pkt->bfd)) { bclose(&ff_pkt->bfd); } - set_jcr_job_status(jcr, JS_ErrorTerminated); + Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"), + bnet_strerror(sd)); return 0; } Dmsg1(300, ">stored: attrhdr %s\n", sd->msg); @@ -325,11 +327,12 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr) Dmsg2(300, ">stored: attr len=%d: %s\n", sd->msglen, sd->msg); if (!stat) { + berrno be; if (is_bopen(&ff_pkt->bfd)) { bclose(&ff_pkt->bfd); } - set_jcr_job_status(jcr, JS_ErrorTerminated); - Jmsg0(jcr, M_FATAL, 0, _("Network send error.\n")); + Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"), + bnet_strerror(sd)); return 0; } bnet_sig(sd, BNET_EOD); /* indicate end of attributes data */ @@ -372,9 +375,10 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr) * */ if (!bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, data_stream)) { + berrno be; bclose(&ff_pkt->bfd); - set_jcr_job_status(jcr, JS_ErrorTerminated); - Jmsg0(jcr, M_FATAL, 0, _("Network send error.\n")); + Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"), + bnet_strerror(sd)); return 0; } Dmsg1(300, ">stored: datahdr %s\n", sd->msg); @@ -463,11 +467,12 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr) } sd->msg = wbuf; /* set correct write buffer */ if (!bnet_send(sd)) { + berrno be; sd->msg = msgsave; /* restore bnet buffer */ sd->msglen = 0; bclose(&ff_pkt->bfd); - set_jcr_job_status(jcr, JS_ErrorTerminated); - Jmsg0(jcr, M_FATAL, 0, _("Network send error.\n")); + Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"), + bnet_strerror(sd)); return 0; } } @@ -488,8 +493,9 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr) bclose(&ff_pkt->bfd); /* close file */ if (!bnet_sig(sd, BNET_EOD)) { /* indicate end of file data */ - set_jcr_job_status(jcr, JS_ErrorTerminated); - Jmsg0(jcr, M_FATAL, 0, _("Network send error.\n")); + berrno be; + Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"), + bnet_strerror(sd)); return 0; } } @@ -534,7 +540,9 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr) * */ if (!bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, STREAM_UNIX_ATTRIBUTES_ACL)) { - set_jcr_job_status(jcr, JS_ErrorTerminated); + berrno be; + Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"), + bnet_strerror(sd)); return 0; } @@ -543,17 +551,20 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr) sd->msg = acl_text; sd->msglen = strlen(acl_text) + 1; if (!bnet_send(sd)) { + berrno be; sd->msg = msgsave; sd->msglen = 0; bclose(&ff_pkt->bfd); - set_jcr_job_status(jcr, JS_ErrorTerminated); - Jmsg1(jcr, M_FATAL, 0, "Error while trying to send ACL of %s to SD!\n", ff_pkt->fname); + Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"), + bnet_strerror(sd)); } else { jcr->JobBytes += sd->msglen; sd->msg = msgsave; bclose(&ff_pkt->bfd); if (!bnet_sig(sd, BNET_EOD)) { - set_jcr_job_status(jcr, JS_ErrorTerminated); + berrno be; + Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"), + bnet_strerror(sd)); } else { Dmsg1(200, "ACL of file: %s successfully backed up!\n", ff_pkt->fname); } diff --git a/bacula/src/lib/bnet.c b/bacula/src/lib/bnet.c index eedb327266..df41939ec6 100644 --- a/bacula/src/lib/bnet.c +++ b/bacula/src/lib/bnet.c @@ -95,9 +95,11 @@ static int32_t write_nbytes(BSOCK * bsock, char *ptr, int32_t nbytes) nwritten = fwrite(ptr, 1, nbytes, bsock->spool_fd); if (nwritten != nbytes) { berrno be; + bsock->b_errno = errno; Qmsg1(bsock->jcr, M_FATAL, 0, _("Attr spool write error. ERR=%s\n"), be.strerror()); Dmsg2(400, "nwritten=%d nbytes=%d.\n", nwritten, nbytes); + errno = bsock->b_errno; return -1; } return nbytes; @@ -779,9 +781,10 @@ Retrying ...\n", name, host, port, be.strerror()); * Return the string for the error that occurred * on the socket. Only the first error is retained. */ -char *bnet_strerror(BSOCK * bsock) +const char *bnet_strerror(BSOCK * bsock) { - return strerror(bsock->b_errno); + berrno be; + return be.strerror(bsock->b_errno); } /* diff --git a/bacula/src/lib/protos.h b/bacula/src/lib/protos.h index f4362acf8b..007c9f22e3 100644 --- a/bacula/src/lib/protos.h +++ b/bacula/src/lib/protos.h @@ -26,103 +26,103 @@ struct JCR; /* attr.c */ -ATTR *new_attr(); -void free_attr(ATTR *attr); -int unpack_attributes_record(JCR *jcr, int32_t stream, char *rec, ATTR *attr); -void build_attr_output_fnames(JCR *jcr, ATTR *attr); -void print_ls_output(JCR *jcr, ATTR *attr); +ATTR *new_attr(); +void free_attr(ATTR *attr); +int unpack_attributes_record(JCR *jcr, int32_t stream, char *rec, ATTR *attr); +void build_attr_output_fnames(JCR *jcr, ATTR *attr); +void print_ls_output(JCR *jcr, ATTR *attr); /* base64.c */ -void base64_init (void); -int to_base64 (intmax_t value, char *where); -int from_base64 (intmax_t *value, char *where); -int bin_to_base64 (char *buf, char *bin, int len); +void base64_init (void); +int to_base64 (intmax_t value, char *where); +int from_base64 (intmax_t *value, char *where); +int bin_to_base64 (char *buf, char *bin, int len); /* bsys.c */ -char *bstrncpy (char *dest, const char *src, int maxlen); -char *bstrncpy (char *dest, POOL_MEM &src, int maxlen); -char *bstrncat (char *dest, const char *src, int maxlen); -char *bstrncat (char *dest, POOL_MEM &src, int maxlen); -void *b_malloc (const char *file, int line, size_t size); +char *bstrncpy (char *dest, const char *src, int maxlen); +char *bstrncpy (char *dest, POOL_MEM &src, int maxlen); +char *bstrncat (char *dest, const char *src, int maxlen); +char *bstrncat (char *dest, POOL_MEM &src, int maxlen); +void *b_malloc (const char *file, int line, size_t size); #ifndef DEBUG -void *bmalloc (size_t size); +void *bmalloc (size_t size); #endif -void *brealloc (void *buf, size_t size); -void *bcalloc (size_t size1, size_t size2); -int bsnprintf (char *str, int32_t size, const char *format, ...); -int bvsnprintf (char *str, int32_t size, const char *format, va_list ap); -int pool_sprintf (char *pool_buf, const char *fmt, ...); -void create_pid_file (char *dir, const char *progname, int port); -int delete_pid_file (char *dir, const char *progname, int port); -void drop (char *uid, char *gid); -int bmicrosleep (time_t sec, long usec); -char *bfgets (char *s, int size, FILE *fd); -void make_unique_filename (POOLMEM **name, int Id, char *what); +void *brealloc (void *buf, size_t size); +void *bcalloc (size_t size1, size_t size2); +int bsnprintf (char *str, int32_t size, const char *format, ...); +int bvsnprintf (char *str, int32_t size, const char *format, va_list ap); +int pool_sprintf (char *pool_buf, const char *fmt, ...); +void create_pid_file (char *dir, const char *progname, int port); +int delete_pid_file (char *dir, const char *progname, int port); +void drop (char *uid, char *gid); +int bmicrosleep (time_t sec, long usec); +char *bfgets (char *s, int size, FILE *fd); +void make_unique_filename (POOLMEM **name, int Id, char *what); #ifndef HAVE_STRTOLL -long long int strtoll (const char *ptr, char **endptr, int base); +long long int strtoll (const char *ptr, char **endptr, int base); #endif -void read_state_file(char *dir, const char *progname, int port); -int bstrerror(int errnum, char *buf, size_t bufsiz); +void read_state_file(char *dir, const char *progname, int port); +int bstrerror(int errnum, char *buf, size_t bufsiz); /* bnet.c */ -int32_t bnet_recv (BSOCK *bsock); -bool bnet_send (BSOCK *bsock); -bool bnet_fsend (BSOCK *bs, const char *fmt, ...); -bool bnet_set_buffer_size (BSOCK *bs, uint32_t size, int rw); -bool bnet_sig (BSOCK *bs, int sig); -int bnet_ssl_server (BSOCK *bsock, char *password, int ssl_need, int ssl_has); -int bnet_ssl_client (BSOCK *bsock, char *password, int ssl_need); -BSOCK * bnet_connect (JCR *jcr, int retry_interval, - int max_retry_time, const char *name, char *host, char *service, - int port, int verbose); -void bnet_close (BSOCK *bsock); -BSOCK * init_bsock (JCR *jcr, int sockfd, const char *who, const char *ip, - int port, struct sockaddr *client_addr); -BSOCK * dup_bsock (BSOCK *bsock); -void term_bsock (BSOCK *bsock); -char * bnet_strerror (BSOCK *bsock); -const char *bnet_sig_to_ascii (BSOCK *bsock); -int bnet_wait_data (BSOCK *bsock, int sec); -int bnet_wait_data_intr (BSOCK *bsock, int sec); -int bnet_despool_to_bsock (BSOCK *bsock, void update(ssize_t size), ssize_t size); -bool is_bnet_stop (BSOCK *bsock); -int is_bnet_error (BSOCK *bsock); -void bnet_suppress_error_messages(BSOCK *bsock, bool flag); +int32_t bnet_recv (BSOCK *bsock); +bool bnet_send (BSOCK *bsock); +bool bnet_fsend (BSOCK *bs, const char *fmt, ...); +bool bnet_set_buffer_size (BSOCK *bs, uint32_t size, int rw); +bool bnet_sig (BSOCK *bs, int sig); +int bnet_ssl_server (BSOCK *bsock, char *password, int ssl_need, int ssl_has); +int bnet_ssl_client (BSOCK *bsock, char *password, int ssl_need); +BSOCK * bnet_connect (JCR *jcr, int retry_interval, + int max_retry_time, const char *name, char *host, char *service, + int port, int verbose); +void bnet_close (BSOCK *bsock); +BSOCK * init_bsock (JCR *jcr, int sockfd, const char *who, const char *ip, + int port, struct sockaddr *client_addr); +BSOCK * dup_bsock (BSOCK *bsock); +void term_bsock (BSOCK *bsock); +const char *bnet_strerror (BSOCK *bsock); +const char *bnet_sig_to_ascii (BSOCK *bsock); +int bnet_wait_data (BSOCK *bsock, int sec); +int bnet_wait_data_intr (BSOCK *bsock, int sec); +int bnet_despool_to_bsock (BSOCK *bsock, void update(ssize_t size), ssize_t size); +bool is_bnet_stop (BSOCK *bsock); +int is_bnet_error (BSOCK *bsock); +void bnet_suppress_error_messages(BSOCK *bsock, bool flag); dlist *bnet_host2ipaddrs(const char *host, int family, const char **errstr); /* bget_msg.c */ -int bget_msg(BSOCK *sock); +int bget_msg(BSOCK *sock); /* bpipe.c */ -BPIPE * open_bpipe(char *prog, int wait, const char *mode); -int close_wpipe(BPIPE *bpipe); -int close_bpipe(BPIPE *bpipe); +BPIPE * open_bpipe(char *prog, int wait, const char *mode); +int close_wpipe(BPIPE *bpipe); +int close_bpipe(BPIPE *bpipe); /* cram-md5.c */ int cram_md5_get_auth(BSOCK *bs, char *password, int ssl_need); int cram_md5_auth(BSOCK *bs, char *password, int ssl_need); void hmac_md5(uint8_t* text, int text_len, uint8_t* key, - int key_len, uint8_t *hmac); + int key_len, uint8_t *hmac); /* crc32.c */ uint32_t bcrc32(uint8_t *buf, int len); /* daemon.c */ -void daemon_start (); +void daemon_start (); /* edit.c */ -uint64_t str_to_uint64(char *str); -int64_t str_to_int64(char *str); -char * edit_uint64_with_commas (uint64_t val, char *buf); -char * add_commas (char *val, char *buf); -char * edit_uint64 (uint64_t val, char *buf); -int duration_to_utime (char *str, utime_t *value); -int size_to_uint64(char *str, int str_len, uint64_t *rtn_value); -char *edit_utime (utime_t val, char *buf, int buf_len); -bool is_a_number (const char *num); -bool is_an_integer (const char *n); -bool is_name_valid (char *name, POOLMEM **msg); +uint64_t str_to_uint64(char *str); +int64_t str_to_int64(char *str); +char * edit_uint64_with_commas (uint64_t val, char *buf); +char * add_commas (char *val, char *buf); +char * edit_uint64 (uint64_t val, char *buf); +int duration_to_utime (char *str, utime_t *value); +int size_to_uint64(char *str, int str_len, uint64_t *rtn_value); +char *edit_utime (utime_t val, char *buf, int buf_len); +bool is_a_number (const char *num); +bool is_an_integer (const char *n); +bool is_name_valid (char *name, POOLMEM **msg); /* jcr.c (most definitions are in src/jcr.h) */ void init_last_jobs_list(); @@ -136,36 +136,36 @@ void job_end_push(JCR *jcr, void job_end_cb(JCR *jcr,void *), void *ctx); /* lex.c */ -LEX * lex_close_file (LEX *lf); -LEX * lex_open_file (LEX *lf, const char *fname, LEX_ERROR_HANDLER *scan_error); -int lex_get_char (LEX *lf); -void lex_unget_char (LEX *lf); -const char * lex_tok_to_str (int token); -int lex_get_token (LEX *lf, int expect); +LEX * lex_close_file (LEX *lf); +LEX * lex_open_file (LEX *lf, const char *fname, LEX_ERROR_HANDLER *scan_error); +int lex_get_char (LEX *lf); +void lex_unget_char (LEX *lf); +const char * lex_tok_to_str (int token); +int lex_get_token (LEX *lf, int expect); /* message.c */ -void my_name_is (int argc, char *argv[], const char *name); -void init_msg (JCR *jcr, MSGS *msg); -void term_msg (void); -void close_msg (JCR *jcr); -void add_msg_dest (MSGS *msg, int dest, int type, char *where, char *dest_code); -void rem_msg_dest (MSGS *msg, int dest, int type, char *where); -void Jmsg (JCR *jcr, int type, int level, const char *fmt, ...); -void dispatch_message (JCR *jcr, int type, int level, char *buf); -void init_console_msg (const char *wd); -void free_msgs_res (MSGS *msgs); -void dequeue_messages (JCR *jcr); -void set_trace (int trace_flag); -void set_exit_on_error (int value); +void my_name_is (int argc, char *argv[], const char *name); +void init_msg (JCR *jcr, MSGS *msg); +void term_msg (void); +void close_msg (JCR *jcr); +void add_msg_dest (MSGS *msg, int dest, int type, char *where, char *dest_code); +void rem_msg_dest (MSGS *msg, int dest, int type, char *where); +void Jmsg (JCR *jcr, int type, int level, const char *fmt, ...); +void dispatch_message (JCR *jcr, int type, int level, char *buf); +void init_console_msg (const char *wd); +void free_msgs_res (MSGS *msgs); +void dequeue_messages (JCR *jcr); +void set_trace (int trace_flag); +void set_exit_on_error (int value); /* bnet_server.c */ -void bnet_thread_server(dlist *addr, int max_clients, workq_t *client_wq, - void *handle_client_request(void *bsock)); -void bnet_stop_thread_server(pthread_t tid); -void bnet_server (int port, void handle_client_request(BSOCK *bsock)); -int net_connect (int port); -BSOCK * bnet_bind (int port); -BSOCK * bnet_accept (BSOCK *bsock, char *who); +void bnet_thread_server(dlist *addr, int max_clients, workq_t *client_wq, + void *handle_client_request(void *bsock)); +void bnet_stop_thread_server(pthread_t tid); +void bnet_server (int port, void handle_client_request(BSOCK *bsock)); +int net_connect (int port); +BSOCK * bnet_bind (int port); +BSOCK * bnet_accept (BSOCK *bsock, char *who); /* idcache.c */ char *getuser(uid_t uid); @@ -175,41 +175,41 @@ void free_getgroup_cache(); /* signal.c */ -void init_signals (void terminate(int sig)); -void init_stack_dump (void); +void init_signals (void terminate(int sig)); +void init_stack_dump (void); /* scan.c */ -void strip_trailing_junk (char *str); -void strip_trailing_slashes (char *dir); -bool skip_spaces (char **msg); -bool skip_nonspaces (char **msg); -int fstrsch (const char *a, const char *b); -char *next_arg(char **s); -int parse_args(POOLMEM *cmd, POOLMEM **args, int *argc, - char **argk, char **argv, int max_args); -void split_path_and_filename(const char *fname, POOLMEM **path, - int *pnl, POOLMEM **file, int *fnl); -int bsscanf(const char *buf, const char *fmt, ...); +void strip_trailing_junk (char *str); +void strip_trailing_slashes (char *dir); +bool skip_spaces (char **msg); +bool skip_nonspaces (char **msg); +int fstrsch (const char *a, const char *b); +char *next_arg(char **s); +int parse_args(POOLMEM *cmd, POOLMEM **args, int *argc, + char **argk, char **argv, int max_args); +void split_path_and_filename(const char *fname, POOLMEM **path, + int *pnl, POOLMEM **file, int *fnl); +int bsscanf(const char *buf, const char *fmt, ...); /* util.c */ -int is_buf_zero (char *buf, int len); -void lcase (char *str); -void bash_spaces (char *str); -void bash_spaces (POOL_MEM &pm); -void unbash_spaces (char *str); -void unbash_spaces (POOL_MEM &pm); -char * encode_time (time_t time, char *buf); -char * encode_mode (mode_t mode, char *buf); -int do_shell_expansion (char *name, int name_len); -void jobstatus_to_ascii (int JobStatus, char *msg, int maxlen); -int run_program (char *prog, int wait, POOLMEM *results); -const char * job_type_to_str (int type); -const char * job_status_to_str (int stat); -const char * job_level_to_str (int level); -void make_session_key (char *key, char *seed, int mode); -POOLMEM *edit_job_codes(JCR *jcr, char *omsg, char *imsg, const char *to); -void set_working_directory(char *wd); +int is_buf_zero (char *buf, int len); +void lcase (char *str); +void bash_spaces (char *str); +void bash_spaces (POOL_MEM &pm); +void unbash_spaces (char *str); +void unbash_spaces (POOL_MEM &pm); +char * encode_time (time_t time, char *buf); +char * encode_mode (mode_t mode, char *buf); +int do_shell_expansion (char *name, int name_len); +void jobstatus_to_ascii (int JobStatus, char *msg, int maxlen); +int run_program (char *prog, int wait, POOLMEM *results); +const char * job_type_to_str (int type); +const char * job_status_to_str (int stat); +const char * job_level_to_str (int level); +void make_session_key (char *key, char *seed, int mode); +POOLMEM *edit_job_codes(JCR *jcr, char *omsg, char *imsg, const char *to); +void set_working_directory(char *wd); /* watchdog.c */ diff --git a/bacula/src/stored/acquire.c b/bacula/src/stored/acquire.c index f7905d8a83..d99fbe0ee3 100644 --- a/bacula/src/stored/acquire.c +++ b/bacula/src/stored/acquire.c @@ -132,6 +132,7 @@ DCR *acquire_device_for_read(JCR *jcr) bstrncpy(dcr->VolumeName, vol->VolumeName, sizeof(dcr->VolumeName)); for (i=0; i<5; i++) { + dcr->dev->state &= ~ST_LABEL; /* force reread of label */ if (job_canceled(jcr)) { Mmsg1(dev->errmsg, _("Job %d canceled.\n"), jcr->JobId); goto get_out; /* error return */ @@ -144,6 +145,9 @@ DCR *acquire_device_for_read(JCR *jcr) for ( ; !(dev->state & ST_OPENED); ) { Dmsg1(120, "bstored: open vol=%s\n", dcr->VolumeName); if (open_dev(dev, dcr->VolumeName, OPEN_READ_ONLY) < 0) { + if (dev->dev_errno == EIO) { /* no tape loaded */ + goto default_path; + } Jmsg(jcr, M_FATAL, 0, _("Open device %s volume %s failed, ERR=%s\n"), dev_name(dev), dcr->VolumeName, strerror_dev(dev)); goto get_out; @@ -154,7 +158,6 @@ DCR *acquire_device_for_read(JCR *jcr) * correctly possitioned. Possibly have way user can turn * this optimization (to be implemented) off. */ - dcr->dev->state &= ~ST_LABEL; /* force reread of label */ Dmsg0(200, "calling read-vol-label\n"); switch (read_dev_volume_label(dcr)) { case VOL_OK: diff --git a/bacula/src/stored/append.c b/bacula/src/stored/append.c index 262c3aa3e3..f160778eb7 100644 --- a/bacula/src/stored/append.c +++ b/bacula/src/stored/append.c @@ -97,7 +97,12 @@ bool do_append_data(JCR *jcr) } /* Tell File daemon to send data */ - bnet_fsend(fd_sock, OK_data); + if (!bnet_fsend(fd_sock, OK_data)) { + berrno be; + Jmsg1(jcr, M_FATAL, 0, _("Network send error to FD. ERR=%s\n"), + be.strerror(fd_sock->b_errno)); + ok = false; + } /* * Get Data from File daemon, write to device. To clarify what is @@ -132,7 +137,7 @@ bool do_append_data(JCR *jcr) break; /* end of data */ } Jmsg1(jcr, M_FATAL, 0, _("Error reading data header from FD. ERR=%s\n"), - bnet_strerror(ds)); + bnet_strerror(ds)); ok = false; break; } @@ -229,7 +234,7 @@ bool do_append_data(JCR *jcr) } if (is_bnet_error(ds)) { Jmsg1(jcr, M_FATAL, 0, _("Network error on data channel. ERR=%s\n"), - bnet_strerror(ds)); + bnet_strerror(ds)); ok = false; break; } @@ -250,7 +255,7 @@ bool do_append_data(JCR *jcr) if (ok || dev_can_write(dev)) { if (!write_session_label(dcr, EOS_LABEL)) { Jmsg1(jcr, M_FATAL, 0, _("Error writting end session label. ERR=%s\n"), - strerror_dev(dev)); + strerror_dev(dev)); set_jcr_job_status(jcr, JS_ErrorTerminated); ok = false; } diff --git a/bacula/src/stored/spool.c b/bacula/src/stored/spool.c index 7fd44efa05..ffe17ae893 100644 --- a/bacula/src/stored/spool.c +++ b/bacula/src/stored/spool.c @@ -6,7 +6,7 @@ * Version $Id$ */ /* - Copyright (C) 2000-2004 Kern Sibbald and John Walker + Copyright (C) 2004-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/bacula/src/version.h b/bacula/src/version.h index 144aedf9fb..1f4dc41407 100644 --- a/bacula/src/version.h +++ b/bacula/src/version.h @@ -1,8 +1,8 @@ /* */ #undef VERSION #define VERSION "1.35.9" -#define BDATE "15 October 2004" -#define LSMDATE "15Oct04" +#define BDATE "16 October 2004" +#define LSMDATE "16Oct04" /* Debug flags */ #undef DEBUG -- 2.39.5