Rather than allocating the devicemode on a null context.
unpack a pjob from a tdb buffer
***********************************************************************/
unpack a pjob from a tdb buffer
***********************************************************************/
-/* FIXME talloc ctx */
-static int unpack_pjob(uint8 *buf, int buflen, struct printjob *pjob)
+static int unpack_pjob(TALLOC_CTX *mem_ctx, uint8 *buf, int buflen,
+ struct printjob *pjob)
- used = unpack_devicemode(NULL, buf+len, buflen-len, &pjob->devmode);
+ used = unpack_devicemode(mem_ctx, buf+len, buflen-len, &pjob->devmode);
if (used == -1) {
return -1;
}
if (used == -1) {
return -1;
}
- if (unpack_pjob(ret.dptr, ret.dsize, pjob) == -1) {
+ if (unpack_pjob(mem_ctx, ret.dptr, ret.dsize, pjob) == -1) {
DEBUG(10, ("failed to unpack jobid %u.\n", jobid));
talloc_free(pjob);
pjob = NULL;
DEBUG(10, ("failed to unpack jobid %u.\n", jobid));
talloc_free(pjob);
pjob = NULL;
/* Send notify updates for what has changed */
/* Send notify updates for what has changed */
bool changed = false;
struct printjob old_pjob;
bool changed = false;
struct printjob old_pjob;
- if ( old_data.dsize )
- {
- if ( unpack_pjob( old_data.dptr, old_data.dsize, &old_pjob ) != -1 )
- {
- pjob_store_notify(server_event_context(),
+ if (old_data.dsize) {
+ TALLOC_CTX *tmp_ctx = talloc_new(ev);
+ if (tmp_ctx == NULL)
+ goto done;
+
+ len = unpack_pjob(tmp_ctx, old_data.dptr,
+ old_data.dsize, &old_pjob);
+ if (len != -1 ) {
+ pjob_store_notify(ev,
msg_ctx,
sharename, jobid, &old_pjob,
pjob,
&changed);
msg_ctx,
sharename, jobid, &old_pjob,
pjob,
&changed);
- talloc_free(old_pjob.devmode);
-
if (changed) {
add_to_jobs_changed(pdb, jobid);
}
}
if (changed) {
add_to_jobs_changed(pdb, jobid);
}
}
- pjob_store_notify(server_event_context(), msg_ctx,
+ pjob_store_notify(ev, msg_ctx,
sharename, jobid, NULL, pjob,
&changed);
}
sharename, jobid, NULL, pjob,
&changed);
}
struct printif *print_if;
struct tevent_context *ev;
struct messaging_context *msg_ctx;
struct printif *print_if;
struct tevent_context *ev;
struct messaging_context *msg_ctx;
};
/****************************************************************************
};
/****************************************************************************
if ( key.dsize != sizeof(jobid) )
return 0;
if ( key.dsize != sizeof(jobid) )
return 0;
- if (unpack_pjob(data.dptr, data.dsize, &pjob) == -1)
+ if (unpack_pjob(ts->mem_ctx, data.dptr, data.dsize, &pjob) == -1)
return 0;
talloc_free(pjob.devmode);
jobid = pjob.jobid;
return 0;
talloc_free(pjob.devmode);
jobid = pjob.jobid;
}
SAFE_FREE(jcdata.dptr);
}
SAFE_FREE(jcdata.dptr);
/* now delete any queued entries that don't appear in the
system queue */
/* now delete any queued entries that don't appear in the
system queue */
tstruct.print_if = current_printif;
tstruct.ev = ev;
tstruct.msg_ctx = msg_ctx;
tstruct.print_if = current_printif;
tstruct.ev = ev;
tstruct.msg_ctx = msg_ctx;
+ tstruct.mem_ctx = tmp_ctx;
tdb_traverse(pdb->tdb, traverse_fn_delete, (void *)&tstruct);
tdb_traverse(pdb->tdb, traverse_fn_delete, (void *)&tstruct);
store_queue_struct(pdb, &tstruct);
SAFE_FREE(tstruct.queue);
store_queue_struct(pdb, &tstruct);
SAFE_FREE(tstruct.queue);
DEBUG(10,("print_queue_update_internal: printer %s INFO/total_jobs = %d\n",
sharename, tstruct.total_jobs ));
DEBUG(10,("print_queue_update_internal: printer %s INFO/total_jobs = %d\n",
sharename, tstruct.total_jobs ));
- devmode = print_job_devmode(lp_const_servicename(snum), jobid);
+ devmode = print_job_devmode(mem_ctx, lp_const_servicename(snum), jobid);
if (!devmode) {
result = spoolss_create_default_devmode(mem_ctx,
pinfo2->printername,
if (!devmode) {
result = spoolss_create_default_devmode(mem_ctx,
pinfo2->printername,