diff options
| author | Simo Sorce <idra@samba.org> | 2010-05-01 17:42:52 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2010-07-27 10:27:13 -0400 |
| commit | 94ee35f9cc0880c267bee14047d559948eb14ede (patch) | |
| tree | 61302ba298a2bfa4358f9ae445c2c9267a4f1a4a /source3/printing/printfsp.c | |
| parent | 4761498c9e40d8b00060d2949bfcff32c6cf7f99 (diff) | |
| download | samba-94ee35f9cc0880c267bee14047d559948eb14ede.tar.gz samba-94ee35f9cc0880c267bee14047d559948eb14ede.tar.bz2 samba-94ee35f9cc0880c267bee14047d559948eb14ede.zip | |
s3-printing: Made print_job_start more robust.
Explicitly return ntstatus errors instead of relying on elusive errno.
Split the function to make it easier to follow.
Signed-off-by: Jim McDonough <jmcd@samba.org>
Diffstat (limited to 'source3/printing/printfsp.c')
| -rw-r--r-- | source3/printing/printfsp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/printing/printfsp.c b/source3/printing/printfsp.c index 5bb662e10f..4d34315a54 100644 --- a/source3/printing/printfsp.c +++ b/source3/printing/printfsp.c @@ -30,9 +30,10 @@ NTSTATUS print_fsp_open(struct smb_request *req, connection_struct *conn, uint16_t current_vuid, files_struct *fsp) { const char *svcname = lp_const_servicename(SNUM(conn)); - int jobid; + uint32_t jobid; fstring name; NTSTATUS status; + WERROR werr; fstrcpy( name, "Remote Downlevel Document"); if (fname) { @@ -44,16 +45,15 @@ NTSTATUS print_fsp_open(struct smb_request *req, connection_struct *conn, fstrcat(name, p); } - jobid = print_job_start(conn->server_info, SNUM(conn), name, NULL); - if (jobid == -1) { - status = map_nt_error_from_unix(errno); - return status; + werr = print_job_start(conn->server_info, SNUM(conn), + name, fname, NULL, &jobid); + if (!W_ERROR_IS_OK(werr)) { + return werror_to_ntstatus(werr); } fsp->print_file = talloc(fsp, struct print_file_data); if (!fsp->print_file) { - status = map_nt_error_from_unix(ENOMEM); - return status; + return NT_STATUS_NO_MEMORY; } /* Convert to RAP id. */ |