diff options
| author | Jeremy Allison <jra@samba.org> | 2002-07-17 00:38:37 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2002-07-17 00:38:37 +0000 |
| commit | cc9511af8c3bb1b805ba34049e7861e226ed5f7d (patch) | |
| tree | f0b1f5f05f177ef2cbf91a62521a7f14cd77e1bf /source3/smbd | |
| parent | 34ed527b1341d3d30b36ddc13a36227b108ec34e (diff) | |
| download | samba-cc9511af8c3bb1b805ba34049e7861e226ed5f7d.tar.gz samba-cc9511af8c3bb1b805ba34049e7861e226ed5f7d.tar.bz2 samba-cc9511af8c3bb1b805ba34049e7861e226ed5f7d.zip | |
Lanman print jobs are *16* bits, not 32. arggggh. Map them....
Jeremy.
(This used to be commit 2b06fd305be10fa8a8629adb4a99ccd3960786da)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/lanman.c | 16 | ||||
| -rw-r--r-- | source3/smbd/posix_acls.c | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c index 996a17e932..619ecd736a 100644 --- a/source3/smbd/lanman.c +++ b/source3/smbd/lanman.c @@ -443,7 +443,7 @@ static void fill_printjob_info(connection_struct *conn, int snum, int uLevel, /* the client expects localtime */ t -= TimeDiff(t); - PACKI(desc,"W",queue->job); /* uJobId */ + PACKI(desc,"W",pjobid_to_rap(queue->job)); /* uJobId */ if (uLevel == 1) { PACKS(desc,"B21",queue->fs_user); /* szUserName */ PACKS(desc,"B",""); /* pad */ @@ -933,7 +933,7 @@ static BOOL api_DosPrintQGetInfo(connection_struct *conn, if (!mdrcnt && lp_disable_spoolss()) desc.errcode = ERRbuftoosmall; - *rdata_len = desc.usedlen; + *rdata_len = desc.usedlen; *rparam_len = 6; *rparam = REALLOC(*rparam,*rparam_len); SSVALS(*rparam,0,desc.errcode); @@ -2185,7 +2185,7 @@ static BOOL api_RDosPrintJobDel(connection_struct *conn,uint16 vuid, char *param extern struct current_user current_user; WERROR werr = WERR_OK; - jobid = SVAL(p,0); + jobid = rap_to_pjobid(SVAL(p,0)); /* check it's a supported varient */ if (!(strcsequal(str1,"W") && strcsequal(str2,""))) @@ -2318,7 +2318,7 @@ static BOOL api_PrintJobInfo(connection_struct *conn,uint16 vuid,char *param,cha int function = SVAL(p,4); int place, errcode; - jobid = SVAL(p,0); + jobid = rap_to_pjobid(SVAL(p,0)); *rparam_len = 4; *rparam = REALLOC(*rparam,*rparam_len); @@ -2994,7 +2994,7 @@ static BOOL api_WPrintJobGetInfo(connection_struct *conn,uint16 vuid, char *para int count; int i; int snum; - int job; + uint32 jobid; struct pack_desc desc; print_queue_struct *queue=NULL; print_status_struct status; @@ -3011,14 +3011,14 @@ static BOOL api_WPrintJobGetInfo(connection_struct *conn,uint16 vuid, char *para if (strcmp(str1,"WWrLh") != 0) return False; if (!check_printjob_info(&desc,uLevel,str2)) return False; - job = SVAL(p,0); - snum = print_job_snum(job); + jobid = rap_to_pjobid(SVAL(p,0)); + snum = print_job_snum(jobid); if (snum < 0 || !VALID_SNUM(snum)) return(False); count = print_queue_status(snum,&queue,&status); for (i = 0; i < count; i++) { - if (queue[i].job == job) break; + if (queue[i].job == jobid) break; } if (mdrcnt > 0) { diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index 85818d524a..043e33e836 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -2296,7 +2296,7 @@ static int chmod_acl_internals( connection_struct *conn, SMB_ACL_T posix_acl, mo switch(tagtype) { case SMB_ACL_USER_OBJ: perms = unix_perms_to_acl_perms(mode, S_IRUSR, S_IWUSR, S_IXUSR); - break; + break; case SMB_ACL_GROUP_OBJ: perms = unix_perms_to_acl_perms(mode, S_IRGRP, S_IWGRP, S_IXGRP); break; |