Menu
▾
▴
[Bacula-commits] bacula/src/filed acl.c,1.5,1.6 job.c,1.100,1.101 verify_vol.c,1.16,1.17
|
From: Kern S. <ke...@us...> - 2005-01-29 22:39:53
|
Update of /cvsroot/bacula/bacula/src/filed In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29956/src/filed Modified Files: acl.c job.c verify_vol.c Log Message: Vacation work -- see tech log Index: verify_vol.c =================================================================== RCS file: /cvsroot/bacula/bacula/src/filed/verify_vol.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- verify_vol.c 21 Dec 2004 16:18:36 -0000 1.16 +++ verify_vol.c 29 Jan 2005 22:39:01 -0000 1.17 @@ -87,7 +87,7 @@ */ if (sscanf(sd->msg, rec_header, &VolSessionId, &VolSessionTime, &file_index, &stream, &size) != 5) { - Jmsg1(jcr, M_FATAL, 0, _("Record header scan error: %s\n"), sd->msg); + Jmsg1(jcr, M_FATAL, 0, _("Record header scan error: %s\n"), sd->msg); goto bail_out; } Dmsg2(30, "Got hdr: FilInx=%d Stream=%d.\n", file_index, stream); @@ -96,11 +96,11 @@ * Now we expect the Stream Data */ if (bget_msg(sd) < 0) { - Jmsg1(jcr, M_FATAL, 0, _("Data record error. ERR=%s\n"), bnet_strerror(sd)); + Jmsg1(jcr, M_FATAL, 0, _("Data record error. ERR=%s\n"), bnet_strerror(sd)); goto bail_out; } if (size != ((uint32_t)sd->msglen)) { - Jmsg2(jcr, M_FATAL, 0, _("Actual data size %d not same as header %d\n"), sd->msglen, size); + Jmsg2(jcr, M_FATAL, 0, _("Actual data size %d not same as header %d\n"), sd->msglen, size); goto bail_out; } Dmsg1(30, "Got stream data, len=%d\n", sd->msglen); @@ -111,7 +111,7 @@ case STREAM_UNIX_ATTRIBUTES_EX: char *ap, *lp, *fp; - Dmsg0(400, "Stream=Unix Attributes.\n"); + Dmsg0(400, "Stream=Unix Attributes.\n"); if ((int)sizeof_pool_memory(fname) < sd->msglen) { fname = realloc_pool_memory(fname, sd->msglen + 1); @@ -132,22 +132,22 @@ * Link name (if file linked i.e. FT_LNK) * Extended Attributes (if Win32) */ - if (sscanf(sd->msg, "%d %d", &record_file_index, &type) != 2) { - Jmsg(jcr, M_FATAL, 0, _("Error scanning record header: %s\n"), sd->msg); - Dmsg0(0, "\nError scanning header\n"); + if (sscanf(sd->msg, "%d %d", &record_file_index, &type) != 2) { + Jmsg(jcr, M_FATAL, 0, _("Error scanning record header: %s\n"), sd->msg); + Dmsg0(0, "\nError scanning header\n"); goto bail_out; } - Dmsg2(30, "Got Attr: FilInx=%d type=%d\n", record_file_index, type); + Dmsg2(30, "Got Attr: FilInx=%d type=%d\n", record_file_index, type); if (record_file_index != file_index) { - Jmsg(jcr, M_FATAL, 0, _("Record header file index %ld not equal record index %ld\n"), + Jmsg(jcr, M_FATAL, 0, _("Record header file index %ld not equal record index %ld\n"), file_index, record_file_index); - Dmsg0(0, "File index error\n"); + Dmsg0(0, "File index error\n"); goto bail_out; } ap = sd->msg; - while (*ap++ != ' ') /* skip record file index */ + while (*ap++ != ' ') /* skip record file index */ ; - while (*ap++ != ' ') /* skip type */ + while (*ap++ != ' ') /* skip type */ ; /* Save filename and position to attributes */ fp = fname; @@ -156,21 +156,21 @@ } *fp = *ap++; /* terminate filename & point to attribs */ - Dmsg1(200, "Attr=%s\n", ap); + Dmsg1(200, "Attr=%s\n", ap); /* Skip to Link name */ if (type == FT_LNK || type == FT_LNKSAVED) { lp = ap; while (*lp++ != 0) { ; } - strcat(lname, lp); /* "save" link name */ + pm_strcat(lname, lp); /* "save" link name */ } else { *lname = 0; } P(jcr->mutex); jcr->JobFiles++; jcr->num_files_examined++; - pm_strcpy(&jcr->last_fname, fname); /* last file examined */ + pm_strcpy(jcr->last_fname, fname); /* last file examined */ V(jcr->mutex); /* @@ -185,19 +185,19 @@ * slash. For a linked file, link is the link. */ /* Send file attributes to Director */ - Dmsg2(200, "send ATTR inx=%d fname=%s\n", jcr->JobFiles, fname); + Dmsg2(200, "send ATTR inx=%d fname=%s\n", jcr->JobFiles, fname); if (type == FT_LNK || type == FT_LNKSAVED) { - stat = bnet_fsend(dir, "%d %d %s %s%c%s%c%s%c", jcr->JobFiles, - STREAM_UNIX_ATTRIBUTES, "pinsug5", fname, + stat = bnet_fsend(dir, "%d %d %s %s%c%s%c%s%c", jcr->JobFiles, + STREAM_UNIX_ATTRIBUTES, "pinsug5", fname, 0, ap, 0, lname, 0); } else { - stat = bnet_fsend(dir,"%d %d %s %s%c%s%c%c", jcr->JobFiles, - STREAM_UNIX_ATTRIBUTES, "pinsug5", fname, + stat = bnet_fsend(dir,"%d %d %s %s%c%s%c%c", jcr->JobFiles, + STREAM_UNIX_ATTRIBUTES, "pinsug5", fname, 0, ap, 0, 0); } - Dmsg2(200, "bfiled>bdird: attribs len=%d: msg=%s\n", dir->msglen, dir->msg); + Dmsg2(200, "bfiled>bdird: attribs len=%d: msg=%s\n", dir->msglen, dir->msg); if (!stat) { - Jmsg(jcr, M_FATAL, 0, _("Network error in send to Director: ERR=%s\n"), bnet_strerror(dir)); + Jmsg(jcr, M_FATAL, 0, _("Network error in send to Director: ERR=%s\n"), bnet_strerror(dir)); goto bail_out; } break; @@ -216,23 +216,23 @@ case STREAM_MD5_SIGNATURE: char MD5buf[30]; bin_to_base64(MD5buf, (char *)sd->msg, 16); /* encode 16 bytes */ - Dmsg2(400, "send inx=%d MD5=%s\n", jcr->JobFiles, MD5buf); - bnet_fsend(dir, "%d %d %s *MD5-%d*", jcr->JobFiles, STREAM_MD5_SIGNATURE, MD5buf, + Dmsg2(400, "send inx=%d MD5=%s\n", jcr->JobFiles, MD5buf); + bnet_fsend(dir, "%d %d %s *MD5-%d*", jcr->JobFiles, STREAM_MD5_SIGNATURE, MD5buf, jcr->JobFiles); - Dmsg2(20, "bfiled>bdird: MD5 len=%d: msg=%s\n", dir->msglen, dir->msg); + Dmsg2(20, "bfiled>bdird: MD5 len=%d: msg=%s\n", dir->msglen, dir->msg); break; case STREAM_SHA1_SIGNATURE: char SHA1buf[30]; bin_to_base64(SHA1buf, (char *)sd->msg, 20); /* encode 20 bytes */ - Dmsg2(400, "send inx=%d SHA1=%s\n", jcr->JobFiles, SHA1buf); - bnet_fsend(dir, "%d %d %s *SHA1-%d*", jcr->JobFiles, STREAM_SHA1_SIGNATURE, + Dmsg2(400, "send inx=%d SHA1=%s\n", jcr->JobFiles, SHA1buf); + bnet_fsend(dir, "%d %d %s *SHA1-%d*", jcr->JobFiles, STREAM_SHA1_SIGNATURE, SHA1buf, jcr->JobFiles); - Dmsg2(20, "bfiled>bdird: SHA1 len=%d: msg=%s\n", dir->msglen, dir->msg); + Dmsg2(20, "bfiled>bdird: SHA1 len=%d: msg=%s\n", dir->msglen, dir->msg); break; default: - Pmsg2(0, "None of above!!! stream=%d data=%s\n", stream,sd->msg); + Pmsg2(0, "None of above!!! stream=%d data=%s\n", stream,sd->msg); break; } /* end switch */ } /* end while bnet_get */ Index: job.c =================================================================== RCS file: /cvsroot/bacula/bacula/src/filed/job.c,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- job.c 14 Jan 2005 11:02:16 -0000 1.100 +++ job.c 29 Jan 2005 22:39:01 -0000 1.101 @@ -533,8 +533,8 @@ /* Copy File options */ if (list == INC_LIST) { *q = 0; /* terminate options */ - strcpy(buf, fname); - strcat(buf, " "); + bstrncpy(buf, fname, sizeof(buf)); + bstrncat(buf, " ", sizeof(buf)); optlen = strlen(buf); } else { optlen = 0; @@ -564,8 +564,8 @@ /* Copy File options */ if (list == INC_LIST) { *q = 0; /* terminate options */ - strcpy(buf, fname); - strcat(buf, " "); + bstrncpy(buf, fname, sizeof(buf)); + bstrncat(buf, " ", sizeof(buf)); optlen = strlen(buf); } else { optlen = 0; Index: acl.c =================================================================== RCS file: /cvsroot/bacula/bacula/src/filed/acl.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- acl.c 12 Jan 2005 09:41:20 -0000 1.5 +++ acl.c 29 Jan 2005 22:39:01 -0000 1.6 @@ -97,7 +97,7 @@ * with what we have and give all ACL streams a new number/type. */ #endif -#if !defined(HAVE_ACL) || ! defined(HAVE_LINUX_OS) +#if !defined(HAVE_ACL) || !defined(HAVE_LINUX_OS) /* bacl_get() returns the lenght of the string, or -1 on error. */ int bacl_get(JCR *jcr, int acltype) @@ -181,7 +181,7 @@ } /***** Do we really want to silently ignore errors from acl_get_file and acl_to_text? *****/ - return -1; + return 0; } int bacl_set(JCR *jcr, int acltype) @@ -418,7 +418,7 @@ if (S_ISDIR(st.st_mode) && (BACL_CAP & BACL_CAP_DEFAULTS_DIR)) { jcr.last_fname = src; if (bacl_get(&jcr, BACL_TYPE_DEFAULT) < 0) { - Dmsg1(200, "aclcp: could not read default ACLs for %s\n", jcr.last_fname); + Dmsg1(200, "aclcp: could not read default ACLs for %s\n", jcr.last_fname); return EXIT_FAILURE; } else { jcr.last_fname = dst; |