4 files changed, 34 insertions, 4 deletions
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index 88f143c0c7..b5c7b0d4ec 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -852,7 +852,9 @@ static int cups_job_resume(int snum, struct printjob *pjob)
  * 'cups_job_submit()' - Submit a job for printing.
  */
 
-static int cups_job_submit(int snum, struct printjob *pjob)
+static int cups_job_submit(int snum, struct printjob *pjob,
+			   enum printing_types printing_type,
+			   char *lpq_cmd)
 {
 	TALLOC_CTX *frame = talloc_stackframe();
 	int		ret = 1;		/* Return value */
diff --git a/source3/printing/print_generic.c b/source3/printing/print_generic.c
index 14f4c6dbe7..3211705b8e 100644
--- a/source3/printing/print_generic.c
+++ b/source3/printing/print_generic.c
@@ -142,7 +142,9 @@ static int generic_job_resume(int snum, struct printjob *pjob)
  Submit a file for printing - called from print_job_end()
 ****************************************************************************/
 
-static int generic_job_submit(int snum, struct printjob *pjob)
+static int generic_job_submit(int snum, struct printjob *pjob,
+			      enum printing_types printing_type,
+			      char *lpq_cmd)
 {
 	int ret = -1;
 	char *current_directory = NULL;
diff --git a/source3/printing/print_iprint.c b/source3/printing/print_iprint.c
index 78d5098fdf..ea0c93778b 100644
--- a/source3/printing/print_iprint.c
+++ b/source3/printing/print_iprint.c
@@ -722,7 +722,9 @@ static int iprint_job_resume(int snum, struct printjob *pjob)
  * 'iprint_job_submit()' - Submit a job for printing.
  */
 
-static int iprint_job_submit(int snum, struct printjob *pjob)
+static int iprint_job_submit(int snum, struct printjob *pjob,
+			     enum printing_types printing_type,
+			     char *lpq_cmd)
 {
 	int		ret = 1;		/* Return value */
 	http_t		*http = NULL;		/* HTTP connection to server */
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 4d0178f185..1e0d61df32 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -2903,6 +2903,7 @@ NTSTATUS print_job_end(struct messaging_context *msg_ctx, int snum,
 	SMB_STRUCT_STAT sbuf;
 	struct printif *current_printif = get_printer_fns(snum);
 	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+	char *lpq_cmd;
 	TALLOC_CTX *tmp_ctx = talloc_new(msg_ctx);
 	if (tmp_ctx == NULL) {
 		return NT_STATUS_NO_MEMORY;
@@ -2970,8 +2971,31 @@ NTSTATUS print_job_end(struct messaging_context *msg_ctx, int snum,
 		return NT_STATUS_OK;
 	}
 
-	ret = (*(current_printif->job_submit))(snum, pjob);
+	/* don't strip out characters like '$' from the printername */
+	lpq_cmd = talloc_string_sub2(tmp_ctx,
+				     lp_lpqcommand(snum),
+				     "%p",
+				     lp_printername(snum),
+				     false, false, false);
+	if (lpq_cmd == NULL) {
+		status = NT_STATUS_PRINT_CANCELLED;
+		goto fail;
+	}
+	lpq_cmd = talloc_sub_advanced(tmp_ctx,
+				      lp_servicename(snum),
+				      current_user_info.unix_name,
+				      "",
+				      current_user.ut.gid,
+				      get_current_username(),
+				      current_user_info.domain,
+				      lpq_cmd);
+	if (lpq_cmd == NULL) {
+		status = NT_STATUS_PRINT_CANCELLED;
+		goto fail;
+	}
 
+	ret = (*(current_printif->job_submit))(snum, pjob,
+					       current_printif->type, lpq_cmd);
 	if (ret) {
 		status = NT_STATUS_PRINT_CANCELLED;
 		goto fail;