sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

Changes from APPLIANCE_HEAD:

Browse Source 
source/smbd/lanman.c
        - cleanup and bug fix for win9x print queue purge.

    source/printing/printing.c
        - cleanup and bug fix for win9x print queue purge.
        - print_job_end() changed to cleanup spool file in the event of a
          failure returned from the print_run_command()
This commit is contained in:
David O'Neill 0001-01-01 00:00:00 +00:00
parent 50c5ee3c7b
commit 0235fbef37
2 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
source/printing/printing.c
View File

@ -534,6 +534,14 @@ static BOOL print_job_delete1(int jobid)
snum = print_job_snum(jobid);
/* Hrm - we need to be able to cope with deleting a job before it
has reached the spooler. */
if (pjob->sysjob == -1) {
DEBUG(5, ("attempt to delete job %d not seen by lpr\n",
jobid));
}
if (pjob->spooled && pjob->sysjob != -1) {
/* need to delete the spooled entry */
fstring jobstr;
@ -906,7 +914,7 @@ int print_job_start(struct current_user *user, int snum, char *jobname)
BOOL print_job_end(int jobid)
{
struct printjob *pjob = print_job_find(jobid);
int snum;
int snum, ret;
SMB_STRUCT_STAT sbuf;
pstring current_directory;
pstring print_directory;
@ -958,7 +966,7 @@ BOOL print_job_end(int jobid)
pstring_sub(jobname, "'", "_");
/* send it to the system spooler */
print_run_command(snum,
ret = print_run_command(snum,
lp_printcommand(snum), NULL,
"%s", p,
"%J", jobname,
@ -967,19 +975,23 @@ BOOL print_job_end(int jobid)
chdir(wd);
pjob->spooled = True;
print_job_store(jobid, pjob);
/* make sure the database is up to date */
if (print_cache_expired(snum)) print_queue_update(snum);
/* Send a printer notify message */
printer_name = PRINTERNAME(snum);
message_send_all(conn_tdb_ctx(),MSG_PRINTER_NOTIFY, printer_name, strlen(printer_name) + 1, False);
return True;
if (ret == 0) {
/* The print job has been sucessfully handed over to the back-end */
pjob->spooled = True;
print_job_store(jobid, pjob);
/* make sure the database is up to date */
if (print_cache_expired(snum)) print_queue_update(snum);
return True;
} else {
/* The print job was not succesfully started. Cleanup */
/* Still need to add proper error return propagation! 010122:JRR */
unlink(pjob->filename);
tdb_delete(tdb, print_key(jobid));
return False;
}
}
/* utility fn to enumerate the print queue */
@ -1212,11 +1224,15 @@ BOOL print_queue_purge(struct current_user *user, int snum, int *errcode)
print_status_struct status;
char *printer_name;
int njobs, i;
BOOL can_job_admin;
can_job_admin = print_access_check(user, snum, JOB_ACCESS_ADMINISTER);
njobs = print_queue_status(snum, &queue, &status);
if (print_access_check(user, snum, PRINTER_ACCESS_ADMINISTER)) {
for (i=0;i<njobs;i++) {
for (i=0;i<njobs;i++) {
BOOL owner = is_owner(user, queue[i].job);
if (owner || can_job_admin) {
print_job_delete1(queue[i].job);
}
}

7
source/smbd/lanman.c
View File

@ -1947,6 +1947,7 @@ static BOOL api_WPrintQueueCtrl(connection_struct *conn,uint16 vuid, char *param
char *QueueName = skip_string(str2,1);
int errcode = NERR_notsupported;
int snum;
extern struct current_user current_user;
/* check it's a supported varient */
if (!(strcsequal(str1,"z") && strcsequal(str2,"")))
@ -1965,13 +1966,13 @@ static BOOL api_WPrintQueueCtrl(connection_struct *conn,uint16 vuid, char *param
switch (function) {
case 74: /* Pause queue */
if (print_queue_pause(NULL, snum, &errcode)) errcode = NERR_Success;
if (print_queue_pause(&current_user, snum, &errcode)) errcode = NERR_Success;
break;
case 75: /* Resume queue */
if (print_queue_resume(NULL, snum, &errcode)) errcode = NERR_Success;
if (print_queue_resume(&current_user, snum, &errcode)) errcode = NERR_Success;
break;
case 103: /* Purge */
if (print_queue_purge(NULL, snum, &errcode)) errcode = NERR_Success;
if (print_queue_purge(&current_user, snum, &errcode)) errcode = NERR_Success;
break;
}