[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-299-g4b57f6d

[Günther Deschner]

The branch, master has been updated
       via  4b57f6dd34d1ddbdc7b011de1ea7041ec8215dec (commit)
      from  2f579200fb439693540ada6e098959aa2d5f414e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4b57f6dd34d1ddbdc7b011de1ea7041ec8215dec
Author: Günther Deschner <gd at samba.org>
Date:   Thu Mar 12 11:00:21 2009 +0100

    s3-spoolss: make jobname a const char * in print_job_start().
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/include/proto.h             |    2 +-
 source3/printing/printing.c         |    2 +-
 source3/rpc_server/srv_spoolss_nt.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index a1cafb6..c8a066f 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4928,7 +4928,7 @@ bool print_job_resume(struct auth_serversupplied_info *server_info, int snum,
 ssize_t print_job_write(int snum, uint32 jobid, const char *buf, SMB_OFF_T pos, size_t size);
 int print_queue_length(int snum, print_status_struct *pstatus);
 uint32 print_job_start(struct auth_serversupplied_info *server_info, int snum,
-		       char *jobname, NT_DEVICEMODE *nt_devmode );
+		       const char *jobname, NT_DEVICEMODE *nt_devmode );
 void print_job_endpage(int snum, uint32 jobid);
 bool print_job_end(int snum, uint32 jobid, enum file_close_type close_type);
 int print_queue_status(int snum, 
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index fc3667e..71c6344 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -2407,7 +2407,7 @@ static bool add_to_jobs_changed(struct tdb_print_db *pdb, uint32 jobid)
 ***************************************************************************/
 
 uint32 print_job_start(struct auth_serversupplied_info *server_info, int snum,
-		       char *jobname, NT_DEVICEMODE *nt_devmode )
+		       const char *jobname, NT_DEVICEMODE *nt_devmode )
 {
 	uint32 jobid;
 	char *path;
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 0a4f5ae..727f3c9 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -5868,7 +5868,7 @@ WERROR _spoolss_StartDocPrinter(pipes_struct *p,
 	}
 
 	Printer->jobid = print_job_start(p->server_info, snum,
-					 CONST_DISCARD(char *,info_1->document_name),
+					 info_1->document_name,
 					 Printer->nt_devmode);
 
 	/* An error occured in print_job_start() so return an appropriate


-- 
Samba Shared Repository