/* Responses sent to Director daemon */
static char OKjob[] = "3000 OK Job SDid=%u SDtime=%u Authorization=%s\n";
static char OK_device[] = "3000 OK use device\n";
-static char NO_device[] = "3914 Device %s does not exist\n";
+static char NO_device[] = "3914 Device \"%s\" not in SD Device resources.\n";
static char BAD_use[] = "3913 Bad use command: %s\n";
static char BAD_job[] = "3915 Bad Job command: %s\n";
if (sscanf(dir->msg, jobcmd, &JobId, job, job_name, client_name,
&JobType, &level, fileset_name, &no_attributes,
&spool_attributes, fileset_md5) != 10) {
- bnet_fsend(dir, BAD_job, dir->msg);
- Emsg1(M_FATAL, 0, _("Bad Job Command from Director: %s\n"), dir->msg);
+ pm_strcpy(&jcr->errmsg, dir->msg);
+ bnet_fsend(dir, BAD_job, jcr->errmsg);
+ Emsg1(M_FATAL, 0, _("Bad Job Command from Director: %s\n"), jcr->errmsg);
free_memory(job);
free_memory(job_name);
free_memory(client_name);
* expires.
*/
P(jcr->mutex);
- for ( ;!job_cancelled(jcr); ) {
+ for ( ;!job_canceled(jcr); ) {
errstat = pthread_cond_timedwait(&jcr->job_start_wait, &jcr->mutex, &timeout);
if (errstat == 0 || errstat == ETIMEDOUT) {
break;
}
V(jcr->mutex);
- if (jcr->authenticated && !job_cancelled(jcr)) {
+ if (jcr->authenticated && !job_canceled(jcr)) {
run_job(jcr); /* Run the job */
}
return 0;
}
Dmsg1(100, "got: %s\n", fd->msg);
- if (sscanf(fd->msg, "Hello Start Job %127s\n", job_name) != 1) {
- Emsg1(M_FATAL, 0, _("Authentication failure: %s\n"), fd->msg);
+ if (fd->msglen < 17 || fd->msglen > 17+127 ||
+ sscanf(fd->msg, "Hello Start Job %127s\n", job_name) != 1) {
+ Emsg1(M_FATAL, 0, _("Bad Hello from FD: %s\n"), fd->msg);
return;
}
handle_filed_connection(fd, job_name);
}
}
UnlockRes();
- Jmsg(jcr, M_FATAL, 0, _("Requested device %s not found. Cannot continue.\n"),
+ if (verbose) {
+ unbash_spaces(dir->msg);
+ pm_strcpy(&jcr->errmsg, dir->msg);
+ Jmsg(jcr, M_INFO, 0, _("Failed command: %s\n"), jcr->errmsg);
+ }
+ Jmsg(jcr, M_FATAL, 0, _("\n"
+ " Device \"%s\" requested by Dir not found in SD Device resources.\n"),
dev_name);
bnet_fsend(dir, NO_device, dev_name);
} else {
- Jmsg(jcr, M_FATAL, 0, _("store<dir: Bad Use Device command: %s\n"), dir->msg);
- bnet_fsend(dir, BAD_use, dir->msg);
+ unbash_spaces(dir->msg);
+ pm_strcpy(&jcr->errmsg, dir->msg);
+ if (verbose) {
+ Jmsg(jcr, M_INFO, 0, _("Failed command: %s\n"), jcr->errmsg);
+ }
+ Jmsg(jcr, M_FATAL, 0, _("Bad Use Device command: %s\n"), jcr->errmsg);
+ bnet_fsend(dir, BAD_use, jcr->errmsg);
}
free_memory(dev_name);