Fix bad bstrncpy

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@434 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/stored/askdir.c b/bacula/src/stored/askdir.c
index 971dc96975f95756121d8bdbf18d2af7eb744c8b..c0e3470a422f6b14291e25216cbc4bff83e6888d 100644 (file)
--- a/bacula/src/stored/askdir.c
+++ b/bacula/src/stored/askdir.c
@@ -95,7 +95,7 @@ static int do_request_volume_info(JCR *jcr)
        return 0;
     }
     unbash_spaces(vol->VolCatName);
-    strcpy(jcr->VolumeName, vol->VolCatName); /* set desired VolumeName */
+    pm_strcpy(&jcr->VolumeName, vol->VolCatName); /* set desired VolumeName */
     
     Dmsg2(200, "do_reqest_vol_info got slot=%d Volume=%s\n", 
          vol->Slot, vol->VolCatName);

diff --git a/bacula/src/stored/mount.c b/bacula/src/stored/mount.c
index a332b7a6312837469207e54df86d2894829095b0..1d5905f043b52ea5d5312b0a38ab6f0f5e0e6861 100644 (file)
--- a/bacula/src/stored/mount.c
+++ b/bacula/src/stored/mount.c
@@ -185,7 +185,7 @@ read_volume:
             */
            memcpy(&dev->VolCatInfo, &jcr->VolCatInfo, sizeof(jcr->VolCatInfo));
            /* Check if this is a valid Volume in the pool */
-           bstrncpy(jcr->VolumeName, dev->VolHdr.VolName, sizeof(jcr->VolumeName));
+           pm_strcpy(&jcr->VolumeName, dev->VolHdr.VolName);                         
            if (!dir_get_volume_info(jcr, 1)) {
                Mmsg(&jcr->errmsg, _("Wanted Volume \"%s\".\n"
                     "    Current Volume \"%s\" not acceptable because:\n"