diff options
| author | Gerald Carter <jerry@samba.org> | 2004-10-13 19:40:22 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:52:57 -0500 |
| commit | 7df1ed060be1fe730f78eb4665cdb5f1a3fef0c9 (patch) | |
| tree | 49df8734ff894d36c906e9872cdf50d49640f44f | |
| parent | 64666f51ae83b7200c25d3cd5009a9ae4ece4e0b (diff) | |
| download | samba-7df1ed060be1fe730f78eb4665cdb5f1a3fef0c9.tar.gz samba-7df1ed060be1fe730f78eb4665cdb5f1a3fef0c9.tar.bz2 samba-7df1ed060be1fe730f78eb4665cdb5f1a3fef0c9.zip | |
r2955: fixing a segfault uncovered by the changes for BUG 1519
(This used to be commit 1664395257eb2425246e200ebde4384aa54484a4)
| -rwxr-xr-x | source3/include/rpc_spoolss.h | 1 | ||||
| -rw-r--r-- | source3/printing/nt_printing.c | 8 | ||||
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h index f2b78f91bc..7c5942759f 100755 --- a/source3/include/rpc_spoolss.h +++ b/source3/include/rpc_spoolss.h @@ -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 diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 81d792463a..6474516ebc 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -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; } diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index a1db4c3854..c882cea59b 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -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) { |