sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-28 17:47:29 +03:00
Code

merge from APP_HEAD

Browse Source 
(This used to be commit 930c6710fe076b52ad21addf5fcda834f85e15a9)
This commit is contained in:
Gerald Carter 2002-09-25 05:01:51 +00:00
parent 2b425763b8
commit 4912dd90ee
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
source3/printing/printing.c
View File

@ -318,6 +318,7 @@ static TDB_DATA print_key(uint32 jobid)
int unpack_pjob( char* buf, int buflen, struct printjob *pjob ) int unpack_pjob( char* buf, int buflen, struct printjob *pjob )
{ {
int len = 0; int len = 0;
int used;
if ( !buf || !pjob ) if ( !buf || !pjob )
return -1; return -1;
@ -336,9 +337,14 @@ int unpack_pjob( char* buf, int buflen, struct printjob *pjob )
pjob->jobname, pjob->jobname,
pjob->user, pjob->user,
pjob->queuename); pjob->queuename);
if ( len == -1 )
len += unpack_devicemode(&pjob->nt_devmode, buf+len, buflen-len); return -1;
if ( (used = unpack_devicemode(&pjob->nt_devmode, buf+len, buflen-len)) == -1 )
return -1;
len += used;
return len; return len;
@ -369,7 +375,8 @@ static struct printjob *print_job_find(int snum, uint32 jobid)
ZERO_STRUCT( pjob ); ZERO_STRUCT( pjob );
unpack_pjob( ret.dptr, ret.dsize, &pjob ); if ( unpack_pjob( ret.dptr, ret.dsize, &pjob ) == -1 )
return NULL;
SAFE_FREE(ret.dptr); SAFE_FREE(ret.dptr);
return &pjob; return &pjob;
@ -689,10 +696,14 @@ static int traverse_fn_delete(TDB_CONTEXT *t, TDB_DATA key, TDB_DATA data, void
uint32 jobid; uint32 jobid;
int i; int i;
if (data.dsize != sizeof(pjob) || key.dsize != sizeof(jobid)) if ( key.dsize != sizeof(jobid) )
return 0; return 0;
memcpy(&jobid, key.dptr, sizeof(jobid)); memcpy(&jobid, key.dptr, sizeof(jobid));
memcpy(&pjob, data.dptr, sizeof(pjob)); if ( unpack_pjob( data.dptr, data.dsize, &pjob ) == -1 )
return 0;
free_nt_devicemode( &pjob.nt_devmode );
if (ts->snum != lp_servicenumber(pjob.queuename)) { if (ts->snum != lp_servicenumber(pjob.queuename)) {
/* this isn't for the queue we are looking at - this cannot happen with the split tdb's. JRA */ /* this isn't for the queue we are looking at - this cannot happen with the split tdb's. JRA */
@ -1681,10 +1692,16 @@ static int traverse_fn_queue(TDB_CONTEXT *t, TDB_DATA key, TDB_DATA data, void *
int i; int i;
uint32 jobid; uint32 jobid;
/* sanity checks */
if ( key.dsize != sizeof(jobid) )
return 0;
memcpy(&jobid, key.dptr, sizeof(jobid)); memcpy(&jobid, key.dptr, sizeof(jobid));
if ( !unpack_pjob( data.dptr, data.dsize, &pjob ) ) if ( unpack_pjob( data.dptr, data.dsize, &pjob ) == -1 )
return 0; return 0;
free_nt_devicemode( &pjob.nt_devmode );
/* maybe it isn't for this queue */ /* maybe it isn't for this queue */
if (ts->snum != lp_servicenumber(pjob.queuename)) if (ts->snum != lp_servicenumber(pjob.queuename))
@ -1723,10 +1740,17 @@ static int traverse_count_fn_queue(TDB_CONTEXT *t, TDB_DATA key, TDB_DATA data,
struct printjob pjob; struct printjob pjob;
uint32 jobid; uint32 jobid;
/* sanity checks */
if ( key.dsize != sizeof(jobid) )
return 0;
memcpy(&jobid, key.dptr, sizeof(jobid)); memcpy(&jobid, key.dptr, sizeof(jobid));
if ( !unpack_pjob( data.dptr, data.dsize, &pjob ) ) if ( unpack_pjob( data.dptr, data.dsize, &pjob ) == -1 )
return 0; return 0;
free_nt_devicemode( &pjob.nt_devmode );
/* maybe it isn't for this queue - this cannot happen with the tdb/printer code. JRA */ /* maybe it isn't for this queue - this cannot happen with the tdb/printer code. JRA */
if (ts->snum != lp_servicenumber(pjob.queuename)) if (ts->snum != lp_servicenumber(pjob.queuename))

2
source3/rpc_server/srv_spoolss_nt.c
View File

@ -5421,11 +5421,13 @@ static WERROR control_printer(POLICY_HND *handle, uint32 command,
errcode = WERR_OK; errcode = WERR_OK;
} }
break; break;
#if 0 /* JERRY - Never called */
case PRINTER_CONTROL_PURGE: case PRINTER_CONTROL_PURGE:
if (print_queue_purge(&user, snum, &errcode)) { if (print_queue_purge(&user, snum, &errcode)) {
errcode = WERR_OK; errcode = WERR_OK;
} }
break; break;
#endif
default: default:
return WERR_UNKNOWN_LEVEL; return WERR_UNKNOWN_LEVEL;
} }