123 lines
3.7 KiB
Diff
123 lines
3.7 KiB
Diff
|
diff -uNr torque-2.3.13.ORIG/src/lib/Libnet/get_hostaddr.c torque-2.3.13/src/lib/Libnet/get_hostaddr.c
|
||
|
--- torque-2.3.13.ORIG/src/lib/Libnet/get_hostaddr.c 2011-06-08 16:21:35.185913002 +0200
|
||
|
+++ torque-2.3.13/src/lib/Libnet/get_hostaddr.c 2011-06-08 16:30:06.784913002 +0200
|
||
|
@@ -143,7 +143,8 @@
|
||
|
|
||
|
if (hp == NULL)
|
||
|
{
|
||
|
- sprintf(log_buffer,"cannot resolve IP address for host '%s' herror=%d: %s",
|
||
|
+ snprintf(log_buffer, sizeof(log_buffer),
|
||
|
+ "cannot resolve IP address for host '%s' herror=%d: %s",
|
||
|
hostname,
|
||
|
h_errno,
|
||
|
hstrerror(h_errno));
|
||
|
diff -uNr torque-2.3.13.ORIG/src/server/req_quejob.c torque-2.3.13/src/server/req_quejob.c
|
||
|
--- torque-2.3.13.ORIG/src/server/req_quejob.c 2011-06-08 16:21:35.244913002 +0200
|
||
|
+++ torque-2.3.13/src/server/req_quejob.c 2011-06-08 16:29:05.238913002 +0200
|
||
|
@@ -930,17 +930,20 @@
|
||
|
{
|
||
|
if (errno == 0)
|
||
|
{
|
||
|
- sprintf(log_buffer, "job %s in unexpected state '%s'",
|
||
|
- pj->ji_qs.ji_jobid,
|
||
|
- PJobSubState[pj->ji_qs.ji_substate]);
|
||
|
+ snprintf(log_buffer, sizeof(log_buffer),
|
||
|
+ "job %s in unexpected state '%s'",
|
||
|
+ pj->ji_qs.ji_jobid,
|
||
|
+ PJobSubState[pj->ji_qs.ji_substate]);
|
||
|
+
|
||
|
}
|
||
|
else
|
||
|
{
|
||
|
- sprintf(log_buffer, "job %s in unexpected state '%s' (errno=%d - %s)",
|
||
|
- pj->ji_qs.ji_jobid,
|
||
|
- PJobSubState[pj->ji_qs.ji_substate],
|
||
|
- errno,
|
||
|
- strerror(errno));
|
||
|
+ snprintf(log_buffer, sizeof(log_buffer),
|
||
|
+ "job %s in unexpected state '%s' (errno=%d - %s)",
|
||
|
+ pj->ji_qs.ji_jobid,
|
||
|
+ PJobSubState[pj->ji_qs.ji_substate],
|
||
|
+ errno,
|
||
|
+ strerror(errno));
|
||
|
}
|
||
|
|
||
|
log_err(errno, id, log_buffer);
|
||
|
@@ -1141,9 +1144,10 @@
|
||
|
|
||
|
if (LOGLEVEL >= 6)
|
||
|
{
|
||
|
- sprintf(log_buffer, "successfully moved file '%s' for job '%s'",
|
||
|
- namebuf,
|
||
|
- preq->rq_ind.rq_jobfile.rq_jobid);
|
||
|
+ snprintf(log_buffer, sizeof(log_buffer),
|
||
|
+ "successfully moved file '%s' for job '%s'",
|
||
|
+ namebuf,
|
||
|
+ preq->rq_ind.rq_jobfile.rq_jobid);
|
||
|
|
||
|
log_record(
|
||
|
PBSEVENT_JOB,
|
||
|
@@ -1251,9 +1255,11 @@
|
||
|
{
|
||
|
char tmpLine[1024];
|
||
|
|
||
|
- sprintf(tmpLine, "cannot save job - errno=%d - %s",
|
||
|
- errno,
|
||
|
- strerror(errno));
|
||
|
+ snprintf(tmpLine, sizeof(tmpLine),
|
||
|
+ "cannot save job - errno=%d - %s",
|
||
|
+ errno,
|
||
|
+ strerror(errno));
|
||
|
+
|
||
|
|
||
|
log_err(errno, "req_rdytocommit", tmpLine);
|
||
|
|
||
|
@@ -1277,9 +1283,11 @@
|
||
|
{
|
||
|
/* reply failed, purge the job and close the connection */
|
||
|
|
||
|
- sprintf(log_buffer, "cannot report jobid - errno=%d - %s",
|
||
|
- errno,
|
||
|
- strerror(errno));
|
||
|
+ snprintf(log_buffer, sizeof(log_buffer),
|
||
|
+ "cannot report jobid - errno=%d - %s",
|
||
|
+ errno,
|
||
|
+ strerror(errno));
|
||
|
+
|
||
|
|
||
|
log_err(errno, "req_rdytocommit", log_buffer);
|
||
|
|
||
|
@@ -1557,11 +1565,13 @@
|
||
|
|
||
|
/* need to format message first, before request goes away */
|
||
|
|
||
|
- sprintf(log_buffer, msg_jobnew,
|
||
|
- preq->rq_user, preq->rq_host,
|
||
|
- pj->ji_wattr[(int)JOB_ATR_job_owner].at_val.at_str,
|
||
|
- pj->ji_wattr[(int)JOB_ATR_jobname].at_val.at_str,
|
||
|
- pj->ji_qhdr->qu_qs.qu_name);
|
||
|
+ snprintf(log_buffer, sizeof(log_buffer),
|
||
|
+ msg_jobnew,
|
||
|
+ preq->rq_user, preq->rq_host,
|
||
|
+ pj->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
|
||
|
+ pj->ji_wattr[JOB_ATR_jobname].at_val.at_str,
|
||
|
+ pj->ji_qhdr->qu_qs.qu_name);
|
||
|
+
|
||
|
|
||
|
/* acknowledge the request with the job id */
|
||
|
|
||
|
@@ -1591,8 +1601,11 @@
|
||
|
{
|
||
|
if (LOGLEVEL >= 7)
|
||
|
{
|
||
|
- sprintf(log_buffer, "Trying to AUTORUN job %s",
|
||
|
- pj->ji_qs.ji_jobid);
|
||
|
+ snprintf(log_buffer, sizeof(log_buffer),
|
||
|
+ "Trying to AUTORUN job %s",
|
||
|
+ pj->ji_qs.ji_jobid);
|
||
|
+
|
||
|
+
|
||
|
log_record(
|
||
|
PBSEVENT_JOB,
|
||
|
PBS_EVENTCLASS_JOB,
|