+#define OLD_NTDOMAIN 1
/*
* Unix SMB/Netbios implementation.
* Version 1.9.
#include "includes.h"
+#ifndef MANGLE_DRIVER_PATH
+#define MANGLE_DRIVER_PATH 0
+#endif
+
extern int DEBUGLEVEL;
extern pstring global_myname;
****************************************************************************/
static void clear_handle(POLICY_HND *hnd)
{
- memset(hnd->data, 0, POLICY_HND_SIZE);
+ ZERO_STRUCTP(hnd);
}
/****************************************************************************
static BOOL set_printer_hnd_printername(POLICY_HND *hnd, char *printername)
{
Printer_entry *Printer = find_printer_index_by_hnd(hnd);
- NT_PRINTER_INFO_LEVEL printer;
+ NT_PRINTER_INFO_LEVEL *printer = NULL;
int snum;
int n_services=lp_numservices();
char *aprinter;
continue;
DEBUG(10,("set_printer_hnd_printername: printername [%s], aprinter [%s]\n",
- printer.info_2->printername, aprinter ));
+ printer->info_2->printername, aprinter ));
- if ( strlen(printer.info_2->printername) != strlen(aprinter) ) {
- free_a_printer(printer, 2);
+ if ( strlen(printer->info_2->printername) != strlen(aprinter) ) {
+ free_a_printer(&printer, 2);
continue;
}
- if ( strncasecmp(printer.info_2->printername, aprinter, strlen(aprinter))) {
- free_a_printer(printer, 2);
+ if ( strncasecmp(printer->info_2->printername, aprinter, strlen(aprinter))) {
+ free_a_printer(&printer, 2);
continue;
}
continue;
DEBUG(10,("set_printer_hnd_printername: printername [%s], aprinter [%s]\n",
- printer.info_2->printername, aprinter ));
+ printer->info_2->printername, aprinter ));
if ( strlen(lp_servicename(snum)) != strlen(aprinter) ) {
- free_a_printer(printer, 2);
+ free_a_printer(&printer, 2);
continue;
}
if ( strncasecmp(lp_servicename(snum), aprinter, strlen(aprinter))) {
- free_a_printer(printer, 2);
+ free_a_printer(&printer, 2);
continue;
}
}
snum--;
- DEBUGADD(4,("Printer found: %s -> %s[%x]\n",printer.info_2->printername, lp_servicename(snum),snum));
+ DEBUGADD(4,("Printer found: %s -> %s[%x]\n",printer->info_2->printername, lp_servicename(snum),snum));
ZERO_STRUCT(Printer->dev.printername);
strncpy(Printer->dev.printername, lp_servicename(snum), strlen(lp_servicename(snum)));
- free_a_printer(printer, 2);
+ free_a_printer(&printer, 2);
+
return True;
}
uint32 extra_space;
uint32 old_offset;
- ps=&(buffer->prs);
+ ps= &buffer->prs;
/* damn, I'm doing the reverse operation of prs_grow() :) */
if (buffer_size < prs_data_size(ps))
{
switch (level) {
case 2:
- uni_2_asc_printer_info_2(uni->info_2, &(printer->info_2));
+ uni_2_asc_printer_info_2(uni->info_2, &printer->info_2);
break;
default:
break;
switch (level) {
case 3:
printer->info_3=NULL;
- uni_2_asc_printer_driver_3(uni->info_3, &(printer->info_3));
+ uni_2_asc_printer_driver_3(uni->info_3, &(printer->info_3));
+ break;
+ case 6:
+ printer->info_6=NULL;
+ uni_2_asc_printer_driver_6(uni->info_6, &(printer->info_6));
break;
default:
break;
return True;
}
-static BOOL convert_devicemode(DEVICEMODE devmode, NT_DEVICEMODE *nt_devmode)
-{
- unistr_to_ascii(nt_devmode->devicename, (char *)devmode.devicename.buffer, 31);
- unistr_to_ascii(nt_devmode->formname, (char *)devmode.formname.buffer, 31);
-
- nt_devmode->specversion=devmode.specversion;
- nt_devmode->driverversion=devmode.driverversion;
- nt_devmode->size=devmode.size;
- nt_devmode->driverextra=devmode.driverextra;
- nt_devmode->fields=devmode.fields;
- nt_devmode->orientation=devmode.orientation;
- nt_devmode->papersize=devmode.papersize;
- nt_devmode->paperlength=devmode.paperlength;
- nt_devmode->paperwidth=devmode.paperwidth;
- nt_devmode->scale=devmode.scale;
- nt_devmode->copies=devmode.copies;
- nt_devmode->defaultsource=devmode.defaultsource;
- nt_devmode->printquality=devmode.printquality;
- nt_devmode->color=devmode.color;
- nt_devmode->duplex=devmode.duplex;
- nt_devmode->yresolution=devmode.yresolution;
- nt_devmode->ttoption=devmode.ttoption;
- nt_devmode->collate=devmode.collate;
-
- nt_devmode->logpixels=devmode.logpixels;
- nt_devmode->bitsperpel=devmode.bitsperpel;
- nt_devmode->pelswidth=devmode.pelswidth;
- nt_devmode->pelsheight=devmode.pelsheight;
- nt_devmode->displayflags=devmode.displayflags;
- nt_devmode->displayfrequency=devmode.displayfrequency;
- nt_devmode->icmmethod=devmode.icmmethod;
- nt_devmode->icmintent=devmode.icmintent;
- nt_devmode->mediatype=devmode.mediatype;
- nt_devmode->dithertype=devmode.dithertype;
- nt_devmode->reserved1=devmode.reserved1;
- nt_devmode->reserved2=devmode.reserved2;
- nt_devmode->panningwidth=devmode.panningwidth;
- nt_devmode->panningheight=devmode.panningheight;
-
- if (nt_devmode->driverextra != 0)
- {
+static BOOL convert_devicemode(const DEVICEMODE *devmode, NT_DEVICEMODE *nt_devmode)
+{
+ unistr_to_dos(nt_devmode->devicename, (const char *)devmode->devicename.buffer, 31);
+ unistr_to_dos(nt_devmode->formname, (const char *)devmode->formname.buffer, 31);
+
+ nt_devmode->specversion=devmode->specversion;
+ nt_devmode->driverversion=devmode->driverversion;
+ nt_devmode->size=devmode->size;
+ nt_devmode->driverextra=devmode->driverextra;
+ nt_devmode->fields=devmode->fields;
+ nt_devmode->orientation=devmode->orientation;
+ nt_devmode->papersize=devmode->papersize;
+ nt_devmode->paperlength=devmode->paperlength;
+ nt_devmode->paperwidth=devmode->paperwidth;
+ nt_devmode->scale=devmode->scale;
+ nt_devmode->copies=devmode->copies;
+ nt_devmode->defaultsource=devmode->defaultsource;
+ nt_devmode->printquality=devmode->printquality;
+ nt_devmode->color=devmode->color;
+ nt_devmode->duplex=devmode->duplex;
+ nt_devmode->yresolution=devmode->yresolution;
+ nt_devmode->ttoption=devmode->ttoption;
+ nt_devmode->collate=devmode->collate;
+
+ nt_devmode->logpixels=devmode->logpixels;
+ nt_devmode->bitsperpel=devmode->bitsperpel;
+ nt_devmode->pelswidth=devmode->pelswidth;
+ nt_devmode->pelsheight=devmode->pelsheight;
+ nt_devmode->displayflags=devmode->displayflags;
+ nt_devmode->displayfrequency=devmode->displayfrequency;
+ nt_devmode->icmmethod=devmode->icmmethod;
+ nt_devmode->icmintent=devmode->icmintent;
+ nt_devmode->mediatype=devmode->mediatype;
+ nt_devmode->dithertype=devmode->dithertype;
+ nt_devmode->reserved1=devmode->reserved1;
+ nt_devmode->reserved2=devmode->reserved2;
+ nt_devmode->panningwidth=devmode->panningwidth;
+ nt_devmode->panningheight=devmode->panningheight;
+
+ if (nt_devmode->driverextra != 0) {
/* if we had a previous private delete it and make a new one */
- if (nt_devmode->private != NULL)
- free(nt_devmode->private);
+ safe_free(nt_devmode->private);
if((nt_devmode->private=(uint8 *)malloc(nt_devmode->driverextra * sizeof(uint8))) == NULL)
return False;
- memcpy(nt_devmode->private, devmode.private, nt_devmode->driverextra);
+ memcpy(nt_devmode->private, devmode->private, nt_devmode->driverextra);
}
return True;
DEBUG(8,("getprinterdata_printer_server:%s\n", value));
- if (!strcmp(value, "BeepEnabled"))
- {
+ if (!strcmp(value, "BeepEnabled")) {
*type = 0x4;
if((*data = (uint8 *)malloc( 4*sizeof(uint8) )) == NULL)
return False;
return True;
}
- if (!strcmp(value, "EventLog"))
- {
+ if (!strcmp(value, "EventLog")) {
*type = 0x4;
if((*data = (uint8 *)malloc( 4*sizeof(uint8) )) == NULL)
return False;
return True;
}
- if (!strcmp(value, "NetPopup"))
- {
+ if (!strcmp(value, "NetPopup")) {
*type = 0x4;
if((*data = (uint8 *)malloc( 4*sizeof(uint8) )) == NULL)
return False;
return True;
}
- if (!strcmp(value, "MajorVersion"))
- {
+ if (!strcmp(value, "MajorVersion")) {
*type = 0x4;
if((*data = (uint8 *)malloc( 4*sizeof(uint8) )) == NULL)
return False;
return True;
}
- if (!strcmp(value, "DefaultSpoolDirectory"))
- {
+ if (!strcmp(value, "DefaultSpoolDirectory")) {
pstring string="You are using a Samba server";
*type = 0x1;
*needed = 2*(strlen(string)+1);
memset(*data, 0, (*needed > in_size) ? *needed:in_size);
/* it's done by hand ready to go on the wire */
- for (i=0; i<strlen(string); i++)
- {
+ for (i=0; i<strlen(string); i++) {
(*data)[2*i]=string[i];
(*data)[2*i+1]='\0';
}
return True;
}
- if (!strcmp(value, "Architecture"))
- {
+ if (!strcmp(value, "Architecture")) {
pstring string="Windows NT x86";
*type = 0x1;
*needed = 2*(strlen(string)+1);
if((*data = (uint8 *)malloc( ((*needed > in_size) ? *needed:in_size) *sizeof(uint8))) == NULL)
return False;
memset(*data, 0, (*needed > in_size) ? *needed:in_size);
- for (i=0; i<strlen(string); i++)
- {
+ for (i=0; i<strlen(string); i++) {
(*data)[2*i]=string[i];
(*data)[2*i+1]='\0';
}
fstring value, uint32 *type,
uint8 **data, uint32 *needed, uint32 in_size )
{
- NT_PRINTER_INFO_LEVEL printer;
+ NT_PRINTER_INFO_LEVEL *printer = NULL;
int snum=0;
uint8 *idata=NULL;
uint32 len;
if(get_a_printer(&printer, 2, lp_servicename(snum)) != 0)
return False;
- if (!get_specific_param(printer, 2, value, &idata, type, &len)) {
- free_a_printer(printer, 2);
+ if (!get_specific_param(*printer, 2, value, &idata, type, &len)) {
+ free_a_printer(&printer, 2);
return False;
}
+ free_a_printer(&printer, 2);
+
DEBUG(5,("getprinterdata_printer:allocating %d\n", in_size));
- if((*data = (uint8 *)malloc( in_size *sizeof(uint8) )) == NULL) {
- free_a_printer(printer, 2);
- return False;
- }
+ if (in_size) {
+ if((*data = (uint8 *)malloc( in_size *sizeof(uint8) )) == NULL) {
+ return False;
+ }
- memset(*data, 0, in_size *sizeof(uint8));
- /* copy the min(in_size, len) */
- memcpy(*data, idata, (len>in_size)?in_size:len *sizeof(uint8));
+ memset(*data, 0, in_size *sizeof(uint8));
+ /* copy the min(in_size, len) */
+ memcpy(*data, idata, (len>in_size)?in_size:len *sizeof(uint8));
+ } else {
+ *data = NULL;
+ }
*needed = len;
DEBUG(5,("getprinterdata_printer:copy done\n"));
- free_a_printer(printer, 2);
safe_free(idata);
return True;
if (found==False) {
DEBUG(5, ("value not found, allocating %d\n", *out_size));
/* reply this param doesn't exist */
- if((*data=(uint8 *)malloc(*out_size*sizeof(uint8))) == NULL)
- return ERROR_NOT_ENOUGH_MEMORY;
- memset(*data, 0x0, *out_size*sizeof(uint8));
+ if (*out_size) {
+ if((*data=(uint8 *)malloc(*out_size*sizeof(uint8))) == NULL)
+ return ERROR_NOT_ENOUGH_MEMORY;
+ memset(*data, '\0', *out_size*sizeof(uint8));
+ } else {
+ *data = NULL;
+ }
+
return ERROR_INVALID_PARAMETER;
}
/*******************************************************************
* fill a notify_info_data with the servername
********************************************************************/
-static void spoolss_notify_server_name(int snum, SPOOL_NOTIFY_INFO_DATA *data, print_queue_struct *queue, NT_PRINTER_INFO_LEVEL *printer)
+static void spoolss_notify_server_name(int snum, SPOOL_NOTIFY_INFO_DATA *data, print_queue_struct *queue,
+ NT_PRINTER_INFO_LEVEL *printer)
{
pstring temp_name;
- snprintf(temp_name, sizeof(temp_name), "\\\\%s", global_myname);
+ snprintf(temp_name, sizeof(temp_name)-1, "\\\\%s", global_myname);
data->notify_data.data.length=strlen(temp_name);
ascii_to_unistr((char *)data->notify_data.data.string, temp_name, sizeof(data->notify_data.data.string)-1);
* fill a notify_info_data with the servicename
* jfmxxxx: it's incorrect should be long_printername
********************************************************************/
-static void spoolss_notify_printer_name(int snum, SPOOL_NOTIFY_INFO_DATA *data, print_queue_struct *queue, NT_PRINTER_INFO_LEVEL *printer)
+static void spoolss_notify_printer_name(int snum, SPOOL_NOTIFY_INFO_DATA *data, print_queue_struct *queue,
+ NT_PRINTER_INFO_LEVEL *printer)
{
/*
data->notify_data.data.length=strlen(lp_servicename(snum));
#define END 65535
+struct s_notify_info_data_table
+{
+ uint16 type;
+ uint16 field;
+ char *name;
+ uint32 size;
+ void (*fn) (int snum, SPOOL_NOTIFY_INFO_DATA *data,
+ print_queue_struct *queue,
+ NT_PRINTER_INFO_LEVEL *printer);
+};
+
struct s_notify_info_data_table notify_info_data_table[] =
{
{ PRINTER_NOTIFY_TYPE, PRINTER_NOTIFY_SERVER_NAME, "PRINTER_NOTIFY_SERVER_NAME", POINTER, spoolss_notify_server_name },
uint16 field;
SPOOL_NOTIFY_INFO_DATA *current_data;
- NT_PRINTER_INFO_LEVEL printer;
+ NT_PRINTER_INFO_LEVEL *printer = NULL;
print_queue_struct *queue=NULL;
DEBUG(4,("construct_notify_printer_info\n"));
option_type->count, lp_servicename(snum)));
if (get_a_printer(&printer, 2, lp_servicename(snum))!=0)
- {
return False;
- }
for(field_num=0; field_num<option_type->count; field_num++)
{
continue;
if((info->data=Realloc(info->data, (info->count+1)*sizeof(SPOOL_NOTIFY_INFO_DATA))) == NULL) {
- free_a_printer(printer, 2);
return False;
}
current_data=&(info->data[info->count]);
construct_info_data(current_data, type, field, id);
- notify_info_data_table[j].fn(snum, current_data, queue, &printer);
+ notify_info_data_table[j].fn(snum, current_data, queue, printer);
info->count++;
}
- free_a_printer(printer, 2);
+ free_a_printer(&printer, 2);
return True;
}
uint16 field;
SPOOL_NOTIFY_INFO_DATA *current_data;
- NT_PRINTER_INFO_LEVEL printer;
+ NT_PRINTER_INFO_LEVEL *printer = NULL;
DEBUG(4,("construct_notify_jobs_info\n"));
option_type->count));
if (get_a_printer(&printer, 2, lp_servicename(snum))!=0)
- {
return False;
- }
- for(field_num=0; field_num<option_type->count; field_num++)
- {
+ for(field_num=0; field_num<option_type->count; field_num++) {
field = option_type->fields[field_num];
if (!search_notify(type, field, &j) )
continue;
if((info->data=Realloc(info->data, (info->count+1)*sizeof(SPOOL_NOTIFY_INFO_DATA))) == NULL) {
- free_a_printer(printer, 2);
return False;
}
current_data=&(info->data[info->count]);
construct_info_data(current_data, type, field, id);
- notify_info_data_table[j].fn(snum, current_data, queue, &printer);
+ notify_info_data_table[j].fn(snum, current_data, queue, printer);
info->count++;
}
-
- free_a_printer(printer, 2);
-
+
+ free_a_printer(&printer, 2);
return True;
}
{
pstring chaine;
int count;
- NT_PRINTER_INFO_LEVEL ntprinter;
+ NT_PRINTER_INFO_LEVEL *ntprinter = NULL;
counter_printer_0 *session_counter;
uint32 global_counter;
struct tm *t;
+ time_t setup_time = time(NULL);
print_queue_struct *queue=NULL;
print_status_struct status;
/* it's the first time, add it to the list */
if (session_counter==NULL) {
- if((session_counter=(counter_printer_0 *)malloc(sizeof(counter_printer_0))) == NULL)
+ if((session_counter=(counter_printer_0 *)malloc(sizeof(counter_printer_0))) == NULL) {
+ free_a_printer(&ntprinter, 2);
return False;
+ }
ZERO_STRUCTP(session_counter);
session_counter->snum=snum;
session_counter->counter=0;
global_counter=session_counter->counter;
/* the description and the name are of the form \\server\share */
- slprintf(chaine,sizeof(chaine)-1,"\\\\%s\\%s",servername, ntprinter.info_2->printername);
+ slprintf(chaine,sizeof(chaine)-1,"\\\\%s\\%s",servername, ntprinter->info_2->printername);
init_unistr(&(printer->printername), chaine);
printer->total_jobs = 0;
printer->total_bytes = 0;
- t=gmtime(&ntprinter.info_2->setuptime);
+ t=gmtime(&setup_time);
+ ntprinter->info_2->setuptime = (uint32)setup_time; /* FIXME !! */
printer->year = t->tm_year+1900;
printer->month = t->tm_mon+1;
printer->unknown14 = 0x1;
printer->unknown15 = 0x024a; /* 586 Pentium ? */
printer->unknown16 = 0x0;
- printer->change_id = ntprinter.info_2->changeid; /* ChangeID in milliseconds*/
+ printer->change_id = ntprinter->info_2->changeid; /* ChangeID in milliseconds*/
printer->unknown18 = 0x0;
printer->status = nt_printq_status(status.status);
printer->unknown20 = 0x0;
- printer->c_setprinter = ntprinter.info_2->c_setprinter; /* how many times setprinter has been called */
+ printer->c_setprinter = ntprinter->info_2->c_setprinter; /* how many times setprinter has been called */
printer->unknown22 = 0x0;
printer->unknown23 = 0x6; /* 6 ???*/
printer->unknown24 = 0; /* unknown 24 to 26 are always 0 */
printer->unknown29 = 0;
safe_free(queue);
-
- free_a_printer(ntprinter, 2);
+ free_a_printer(&ntprinter,2);
return (True);
}
{
pstring chaine;
pstring chaine2;
- NT_PRINTER_INFO_LEVEL ntprinter;
+ NT_PRINTER_INFO_LEVEL *ntprinter = NULL;
if (get_a_printer(&ntprinter, 2, lp_servicename(snum)) != 0)
return False;
printer->flags=flags;
- snprintf(chaine,sizeof(chaine)-1,"%s%s,%s,%s",server, ntprinter.info_2->printername,
- ntprinter.info_2->drivername, lp_comment(snum));
+ snprintf(chaine,sizeof(chaine)-1,"%s%s,%s,%s",server, ntprinter->info_2->printername,
+ ntprinter->info_2->drivername, lp_comment(snum));
- snprintf(chaine2,sizeof(chaine)-1,"%s%s", server, ntprinter.info_2->printername);
+ snprintf(chaine2,sizeof(chaine)-1,"%s%s", server, ntprinter->info_2->printername);
init_unistr(&printer->description, chaine);
init_unistr(&printer->name, chaine2);
init_unistr(&printer->comment, lp_comment(snum));
- free_a_printer(ntprinter, 2);
+ free_a_printer(&ntprinter,2);
return True;
}
/****************************************************************************
+ Free a DEVMODE struct.
+****************************************************************************/
+
+static void free_dev_mode(DEVICEMODE *dev)
+{
+ if (dev == NULL)
+ return;
+
+ if (dev->private)
+ safe_free(dev->private);
+
+ safe_free(dev);
+}
+
+/****************************************************************************
+ Create a DEVMODE struct. Returns malloced memory.
****************************************************************************/
-static BOOL construct_dev_mode(DEVICEMODE *devmode, int snum, char *servername)
+
+static DEVICEMODE *construct_dev_mode(int snum, char *servername)
{
char adevice[32];
char aform[32];
- NT_PRINTER_INFO_LEVEL printer;
- NT_DEVICEMODE *ntdevmode;
+ NT_PRINTER_INFO_LEVEL *printer = NULL;
+ NT_DEVICEMODE *ntdevmode = NULL;
+ DEVICEMODE *devmode = NULL;
DEBUG(7,("construct_dev_mode\n"));
- memset(&(devmode->devicename), 0, 2*sizeof(adevice));
- memset(&(devmode->formname), 0, 2*sizeof(aform));
-
DEBUGADD(8,("getting printer characteristics\n"));
- get_a_printer(&printer, 2, lp_servicename(snum));
- ntdevmode=(printer.info_2)->devmode;
+ if ((devmode = (DEVICEMODE *)malloc(sizeof(DEVICEMODE))) == NULL) {
+ DEBUG(0,("construct_dev_mode: malloc fail.\n"));
+ return NULL;
+ }
+
+ ZERO_STRUCTP(devmode);
+
+ if(get_a_printer(&printer, 2, lp_servicename(snum)) != 0)
+ goto fail;
+
+ if (printer->info_2->devmode)
+ ntdevmode = dup_nt_devicemode(printer->info_2->devmode);
+ else
+ ntdevmode = construct_nt_devicemode();
+
+ if (ntdevmode == NULL)
+ goto fail;
DEBUGADD(8,("loading DEVICEMODE\n"));
snprintf(adevice, sizeof(adevice), "\\\\%s\\%s", global_myname,
- printer.info_2->printername);
- init_unistr(&(devmode->devicename), adevice);
+ printer->info_2->printername);
+ init_unistr(&devmode->devicename, adevice);
snprintf(aform, sizeof(aform), ntdevmode->formname);
- init_unistr(&(devmode->formname), aform);
+ init_unistr(&devmode->formname, aform);
devmode->specversion = ntdevmode->specversion;
devmode->driverversion = ntdevmode->driverversion;
devmode->mediatype = ntdevmode->mediatype;
devmode->dithertype = ntdevmode->dithertype;
- if (ntdevmode->private != NULL)
- {
- if((devmode->private=(uint8 *)malloc(devmode->driverextra*sizeof(uint8))) == NULL) {
- free_a_printer(printer, 2);
- return False;
- }
- memcpy(devmode->private, ntdevmode->private, devmode->driverextra);
+ if (ntdevmode->private != NULL) {
+ if ((devmode->private=(uint8 *)memdup(ntdevmode->private, ntdevmode->driverextra)) == NULL)
+ goto fail;
}
- free_a_printer(printer, 2);
+ free_nt_devicemode(&ntdevmode);
+ free_a_printer(&printer,2);
- return True;
+ return devmode;
+
+ fail:
+
+ if (ntdevmode)
+ free_nt_devicemode(&ntdevmode);
+ if (printer)
+ free_a_printer(&printer,2);
+ free_dev_mode(devmode);
+
+ return NULL;
}
/********************************************************************
* construct_printer_info_2
* fill a printer_info_2 struct
********************************************************************/
+
static BOOL construct_printer_info_2(fstring servername, PRINTER_INFO_2 *printer, int snum)
{
pstring chaine;
pstring chaine2;
pstring sl;
int count;
- DEVICEMODE *devmode;
- NT_PRINTER_INFO_LEVEL ntprinter;
+ NT_PRINTER_INFO_LEVEL *ntprinter = NULL;
print_queue_struct *queue=NULL;
print_status_struct status;
else
fstrcpy(sl, '\0');
- snprintf(chaine2, sizeof(chaine)-1, "%s%s%s", servername, sl, ntprinter.info_2->printername);
+ snprintf(chaine2, sizeof(chaine)-1, "%s%s%s", servername, sl, ntprinter->info_2->printername);
init_unistr(&printer->servername, chaine); /* servername*/
init_unistr(&printer->printername, chaine2); /* printername*/
init_unistr(&printer->sharename, lp_servicename(snum)); /* sharename */
init_unistr(&printer->portname, lp_servicename(snum)); /* port */
- init_unistr(&printer->drivername, ntprinter.info_2->drivername); /* drivername */
+ init_unistr(&printer->drivername, ntprinter->info_2->drivername); /* drivername */
init_unistr(&printer->comment, lp_comment(snum)); /* comment */
- init_unistr(&printer->location, ntprinter.info_2->location); /* location */
- init_unistr(&printer->sepfile, ntprinter.info_2->sepfile); /* separator file */
- init_unistr(&printer->printprocessor, ntprinter.info_2->printprocessor);/* print processor */
- init_unistr(&printer->datatype, ntprinter.info_2->datatype); /* datatype */
- init_unistr(&printer->parameters, ntprinter.info_2->parameters); /* parameters (of print processor) */
-
- printer->attributes = PRINTER_ATTRIBUTE_SHARED \
- | PRINTER_ATTRIBUTE_LOCAL \
- | PRINTER_ATTRIBUTE_RAW_ONLY ; /* attributes */
-
- printer->priority = ntprinter.info_2->priority; /* priority */
- printer->defaultpriority = ntprinter.info_2->default_priority; /* default priority */
- printer->starttime = ntprinter.info_2->starttime; /* starttime */
- printer->untiltime = ntprinter.info_2->untiltime; /* untiltime */
+ init_unistr(&printer->location, ntprinter->info_2->location); /* location */
+ init_unistr(&printer->sepfile, ntprinter->info_2->sepfile); /* separator file */
+ init_unistr(&printer->printprocessor, ntprinter->info_2->printprocessor);/* print processor */
+ init_unistr(&printer->datatype, ntprinter->info_2->datatype); /* datatype */
+ init_unistr(&printer->parameters, ntprinter->info_2->parameters); /* parameters (of print processor) */
+
+ printer->attributes = ntprinter->info_2->attributes;
+
+ printer->priority = ntprinter->info_2->priority; /* priority */
+ printer->defaultpriority = ntprinter->info_2->default_priority; /* default priority */
+ printer->starttime = ntprinter->info_2->starttime; /* starttime */
+ printer->untiltime = ntprinter->info_2->untiltime; /* untiltime */
printer->status = nt_printq_status(status.status); /* status */
printer->cjobs = count; /* jobs */
- printer->averageppm = ntprinter.info_2->averageppm; /* average pages per minute */
+ printer->averageppm = ntprinter->info_2->averageppm; /* average pages per minute */
- if((devmode=(DEVICEMODE *)malloc(sizeof(DEVICEMODE))) == NULL)
+ if((printer->devmode = construct_dev_mode(snum, servername)) == NULL)
goto err;
- ZERO_STRUCTP(devmode);
-
- if(!construct_dev_mode(devmode, snum, servername))
- goto err;
+ if (ntprinter->info_2->secdesc_buf->len != 0) {
+ /* steal the printer info sec_desc structure. [badly done]. */
+ printer->secdesc = ntprinter->info_2->secdesc_buf->sec;
+ ntprinter->info_2->secdesc_buf->sec = NULL; /* Stolen memory. */
+ ntprinter->info_2->secdesc_buf->len = 0; /* Stolen memory. */
+ ntprinter->info_2->secdesc_buf->max_len = 0; /* Stolen memory. */
+ }
+ else {
+ printer->secdesc = NULL;
+ }
- printer->devmode=devmode;
-
+ free_a_printer(&ntprinter, 2);
safe_free(queue);
- free_a_printer(ntprinter, 2);
return True;
err:
+ if (ntprinter)
+ free_a_printer(&ntprinter, 2);
safe_free(queue);
- free_a_printer(ntprinter, 2);
return False;
}
+/********************************************************************
+ * construct_printer_info_3
+ * fill a printer_info_3 struct
+ ********************************************************************/
+static BOOL construct_printer_info_3(fstring servername,
+ PRINTER_INFO_3 **pp_printer, int snum)
+{
+ NT_PRINTER_INFO_LEVEL *ntprinter = NULL;
+ PRINTER_INFO_3 *printer = NULL;
+
+ if (get_a_printer(&ntprinter, 2, lp_servicename(snum)) !=0 )
+ return False;
+
+ *pp_printer = NULL;
+ if ((printer = (PRINTER_INFO_3 *)malloc(sizeof(PRINTER_INFO_3))) == NULL) {
+ DEBUG(0,("construct_printer_info_3: malloc fail.\n"));
+ return False;
+ }
+
+ ZERO_STRUCTP(printer);
+
+ printer->flags = 4; /* This is the offset to the SEC_DESC. */
+ if (ntprinter->info_2->secdesc_buf->len != 0) {
+ /* steal the printer info sec_desc structure. [badly done]. */
+ printer->secdesc = ntprinter->info_2->secdesc_buf->sec;
+ ntprinter->info_2->secdesc_buf->sec = NULL; /* Stolen the malloced memory. */
+ ntprinter->info_2->secdesc_buf->len = 0; /* Stolen the malloced memory. */
+ ntprinter->info_2->secdesc_buf->max_len = 0; /* Stolen the malloced memory. */
+ }
+
+ free_a_printer(&ntprinter, 2);
+
+ *pp_printer = printer;
+ return True;
+}
+
/********************************************************************
Spoolss_enumprinters.
********************************************************************/
/* check the required size. */
for (i=0; i<*returned; i++)
- (*needed) += spoolss_size_printer_info_2(&(printers[i]));
+ (*needed) += spoolss_size_printer_info_2(&printers[i]);
if (!alloc_buffer_size(buffer, *needed)) {
for (i=0; i<*returned; i++) {
- safe_free(printers[i].devmode->private);
- safe_free(printers[i].devmode);
+ free_devmode(printers[i].devmode);
+ free_sec_desc(&printers[i].secdesc);
}
safe_free(printers);
return ERROR_INSUFFICIENT_BUFFER;
/* clear memory */
for (i=0; i<*returned; i++) {
- safe_free(printers[i].devmode->private);
- safe_free(printers[i].devmode);
+ free_devmode(printers[i].devmode);
+ free_sec_desc(&printers[i].secdesc);
}
safe_free(printers);
*needed += spoolss_size_printer_info_2(printer);
if (!alloc_buffer_size(buffer, *needed)) {
- safe_free(printer);
+ free_printer_info_2(printer);
return ERROR_INSUFFICIENT_BUFFER;
}
/* fill the buffer with the structures */
- new_smb_io_printer_info_2("", buffer, printer, 0);
+ if (!new_smb_io_printer_info_2("", buffer, printer, 0)) {
+ free_printer_info_2(printer);
+ return ERROR_NOT_ENOUGH_MEMORY;
+ }
/* clear memory */
- safe_free(printer->devmode->private);
- safe_free(printer->devmode);
- safe_free(printer);
+ free_printer_info_2(printer);
if (*needed > offered) {
return ERROR_INSUFFICIENT_BUFFER;
return NT_STATUS_NO_PROBLEMO;
}
+/****************************************************************************
+****************************************************************************/
+static uint32 getprinter_level_3(fstring servername, int snum, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
+{
+ PRINTER_INFO_3 *printer=NULL;
+ fstring temp;
+
+ fstrcpy(temp, "\\\\");
+ fstrcat(temp, servername);
+ if (!construct_printer_info_3(temp, &printer, snum))
+ return ERROR_NOT_ENOUGH_MEMORY;
+
+ /* check the required size. */
+ *needed += spoolss_size_printer_info_3(printer);
+
+ if (!alloc_buffer_size(buffer, *needed)) {
+ free_printer_info_3(printer);
+ return ERROR_INSUFFICIENT_BUFFER;
+ }
+
+ /* fill the buffer with the structures */
+ new_smb_io_printer_info_3("", buffer, printer, 0);
+
+ /* clear memory */
+ free_printer_info_3(printer);
+
+ if (*needed > offered) {
+ return ERROR_INSUFFICIENT_BUFFER;
+ }
+ else
+ return NT_STATUS_NO_PROBLEMO;
+}
+
/****************************************************************************
****************************************************************************/
uint32 _spoolss_getprinter(POLICY_HND *handle, uint32 level,
switch (level) {
case 0:
return getprinter_level_0(servername, snum, buffer, offered, needed);
- break;
case 1:
return getprinter_level_1(servername,snum, buffer, offered, needed);
- break;
case 2:
return getprinter_level_2(servername,snum, buffer, offered, needed);
- break;
+ case 3:
+ return getprinter_level_3(servername,snum, buffer, offered, needed);
default:
return ERROR_INVALID_LEVEL;
break;
static void construct_printer_driver_info_1(DRIVER_INFO_1 *info, int snum,
fstring servername, fstring architecture)
{
- NT_PRINTER_INFO_LEVEL printer;
+ NT_PRINTER_INFO_LEVEL *printer = NULL;
NT_PRINTER_DRIVER_INFO_LEVEL driver;
+ ZERO_STRUCT(driver);
+
get_a_printer(&printer, 2, lp_servicename(snum) );
- get_a_printer_driver(&driver, 3, printer.info_2->drivername, architecture);
+ get_a_printer_driver(&driver, 3, printer->info_2->drivername, architecture);
fill_printer_driver_info_1(info, driver, servername, architecture);
-
- free_a_printer_driver(driver, 3);
- free_a_printer(printer, 2);
+
+ free_a_printer(&printer,2);
}
/********************************************************************
get_short_archi(short_archi,architecture);
- snprintf(where,sizeof(where)-1,"\\\\%s\\print$\\%s\\", servername, short_archi);
+ snprintf(where,sizeof(where)-1,"\\\\%s\\print$\\%s\\%s\\", servername, short_archi, driver.info_3->name);
info->version=driver.info_3->cversion;
********************************************************************/
static void construct_printer_driver_info_2(DRIVER_INFO_2 *info, int snum, fstring servername, fstring architecture)
{
- NT_PRINTER_INFO_LEVEL printer;
+ NT_PRINTER_INFO_LEVEL *printer = NULL;
NT_PRINTER_DRIVER_INFO_LEVEL driver;
-
+
+ ZERO_STRUCT(printer);
+ ZERO_STRUCT(driver);
+
get_a_printer(&printer, 2, lp_servicename(snum) );
- get_a_printer_driver(&driver, 3, printer.info_2->drivername, architecture);
+ get_a_printer_driver(&driver, 3, printer->info_2->drivername, architecture);
fill_printer_driver_info_2(info, driver, servername, architecture);
- free_a_printer_driver(driver, 3);
- free_a_printer(printer, 2);
+ free_a_printer(&printer,2);
}
/********************************************************************
*
* convert an array of ascii string to a UNICODE string
********************************************************************/
-static void init_unistr_array(uint16 **uni_array, char **char_array, char *where)
+static void init_unistr_array(uint16 **uni_array, fstring *char_array, char *where)
{
int i=0;
int j=0;
DEBUG(6,("init_unistr_array\n"));
*uni_array=NULL;
- for (v=char_array[i]; *v!='\0'; v=char_array[i]) {
+ while (1) {
+ if (char_array == NULL)
+ v = "";
+ else {
+ v = char_array[i];
+ if (!v) v = ""; /* hack to handle null lists */
+ }
snprintf(line, sizeof(line)-1, "%s%s", where, v);
DEBUGADD(6,("%d:%s:%d\n", i, line, strlen(line)));
if((*uni_array=Realloc(*uni_array, (j+strlen(line)+2)*sizeof(uint16))) == NULL) {
ascii_to_unistr((char *)(*uni_array+j), line , 2*strlen(line));
j+=strlen(line)+1;
i++;
+ if (strlen(v) == 0) break;
}
- (*uni_array)[j]=0x0000;
+ if (*uni_array) {
+ (*uni_array)[j]=0x0000;
+ }
DEBUGADD(6,("last one:done\n"));
}
get_short_archi(short_archi, architecture);
- snprintf(where,sizeof(where)-1,"\\\\%s\\print$\\%s\\", servername, short_archi);
-
+ snprintf(where,sizeof(where)-1,"\\\\%s\\print$\\%s\\%s\\", servername, short_archi, driver.info_3->name);
+
info->version=driver.info_3->cversion;
init_unistr( &(info->name), driver.info_3->name );
init_unistr( &(info->defaultdatatype), driver.info_3->defaultdatatype );
info->dependentfiles=NULL;
- init_unistr_array(&(info->dependentfiles), driver.info_3->dependentfiles, where);
+ init_unistr_array(&info->dependentfiles, driver.info_3->dependentfiles, where);
}
/********************************************************************
static void construct_printer_driver_info_3(DRIVER_INFO_3 *info, int snum,
fstring servername, fstring architecture)
{
- NT_PRINTER_INFO_LEVEL printer;
+ NT_PRINTER_INFO_LEVEL *printer = NULL;
NT_PRINTER_DRIVER_INFO_LEVEL driver;
-
+
+ ZERO_STRUCT(driver);
+
get_a_printer(&printer, 2, lp_servicename(snum) );
- get_a_printer_driver(&driver, 3, printer.info_2->drivername, architecture);
+ get_a_printer_driver(&driver, 3, printer->info_2->drivername, architecture);
fill_printer_driver_info_3(info, driver, servername, architecture);
- free_a_printer_driver(driver, 3);
- free_a_printer(printer, 2);
+ free_a_printer(&printer,2);
+}
+
+/****************************************************************************
+****************************************************************************/
+
+static void free_printer_driver_info_3(DRIVER_INFO_3 *info)
+{
+ safe_free(info->dependentfiles);
}
/****************************************************************************
****************************************************************************/
static uint32 getprinterdriver2_level3(fstring servername, fstring architecture, int snum, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
{
- DRIVER_INFO_3 *info=NULL;
-
- if((info=(DRIVER_INFO_3 *)malloc(sizeof(DRIVER_INFO_3)))==NULL)
- return ERROR_NOT_ENOUGH_MEMORY;
-
- construct_printer_driver_info_3(info, snum, servername, architecture);
+ DRIVER_INFO_3 info;
+
+ ZERO_STRUCT(info);
+
+ construct_printer_driver_info_3(&info, snum, servername, architecture);
/* check the required size. */
- *needed += spoolss_size_printer_driver_info_3(info);
+ *needed += spoolss_size_printer_driver_info_3(&info);
if (!alloc_buffer_size(buffer, *needed)) {
- safe_free(info);
+ free_printer_driver_info_3(&info);
return ERROR_INSUFFICIENT_BUFFER;
}
/* fill the buffer with the structures */
- new_smb_io_printer_driver_info_3("", buffer, info, 0);
+ new_smb_io_printer_driver_info_3("", buffer, &info, 0);
- /* clear memory */
- safe_free(info->dependentfiles);
- safe_free(info);
+ free_printer_driver_info_3(&info);
if (*needed > offered)
return ERROR_INSUFFICIENT_BUFFER;
* called by spoolss_api_setprinter
* when updating a printer description
********************************************************************/
+static uint32 update_printer_sec(const POLICY_HND *handle, uint32 level,
+ const SPOOL_PRINTER_INFO_LEVEL *info,
+ SEC_DESC_BUF *secdesc_ctr)
+{
+ Printer_entry *Printer = find_printer_index_by_hnd(handle);
+
+ if (!OPEN_HANDLE(Printer))
+ return ERROR_INVALID_HANDLE;
+
+ return nt_printing_setsec(Printer->dev.printername, secdesc_ctr);
+}
+
+/********************************************************************
+ * called by spoolss_api_setprinter
+ * when updating a printer description
+ ********************************************************************/
+
static uint32 update_printer(const POLICY_HND *handle, uint32 level,
const SPOOL_PRINTER_INFO_LEVEL *info,
- const DEVICEMODE *devmode)
+ DEVICEMODE *devmode)
{
int snum;
- NT_PRINTER_INFO_LEVEL printer;
- NT_DEVICEMODE *nt_devmode;
+ NT_PRINTER_INFO_LEVEL *printer = NULL;
Printer_entry *Printer = find_printer_index_by_hnd(handle);
-
- nt_devmode=NULL;
DEBUG(8,("update_printer\n"));
if (level!=2) {
- DEBUG(0,("Send a mail to jfm@samba.org\n"));
+ DEBUG(0,("Send a mail to samba@samba.org\n"));
DEBUGADD(0,("with the following message: update_printer: level!=2\n"));
return ERROR_INVALID_LEVEL;
}
get_a_printer(&printer, 2, lp_servicename(snum));
DEBUGADD(8,("Converting info_2 struct\n"));
- convert_printer_info(info, &printer, level);
+ convert_printer_info(info, printer, level);
- if ((info->info_2)->devmode_ptr != 0) {
+ if (info->info_2->devmode_ptr != 0) {
+ NT_DEVICEMODE *ntdevmode = NULL;
/* we have a valid devmode
convert it and link it*/
- /* the nt_devmode memory is already alloced
- * while doing the get_a_printer call
- * but the devmode private part is not
- * it's done by convert_devicemode
- */
DEBUGADD(8,("Converting the devicemode struct\n"));
- nt_devmode=printer.info_2->devmode;
-
- init_devicemode(nt_devmode);
+ if (printer->info_2->devmode) {
+ ntdevmode = dup_nt_devicemode(printer->info_2->devmode);
+ } else {
+ ntdevmode = construct_nt_devicemode();
+ }
- convert_devicemode(*devmode, nt_devmode);
- }
- else {
- if (printer.info_2->devmode != NULL)
- free(printer.info_2->devmode);
- printer.info_2->devmode=NULL;
+ convert_devicemode(devmode, ntdevmode);
+ free_nt_devicemode(&ntdevmode);
+ } else {
+ if (printer->info_2->devmode != NULL)
+ free_nt_devicemode(&printer->info_2->devmode);
+ printer->info_2->devmode=NULL;
}
- if (add_a_printer(printer, 2)!=0) {
- free_a_printer(printer, 2);
-
+ if (add_a_printer(*printer, 2)!=0) {
/* I don't really know what to return here !!! */
+ free_a_printer(&printer, 2);
return ERROR_ACCESS_DENIED;
}
- free_a_printer(printer, 2);
+ free_a_printer(&printer, 2);
return NT_STATUS_NO_PROBLEMO;
}
****************************************************************************/
uint32 _spoolss_setprinter(const POLICY_HND *handle, uint32 level,
const SPOOL_PRINTER_INFO_LEVEL *info,
- const DEVMODE_CTR devmode_ctr,
+ DEVMODE_CTR devmode_ctr,
+ SEC_DESC_BUF *secdesc_ctr,
uint32 command)
{
Printer_entry *Printer = find_printer_index_by_hnd(handle);
case 2:
return update_printer(handle, level, info, devmode_ctr.devmode);
break;
+ case 3:
+ return update_printer_sec(handle, level, info, secdesc_ctr);
+ break;
default:
return ERROR_INVALID_LEVEL;
break;
Printer->notify.options=0;
Printer->notify.localmachine[0]='\0';
Printer->notify.printerlocal=0;
+ if (Printer->notify.option)
+ safe_free(Printer->notify.option->ctr.type);
safe_free(Printer->notify.option);
Printer->notify.option=NULL;
{
pstring temp_name;
DEVICEMODE *devmode;
- NT_PRINTER_INFO_LEVEL ntprinter;
+ NT_PRINTER_INFO_LEVEL *ntprinter = NULL;
pstring chaine;
struct tm *t;
job_info->jobid=queue->job;
- snprintf(chaine, sizeof(chaine)-1, "\\\\%s\\%s", global_myname, ntprinter.info_2->printername);
+ snprintf(chaine, sizeof(chaine)-1, "\\\\%s\\%s", global_myname, ntprinter->info_2->printername);
+
init_unistr(&(job_info->printername), chaine);
init_unistr(&(job_info->machinename), temp_name);
job_info->timeelapsed=0;
job_info->pagesprinted=0;
- if((devmode=(DEVICEMODE *)malloc(sizeof(DEVICEMODE))) == NULL) {
- free_a_printer(ntprinter, 2);
+ if((job_info->devmode = construct_dev_mode(snum, global_myname)) == NULL) {
+ free_a_printer(&ntprinter, 2);
return False;
}
- ZERO_STRUCTP(devmode);
- if(!construct_dev_mode(devmode, snum, global_myname)) {
- free_a_printer(ntprinter, 2);
- return False;
- }
job_info->devmode=devmode;
-
- free_a_printer(ntprinter, 2);
+ free_a_printer(&ntprinter, 2);
return (True);
}
NT_PRINTER_DRIVER_INFO_LEVEL driver;
DRIVER_INFO_1 *driver_info_1=NULL;
+ ZERO_STRUCT(driver);
+
if((driver_info_1=(DRIVER_INFO_1 *)malloc(*returned * sizeof(DRIVER_INFO_1))) == NULL)
return ERROR_NOT_ENOUGH_MEMORY;
for (i=0; i<*returned; i++) {
get_a_printer_driver(&driver, 3, list[i], architecture);
fill_printer_driver_info_1(&(driver_info_1[i]), driver, servername, architecture );
- free_a_printer_driver(driver, 3);
}
safe_free(list);
static uint32 enumprinterdrivers_level2(fstring *list, fstring servername, fstring architecture, NEW_BUFFER *buffer, uint32 offered, uint32 *needed, uint32 *returned)
{
int i;
- NT_PRINTER_DRIVER_INFO_LEVEL driver;
DRIVER_INFO_2 *driver_info_2=NULL;
if (*returned > 0 &&
return ERROR_NOT_ENOUGH_MEMORY;
for (i=0; i<*returned; i++) {
- get_a_printer_driver(&driver, 3, list[i], architecture);
+ NT_PRINTER_DRIVER_INFO_LEVEL driver;
+ ZERO_STRUCT(driver);
+ if (get_a_printer_driver(&driver, 3, list[i], architecture)
+ != 0) {
+ *returned = i;
+ break;
+ }
fill_printer_driver_info_2(&(driver_info_2[i]), driver, servername, architecture );
- free_a_printer_driver(driver, 3);
}
safe_free(list);
NT_PRINTER_DRIVER_INFO_LEVEL driver;
DRIVER_INFO_3 *driver_info_3=NULL;
+ ZERO_STRUCT(driver);
+
if((driver_info_3=(DRIVER_INFO_3 *)malloc((*returned)*sizeof(DRIVER_INFO_3))) == NULL)
return ERROR_NOT_ENOUGH_MEMORY;
for (i=0; i<*returned; i++) {
get_a_printer_driver(&driver, 3, list[i], architecture);
fill_printer_driver_info_3(&(driver_info_3[i]), driver, servername, architecture );
- free_a_printer_driver(driver, 3);
}
safe_free(list);
uint32 *needed, uint32 *returned)
{
int i;
- fstring *list;
+ fstring *list = NULL;
fstring servername;
fstring architecture;
*numofforms = get_ntforms(&list);
DEBUGADD(5,("Number of forms [%d]\n", *numofforms));
+ if (*numofforms == 0) return ERROR_NO_MORE_ITEMS;
+
switch (level) {
case 1:
- if((forms_1=(FORM_1 *)malloc(*numofforms * sizeof(FORM_1))) == NULL) {
+ if ((forms_1=(FORM_1 *)malloc(*numofforms * sizeof(FORM_1))) == NULL) {
*numofforms=0;
return ERROR_NOT_ENOUGH_MEMORY;
}
uint32 user_switch, const SPOOL_USER_CTR *user,
POLICY_HND *handle)
{
- NT_PRINTER_INFO_LEVEL printer;
+ NT_PRINTER_INFO_LEVEL *printer = NULL;
fstring name;
fstring share_name;
+ if ((printer = (NT_PRINTER_INFO_LEVEL *)malloc(sizeof(NT_PRINTER_INFO_LEVEL))) == NULL) {
+ DEBUG(0,("spoolss_addprinterex_level_2: malloc fail.\n"));
+ return ERROR_NOT_ENOUGH_MEMORY;
+ }
+
+ ZERO_STRUCTP(printer);
+
clear_handle(handle);
- /* NULLify info_2 here */
- /* don't put it in convert_printer_info as it's used also with non-NULL values */
- printer.info_2=NULL;
-
- /* convert from UNICODE to ASCII */
- convert_printer_info(info, &printer, 2);
+ /* convert from UNICODE to ASCII - this allocates the info_2 struct inside *printer.*/
+ convert_printer_info(info, printer, 2);
- unistr2_to_ascii(share_name, &((info->info_2)->printername), sizeof(share_name)-1);
+ unistr2_to_ascii(share_name, &info->info_2->printername, sizeof(share_name)-1);
slprintf(name, sizeof(name)-1, "\\\\%s\\%s", global_myname, share_name);
/* write the ASCII on disk */
- if (add_a_printer(printer, 2) != 0x0)
+ if (add_a_printer(*printer, 2) != 0) {
+ free_a_printer(&printer,2);
return ERROR_ACCESS_DENIED;
+ }
create_printer_hnd(handle);
open_printer_hnd(handle);
if (!set_printer_hnd_printertype(handle, name)) {
+ free_a_printer(&printer,2);
close_printer_handle(handle);
return ERROR_ACCESS_DENIED;
}
if (!set_printer_hnd_printername(handle, name)) {
+ free_a_printer(&printer,2);
close_printer_handle(handle);
return ERROR_ACCESS_DENIED;
}
+ free_a_printer(&printer,2);
return NT_STATUS_NO_PROBLEMO;
}
}
}
+/****************************************************************************
+ Modify internal driver heirarchy.
+****************************************************************************/
+
+#if MANGLE_DRIVER_PATH
+static uint32 modify_driver_heirarchy(NT_PRINTER_DRIVER_INFO_LEVEL *driver, uint32 level)
+{
+ pstring path_old;
+ pstring path_new;
+ pstring short_archi;
+ pstring model_name;
+
+ /* find_service is an smbd-specific function call */
+ int snum = find_service("print$");
+ char *model = NULL;
+
+ *short_archi = '\0';
+ switch (level) {
+ case 3:
+ get_short_archi(short_archi, driver->info_3->environment);
+ model = driver->info_3->name;
+ break;
+ case 6:
+ get_short_archi(short_archi, driver->info_6->environment);
+ model = driver->info_6->name;
+ break;
+ default:
+ DEBUG(0,("modify_driver_heirarchy: unknown info level (%d)\n", level));
+ return ERROR_INVALID_LEVEL;
+ break;
+ }
+
+ slprintf(path_old, sizeof(path_old)-1, "%s/%s/TMP_%s", lp_pathname(snum), short_archi,
+ client_addr());
+
+ /* Clean up any '/' and other characters in the model name. */
+ alpha_strcpy(model_name, model, sizeof(pstring));
+
+ slprintf(path_new, sizeof(path_new)-1, "%s/%s/%s", lp_pathname(snum), short_archi, model_name);
+
+ DEBUG(10,("modify_driver_heirarchy: old_path=%s, new_path=%s\n",
+ path_old, path_new ));
+ if (dos_rename(path_old, path_new) == -1) {
+ DEBUG(0,("modify_driver_heirarchy: rename from %s to %s failed (%s)\n",
+ path_old, path_new, strerror(errno) ));
+ /* We need to clean up here.... - how ? */
+ return ERROR_ACCESS_DENIED; /* We need a generic mapping from NT errors here... */
+ }
+
+ return NT_STATUS_NO_PROBLEMO;
+}
+#endif
/****************************************************************************
****************************************************************************/
uint32 level,
const SPOOL_PRINTER_DRIVER_INFO_LEVEL *info)
{
+ uint32 err = NT_STATUS_NO_PROBLEMO;
NT_PRINTER_DRIVER_INFO_LEVEL driver;
+ ZERO_STRUCT(driver);
convert_printer_driver_info(info, &driver, level);
if (add_a_printer_driver(driver, level)!=0)
return ERROR_ACCESS_DENIED;
- safe_free(driver.info_3);
+#if MANGLE_DRIVER_PATH
+ err = modify_driver_heirarchy(&driver, level);
+#endif
- return NT_STATUS_NO_PROBLEMO;
+ free_a_printer_driver(driver, level);
+
+ return err;
}
/****************************************************************************
****************************************************************************/
static uint32 getprinterdriverdir_level_1(UNISTR2 *name, UNISTR2 *uni_environment, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
{
- pstring chaine;
+ pstring path;
pstring long_archi;
pstring short_archi;
DRIVER_DIRECTORY_1 *info=NULL;
unistr2_to_ascii(long_archi, uni_environment, sizeof(long_archi)-1);
get_short_archi(short_archi, long_archi);
- slprintf(chaine, sizeof(chaine)-1, "\\\\%s\\print$\\%s", global_myname, short_archi);
-
- DEBUG(4,("printer driver directory: [%s]\n", chaine));
+#if MANGLE_DRIVER_PATH
+ slprintf(path, sizeof(path)-1, "\\\\%s\\print$\\%s\\TMP_%s", global_myname, short_archi,
+ client_addr());
+#else
+ slprintf(path, sizeof(path)-1, "\\\\%s\\print$\\%s",
+ global_myname, short_archi);
+#endif
+ DEBUG(4,("printer driver directory: [%s]\n", path));
- fill_driverdir_1(info, chaine);
+ fill_driverdir_1(info, path);
- *needed += spoolss_size_driverdir_info_1(info);
+ *needed += spoolss_size_driverdir_info_1(info);
if (!alloc_buffer_size(buffer, *needed)) {
safe_free(info);
uint32 *out_type,
uint32 *out_max_data_len, uint8 **data_out, uint32 *out_data_len)
{
- NT_PRINTER_INFO_LEVEL printer;
+ NT_PRINTER_INFO_LEVEL *printer = NULL;
fstring value;
biggest_valuesize=0;
biggest_datasize=0;
- while (get_specific_param_by_index(printer, 2, param_index, value, &data, &type, &data_len)) {
+ while (get_specific_param_by_index(*printer, 2, param_index, value, &data, &type, &data_len)) {
if (strlen(value) > biggest_valuesize) biggest_valuesize=strlen(value);
if (data_len > biggest_datasize) biggest_datasize=data_len;
DEBUG(6,("final values: [%d], [%d]\n", *out_value_len, *out_data_len));
- free_a_printer(printer, 2);
+ free_a_printer(&printer, 2);
return NT_STATUS_NO_PROBLEMO;
}
* that's the number of bytes not the number of unicode chars
*/
- if (!get_specific_param_by_index(printer, 2, idx, value, &data, &type, &data_len)) {
- free_a_printer(printer, 2);
+ if (!get_specific_param_by_index(*printer, 2, idx, value, &data, &type, &data_len)) {
safe_free(data);
+ free_a_printer(&printer, 2);
return ERROR_NO_MORE_ITEMS;
}
+ free_a_printer(&printer, 2);
+
/*
* the value is:
* - counted in bytes in the request
*out_max_value_len=in_value_len;
if((*out_value=(uint16 *)malloc(in_value_len*sizeof(uint8))) == NULL) {
- free_a_printer(printer, 2);
safe_free(data);
return ERROR_NOT_ENOUGH_MEMORY;
}
/* the data is counted in bytes */
*out_max_data_len=in_data_len;
if((*data_out=(uint8 *)malloc(in_data_len*sizeof(uint8))) == NULL) {
- free_a_printer(printer, 2);
safe_free(data);
return ERROR_NOT_ENOUGH_MEMORY;
}
safe_free(data);
- free_a_printer(printer, 2);
return NT_STATUS_NO_PROBLEMO;
}
uint32 real_len,
uint32 numeric_data)
{
- NT_PRINTER_INFO_LEVEL printer;
+ NT_PRINTER_INFO_LEVEL *printer = NULL;
NT_PRINTER_PARAM *param = NULL;
int snum=0;
return ERROR_INVALID_NAME;
convert_specific_param(¶m, value , type, data, real_len);
- unlink_specific_param_if_exist(printer.info_2, param);
+ unlink_specific_param_if_exist(printer->info_2, param);
- if (!add_a_specific_param(printer.info_2, param))
+ if (!add_a_specific_param(printer->info_2, param))
status = ERROR_INVALID_PARAMETER;
else
- status = add_a_printer(printer, 2);
+ status = add_a_printer(*printer, 2);
- free_a_printer(printer, 2);
-
+ free_a_printer(&printer, 2);
return status;
}
break;
}
}
-
+#undef OLD_NTDOMAIN
git.samba.org / samba.git / blobdiff