sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-29 21:47:30 +03:00
Code

r2955: fixing a segfault uncovered by the changes for BUG 1519

Browse Source
This commit is contained in:
Gerald Carter 2004-10-13 19:40:22 +00:00 committed by Gerald (Jerry) Carter
parent 3798357e44
commit 1664395257
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/include/rpc_spoolss.h
View File

@ -206,6 +206,7 @@
#define PRINTER_NOTIFY_TYPE 0x00
#define JOB_NOTIFY_TYPE 0x01
#define PRINT_TABLE_END 0xFF
#define MAX_PRINTER_NOTIFY 26
#define MAX_JOB_NOTIFY 24

8
source/printing/nt_printing.c
View File

@ -380,9 +380,11 @@ BOOL nt_printing_init(void)
msgs. This is done in claim_connection() */
win_rc = check_published_printers();
if (!W_ERROR_IS_OK(win_rc))
DEBUG(0, ("nt_printing_init: error checking published printers: %s\n", dos_errstr(win_rc)));
if ( lp_security() == SEC_ADS ) {
win_rc = check_published_printers();
if (!W_ERROR_IS_OK(win_rc))
DEBUG(0, ("nt_printing_init: error checking published printers: %s\n", dos_errstr(win_rc)));
}
return True;
}

3
source/rpc_server/srv_spoolss_nt.c
View File

@ -3506,6 +3506,7 @@ static const struct s_notify_info_data_table notify_info_data_table[] =
{ JOB_NOTIFY_TYPE, JOB_NOTIFY_TOTAL_PAGES, "JOB_NOTIFY_TOTAL_PAGES", NOTIFY_ONE_VALUE, spoolss_notify_total_pages },
{ JOB_NOTIFY_TYPE, JOB_NOTIFY_PAGES_PRINTED, "JOB_NOTIFY_PAGES_PRINTED", NOTIFY_ONE_VALUE, spoolss_notify_pages_printed },
{ JOB_NOTIFY_TYPE, JOB_NOTIFY_TOTAL_BYTES, "JOB_NOTIFY_TOTAL_BYTES", NOTIFY_ONE_VALUE, spoolss_notify_job_size },
{ PRINT_TABLE_END, 0x0, NULL, 0x0, NULL },
};
/*******************************************************************
@ -3571,7 +3572,7 @@ static int search_notify(uint16 type, uint16 field, int *value)
{
int i;
for (i = 0; i < sizeof(notify_info_data_table); i++) {
for (i = 0; notify_info_data_table[i].type != PRINT_TABLE_END; i++) {
if (notify_info_data_table[i].type == type &&
notify_info_data_table[i].field == field &&
notify_info_data_table[i].fn != NULL) {