mirror of
https://github.com/samba-team/samba.git
synced 2024-12-24 21:34:56 +03:00
a fairly big change in spoolss.
got rid of the forms, drivers and printers files in the nt drivers
directory and instead use a single tdb
note that this is _not_ all finished.
(This used to be commit 06763d1ec2
)
This commit is contained in:
parent
2962a4cc61
commit
a95efec534
@ -145,8 +145,7 @@ typedef struct nt_printer_driver_info_level_3
|
||||
fstring helpfile;
|
||||
fstring monitorname;
|
||||
fstring defaultdatatype;
|
||||
char **dependentfiles;
|
||||
|
||||
fstring *dependentfiles;
|
||||
} NT_PRINTER_DRIVER_INFO_LEVEL_3;
|
||||
|
||||
/* SPOOL_PRINTER_DRIVER_INFO_LEVEL_6 structure */
|
||||
@ -164,8 +163,8 @@ typedef struct {
|
||||
fstring oemurl;
|
||||
fstring hardwareid;
|
||||
fstring provider;
|
||||
char **dependentfiles;
|
||||
char **previousnames;
|
||||
fstring *dependentfiles;
|
||||
fstring *previousnames;
|
||||
} NT_PRINTER_DRIVER_INFO_LEVEL_6;
|
||||
|
||||
|
||||
@ -249,7 +248,7 @@ typedef struct nt_printer_info_level_2
|
||||
/* not used but ... and how ??? */
|
||||
uint32 changeid;
|
||||
uint32 c_setprinter;
|
||||
time_t setuptime;
|
||||
uint32 setuptime;
|
||||
} NT_PRINTER_INFO_LEVEL_2;
|
||||
|
||||
typedef struct nt_printer_info_level
|
||||
@ -259,7 +258,7 @@ typedef struct nt_printer_info_level
|
||||
|
||||
typedef struct
|
||||
{
|
||||
char name[100];
|
||||
fstring name;
|
||||
uint32 flag;
|
||||
uint32 width;
|
||||
uint32 length;
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -82,7 +82,7 @@ BOOL print_backend_init(void)
|
||||
}
|
||||
tdb_writeunlock(tdb);
|
||||
|
||||
return True;
|
||||
return nt_printing_init();
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
@ -463,6 +463,9 @@ static BOOL print_job_delete1(int jobid)
|
||||
print_run_command(snum,
|
||||
lp_lprmcommand(snum), NULL,
|
||||
"%j", jobstr,
|
||||
/*
|
||||
"%T", http_timestring(pjob->starttime),
|
||||
*/
|
||||
NULL, NULL);
|
||||
}
|
||||
|
||||
@ -701,6 +704,7 @@ BOOL print_job_end(int jobid)
|
||||
print_run_command(snum,
|
||||
lp_printcommand(snum), NULL,
|
||||
"%s", p,
|
||||
/* "%J", stripquote(pjob->jobname), */
|
||||
"%f", p);
|
||||
|
||||
chdir(wd);
|
||||
|
Loading…
Reference in New Issue
Block a user