more merge

3 files changed, 8 insertions, 70 deletions

diff --git a/source/Makefile.in b/source/Makefile.in
index e1e41eb3557..607558f7a84 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -273,12 +273,14 @@ SMBD_OBJ1 = smbd/server.o smbd/files.o smbd/connection.o \
 		smbd/uid.o smbd/dosmode.o smbd/filename.o smbd/open.o \
 		smbd/close.o smbd/blocking.o smbd/process.o smbd/oplock.o \
 		smbd/service.o smbd/error.o smbd/vfs.o smbd/vfs-wrap.o \
-		smbd/challenge.o  lib/util_pwdb.o smbd/afsticket.o
+		smbd/challenge.o  lib/util_pwdb.o smbd/afsticket.o \
+		printing/printfsp.o
 
-PRINTING_OBJ =  printing/pcap.o printing/print_svid.o printing/printing.o \
-		printing/lpq_parse.o printing/print_cups.o printing/load.o
 
-PRINTBACKEND_OBJ = printing/printing.o printing/lpq_parse.o printing/nt_printing.o
+PRINTING_OBJ =  printing/pcap.o printing/print_svid.o \
+		printing/print_cups.o printing/load.o
+
+PRINTBACKEND_OBJ = printing/printing.o printing/lpq_parse.o
 
 MSDFS_OBJ = msdfs/msdfs.o msdfs/msdfs_tdb.o msdfs/parse_dfs_map.o
 
@@ -395,6 +397,7 @@ LSARPCD_LIBS = $(SAMBA_LIBS)
 
 SPOOLSSD_OBJ = $(MSRPCD_OBJ) $(SPOOLSSD_OBJ1) \
 		$(PRINTING_OBJ) \
+		$(PRINTBACKEND_OBJ) \
            $(SIDDB_OBJ) \
            $(RPC_SRVUTIL_OBJ) \
            $(PROFILE_OBJ)
diff --git a/source/printing/printfsp.c b/source/printing/printfsp.c
index 72cd006e20c..9f40adbef76 100644
--- a/source/printing/printfsp.c
+++ b/source/printing/printfsp.c
@@ -53,7 +53,7 @@ files_struct *print_fsp_open(connection_struct *conn,char *jobname)
 	fsp->inode = sbuf.st_ino;
 	fsp->dev = sbuf.st_dev;
 	GetTimeOfDay(&fsp->open_time);
-	fsp->vuid = current_user.vuid;
+	fsp->vuid = current_user.key.vuid;
 	fsp->size = 0;
 	fsp->pos = -1;
 	fsp->open = True;
diff --git a/source/printing/printing.c b/source/printing/printing.c
index d760a59a323..6e9482ad4ec 100644
--- a/source/printing/printing.c
+++ b/source/printing/printing.c
@@ -852,68 +852,3 @@ BOOL print_queue_purge(int snum)
 }
 
 
-/***************************************************************************
-open a print file and setup a fsp for it. This is a wrapper around
-print_job_start().
-***************************************************************************/
-
-files_struct *print_fsp_open(connection_struct *conn,char *jobname)
-{
-	int jobid;
-	SMB_STRUCT_STAT sbuf;
-	extern struct current_user current_user;
-	files_struct *fsp = file_new();
-
-	if(!fsp)
-		return NULL;
-
-	jobid = print_job_start(SNUM(conn), jobname);
-	if (jobid == -1) {
-		file_free(fsp);
-		return NULL;
-	}
-
-	/* setup a full fsp */
-	fsp->print_jobid = jobid;
-	fsp->fd = print_job_fd(jobid);
-	conn->vfs_ops.fstat(fsp->fd, &sbuf);
-	fsp->mode = sbuf.st_mode;
-	fsp->inode = sbuf.st_ino;
-	fsp->dev = sbuf.st_dev;
-	GetTimeOfDay(&fsp->open_time);
-	fsp->vuid = current_user.key.vuid;
-	fsp->size = 0;
-	fsp->pos = -1;
-	fsp->open = True;
-	fsp->can_lock = True;
-	fsp->can_read = False;
-	fsp->can_write = True;
-	fsp->share_mode = 0;
-	fsp->print_file = True;
-	fsp->modified = False;
-	fsp->oplock_type = NO_OPLOCK;
-	fsp->sent_oplock_break = NO_BREAK_SENT;
-	fsp->is_directory = False;
-	fsp->stat_open = False;
-	fsp->directory_delete_on_close = False;
-	fsp->conn = conn;
-	string_set(&fsp->fsp_name,print_job_fname(jobid));
-	fsp->wbmpx_ptr = NULL;      
-	fsp->wcp = NULL; 
-
-	conn->num_files_open++;
-
-	return fsp;
-}
-
-/****************************************************************************
-print a file - called on closing the file
-****************************************************************************/
-void print_fsp_end(files_struct *fsp)
-{
-	print_job_end(fsp->print_jobid);
-
-	if (fsp->fsp_name) {
-		string_free(&fsp->fsp_name);
-	}
-}