diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 16:23:53 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 16:23:53 +0100 |
| commit | 54bc27e9374742d37b1ed9012d1cfe8f5ace6d40 (patch) | |
| tree | 6758fc4a1867dc76a016bc29d36d07e63853a15e /source3/printing | |
| parent | 55903e6f9120f1ec58a8554813229975c3028a09 (diff) | |
| parent | 4a35c974e97551b1ccbfa41d4c08f0598e3c26aa (diff) | |
| download | samba-54bc27e9374742d37b1ed9012d1cfe8f5ace6d40.tar.gz samba-54bc27e9374742d37b1ed9012d1cfe8f5ace6d40.tar.bz2 samba-54bc27e9374742d37b1ed9012d1cfe8f5ace6d40.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into talloc-next
Diffstat (limited to 'source3/printing')
| -rw-r--r-- | source3/printing/printfsp.c | 3 | ||||
| -rw-r--r-- | source3/printing/printing.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source3/printing/printfsp.c b/source3/printing/printfsp.c index b485711f91..243b8ea03b 100644 --- a/source3/printing/printfsp.c +++ b/source3/printing/printfsp.c @@ -88,7 +88,6 @@ NTSTATUS print_fsp_open(struct smb_request *req, connection_struct *conn, void print_fsp_end(files_struct *fsp, enum file_close_type close_type) { uint32 jobid; - fstring sharename; if (fsp->fh->private_options & FILE_DELETE_ON_CLOSE) { /* @@ -102,7 +101,7 @@ void print_fsp_end(files_struct *fsp, enum file_close_type close_type) string_free(&fsp->fsp_name); } - if (!rap_to_pjobid(fsp->rap_print_jobid, sharename, &jobid)) { + if (!rap_to_pjobid(fsp->rap_print_jobid, NULL, &jobid)) { DEBUG(3,("print_fsp_end: Unable to convert RAP jobid %u to print jobid.\n", (unsigned int)fsp->rap_print_jobid )); return; diff --git a/source3/printing/printing.c b/source3/printing/printing.c index 49bd5ac8ba..fc3667ea3a 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -117,7 +117,9 @@ bool rap_to_pjobid(uint16 rap_jobid, fstring sharename, uint32 *pjobid) if ( data.dptr && data.dsize == sizeof(struct rap_jobid_key) ) { struct rap_jobid_key *jinfo = (struct rap_jobid_key*)data.dptr; - fstrcpy( sharename, jinfo->sharename ); + if (sharename != NULL) { + fstrcpy( sharename, jinfo->sharename ); + } *pjobid = jinfo->jobid; DEBUG(10,("rap_to_pjobid: jobid %u maps to RAP jobid %u\n", (unsigned int)*pjobid, (unsigned int)rap_jobid)); |