diff options
| author | Andreas Schneider <asn@samba.org> | 2011-05-13 10:28:20 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2011-05-17 09:20:00 +0200 |
| commit | 39e13b27ca0bd71fae65c80d41891ecd0b74bb0a (patch) | |
| tree | dcc82ef5b4fd62ccb223a3679869fa9302fe8812 | |
| parent | 5ace375da5df261fbb5bcda432710c82bb5fafd1 (diff) | |
| download | samba-39e13b27ca0bd71fae65c80d41891ecd0b74bb0a.tar.gz samba-39e13b27ca0bd71fae65c80d41891ecd0b74bb0a.tar.xz samba-39e13b27ca0bd71fae65c80d41891ecd0b74bb0a.zip | |
s3-spoolss: Get the printer location from cups.
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit da1fa201040b2dab89fdc99663155a1c79ad4de9)
(cherry picked from commit 3006de14fb3b68d2be0bae65023e9ca8e4d11ff6)
| -rw-r--r-- | source3/rpc_server/spoolss/srv_spoolss_nt.c | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c index 98501bb89b7..79800725155 100644 --- a/source3/rpc_server/spoolss/srv_spoolss_nt.c +++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c @@ -52,6 +52,7 @@ #include "rpc_server/spoolss/srv_spoolss_nt.h" #include "util_tdb.h" #include "libsmb/libsmb.h" +#include "printing/printer_list.h" /* macros stolen from s4 spoolss server */ #define SPOOLSS_BUFFER_UNION(fn,info,level) \ @@ -2879,7 +2880,21 @@ static void spoolss_notify_location(struct messaging_context *msg_ctx, struct spoolss_PrinterInfo2 *pinfo2, TALLOC_CTX *mem_ctx) { - SETUP_SPOOLSS_NOTIFY_DATA_STRING(data, pinfo2->location); + const char *loc = pinfo2->location; + NTSTATUS status; + + status = printer_list_get_printer(mem_ctx, + pinfo2->sharename, + NULL, + &loc, + NULL); + if (NT_STATUS_IS_OK(status)) { + if (loc == NULL) { + loc = pinfo2->location; + } + } + + SETUP_SPOOLSS_NOTIFY_DATA_STRING(data, loc); } /******************************************************************* @@ -4011,8 +4026,24 @@ static WERROR construct_printer_info2(TALLOC_CTX *mem_ctx, } W_ERROR_HAVE_NO_MEMORY(r->comment); - r->location = talloc_strdup(mem_ctx, info2->location); + r->location = talloc_strdup(mem_ctx, info2->location); + if (info2->location[0] == '\0') { + const char *loc = NULL; + NTSTATUS nt_status; + + nt_status = printer_list_get_printer(mem_ctx, + info2->sharename, + NULL, + &loc, + NULL); + if (NT_STATUS_IS_OK(nt_status)) { + if (loc != NULL) { + r->location = talloc_strdup(mem_ctx, loc); + } + } + } W_ERROR_HAVE_NO_MEMORY(r->location); + r->sepfile = talloc_strdup(mem_ctx, info2->sepfile); W_ERROR_HAVE_NO_MEMORY(r->sepfile); r->printprocessor = talloc_strdup(mem_ctx, info2->printprocessor); |