POOL_MEM query(PM_MESSAGE);
char ed1[50];
- /* Remove job records */
+ /* Records associated with the job */
purge_job_records_from_catalog(ua, JobId);
/* Now remove the Job record itself */
break; /* got a Volume */
case VOL_NAME_ERROR:
VOLUME_CAT_INFO dcrVolCatInfo, devVolCatInfo;
+ char VolumeName[MAX_NAME_LENGTH];
/* If not removable, Volume is broken */
if (!dev->is_removable()) {
dcrVolCatInfo = dcr->VolCatInfo; /* structure assignment */
devVolCatInfo = dev->VolCatInfo; /* structure assignment */
/* Check if this is a valid Volume in the pool */
+ bstrncpy(VolumeName, dcr->VolumeName, sizeof(VolumeName));
bstrncpy(dcr->VolumeName, dev->VolHdr.VolumeName, sizeof(dcr->VolumeName));
if (!dir_get_volume_info(dcr, GET_VOL_INFO_FOR_WRITE)) {
/* Restore desired volume name, note device info out of sync */
jcr->dir_bsock->msg);
ask = true;
/* Restore saved DCR before continuing */
+ bstrncpy(dcr->VolumeName, VolumeName, sizeof(dcr->VolumeName));
dcr->VolCatInfo = dcrVolCatInfo; /* structure assignment */
goto mount_next_vol;
}
General:
16Dec06
+kes Save and restore volume name in stored/mount.c fixed bug #712
+ where wrong tape was requested in a mount.
kes Implement cleaner orphan buffer dumping with buf address.
kes Fix orphaned buffer when canceling job waiting on op intervention.
kes Update projects file for next vote.