From 86d558b5cf977bad00c5d4c02992f2097d596856 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 23 Oct 2012 02:45:35 +0200 Subject: [PATCH] samba: update to samba-3.6.8 Signed-off-by: Stephan Raue --- packages/network/samba/meta | 2 +- ...=> samba-3.6.8-010_crosscompile-0.1.patch} | 0 ....patch => samba-3.6.8-110-multicall.patch} | 0 ...> samba-3.6.8-120-add_missing_ifdef.patch} | 0 ...ba-3.6.8-200-remove_printer_support.patch} | 580 +++++++++--------- ...> samba-3.6.8-210-remove_ad_support.patch} | 0 ... => samba-3.6.8-220-remove_services.patch} | 0 ...mba-3.6.8-230-remove_winreg_support.patch} | 0 ...h => samba-3.6.8-240-remove_dfs_api.patch} | 0 ...samba-3.6.8-250-remove_domain_logon.patch} | 0 ...atch => samba-3.6.8-260-remove_samr.patch} | 0 ...a-3.6.8-270-remove_registry_backend.patch} | 0 ...tch => samba-3.6.8-280-strip_srvsvc.patch} | 0 ...patch => samba-3.6.8-290-remove_lsa.patch} | 0 ... samba-3.6.8-300-assert_debug_level.patch} | 0 ...amba-3.6.8-310-remove_error_strings.patch} | 0 ... samba-3.6.8-320-debug_level_checks.patch} | 0 ...amba-3.6.8-330-librpc_default_print.patch} | 0 18 files changed, 293 insertions(+), 289 deletions(-) rename packages/network/samba/patches/{samba-3.6.7-010_crosscompile-0.1.patch => samba-3.6.8-010_crosscompile-0.1.patch} (100%) rename packages/network/samba/patches/{samba-3.6.7-110-multicall.patch => samba-3.6.8-110-multicall.patch} (100%) rename packages/network/samba/patches/{samba-3.6.7-120-add_missing_ifdef.patch => samba-3.6.8-120-add_missing_ifdef.patch} (100%) rename packages/network/samba/patches/{samba-3.6.7-200-remove_printer_support.patch => samba-3.6.8-200-remove_printer_support.patch} (54%) rename packages/network/samba/patches/{samba-3.6.7-210-remove_ad_support.patch => samba-3.6.8-210-remove_ad_support.patch} (100%) rename packages/network/samba/patches/{samba-3.6.7-220-remove_services.patch => samba-3.6.8-220-remove_services.patch} (100%) rename packages/network/samba/patches/{samba-3.6.7-230-remove_winreg_support.patch => samba-3.6.8-230-remove_winreg_support.patch} (100%) rename packages/network/samba/patches/{samba-3.6.7-240-remove_dfs_api.patch => samba-3.6.8-240-remove_dfs_api.patch} (100%) rename packages/network/samba/patches/{samba-3.6.7-250-remove_domain_logon.patch => samba-3.6.8-250-remove_domain_logon.patch} (100%) rename packages/network/samba/patches/{samba-3.6.7-260-remove_samr.patch => samba-3.6.8-260-remove_samr.patch} (100%) rename packages/network/samba/patches/{samba-3.6.7-270-remove_registry_backend.patch => samba-3.6.8-270-remove_registry_backend.patch} (100%) rename packages/network/samba/patches/{samba-3.6.7-280-strip_srvsvc.patch => samba-3.6.8-280-strip_srvsvc.patch} (100%) rename packages/network/samba/patches/{samba-3.6.7-290-remove_lsa.patch => samba-3.6.8-290-remove_lsa.patch} (100%) rename packages/network/samba/patches/{samba-3.6.7-300-assert_debug_level.patch => samba-3.6.8-300-assert_debug_level.patch} (100%) rename packages/network/samba/patches/{samba-3.6.7-310-remove_error_strings.patch => samba-3.6.8-310-remove_error_strings.patch} (100%) rename packages/network/samba/patches/{samba-3.6.7-320-debug_level_checks.patch => samba-3.6.8-320-debug_level_checks.patch} (100%) rename packages/network/samba/patches/{samba-3.6.7-330-librpc_default_print.patch => samba-3.6.8-330-librpc_default_print.patch} (100%) diff --git a/packages/network/samba/meta b/packages/network/samba/meta index d2623be7b5..f29b14d5b6 100644 --- a/packages/network/samba/meta +++ b/packages/network/samba/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="samba" -PKG_VERSION="3.6.7" +PKG_VERSION="3.6.8" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/network/samba/patches/samba-3.6.7-010_crosscompile-0.1.patch b/packages/network/samba/patches/samba-3.6.8-010_crosscompile-0.1.patch similarity index 100% rename from packages/network/samba/patches/samba-3.6.7-010_crosscompile-0.1.patch rename to packages/network/samba/patches/samba-3.6.8-010_crosscompile-0.1.patch diff --git a/packages/network/samba/patches/samba-3.6.7-110-multicall.patch b/packages/network/samba/patches/samba-3.6.8-110-multicall.patch similarity index 100% rename from packages/network/samba/patches/samba-3.6.7-110-multicall.patch rename to packages/network/samba/patches/samba-3.6.8-110-multicall.patch diff --git a/packages/network/samba/patches/samba-3.6.7-120-add_missing_ifdef.patch b/packages/network/samba/patches/samba-3.6.8-120-add_missing_ifdef.patch similarity index 100% rename from packages/network/samba/patches/samba-3.6.7-120-add_missing_ifdef.patch rename to packages/network/samba/patches/samba-3.6.8-120-add_missing_ifdef.patch diff --git a/packages/network/samba/patches/samba-3.6.7-200-remove_printer_support.patch b/packages/network/samba/patches/samba-3.6.8-200-remove_printer_support.patch similarity index 54% rename from packages/network/samba/patches/samba-3.6.7-200-remove_printer_support.patch rename to packages/network/samba/patches/samba-3.6.8-200-remove_printer_support.patch index 46254ba297..95b9ceb36a 100644 --- a/packages/network/samba/patches/samba-3.6.7-200-remove_printer_support.patch +++ b/packages/network/samba/patches/samba-3.6.8-200-remove_printer_support.patch @@ -1,31 +1,22 @@ ---- a/source3/rpc_server/rpc_ep_setup.c -+++ b/source3/rpc_server/rpc_ep_setup.c -@@ -1110,6 +1110,10 @@ bool dcesrv_ep_setup(struct tevent_conte - "rpc_server", - "spoolss", - "embedded"); -+#ifndef PRINTER_SUPPORT -+ if (1) { -+ } else -+#endif - if (StrCaseCmp(rpcsrv_type, "embedded") == 0) { - spoolss_cb.init = spoolss_init_cb; - spoolss_cb.shutdown = spoolss_shutdown_cb; ---- a/source3/rpcclient/rpcclient.c -+++ b/source3/rpcclient/rpcclient.c -@@ -624,7 +624,9 @@ static struct cmd_set *rpcclient_command - lsarpc_commands, - ds_commands, - samr_commands, +diff -Naur samba-3.6.8/source3/librpc/rpc/rpc_common.c samba-3.6.8.patch/source3/librpc/rpc/rpc_common.c +--- samba-3.6.8/source3/librpc/rpc/rpc_common.c 2012-09-14 10:12:09.000000000 +0200 ++++ samba-3.6.8.patch/source3/librpc/rpc/rpc_common.c 2012-10-22 21:17:48.583839804 +0200 +@@ -113,9 +113,11 @@ + if (!smb_register_ndr_interface(&ndr_table_winreg)) { + return false; + } +#ifdef PRINTER_SUPPORT - spoolss_commands, + if (!smb_register_ndr_interface(&ndr_table_spoolss)) { + return false; + } +#endif - netlogon_commands, - srvsvc_commands, - dfs_commands, ---- a/source3/printing/spoolssd.c -+++ b/source3/printing/spoolssd.c -@@ -153,6 +153,10 @@ void start_spoolssd(struct tevent_contex + if (!smb_register_ndr_interface(&ndr_table_netdfs)) { + return false; + } +diff -Naur samba-3.6.8/source3/printing/spoolssd.c samba-3.6.8.patch/source3/printing/spoolssd.c +--- samba-3.6.8/source3/printing/spoolssd.c 2012-09-14 10:12:09.000000000 +0200 ++++ samba-3.6.8.patch/source3/printing/spoolssd.c 2012-10-22 21:17:48.566839461 +0200 +@@ -153,6 +153,10 @@ NTSTATUS status; int ret; @@ -36,22 +27,241 @@ DEBUG(1, ("Forking SPOOLSS Daemon\n")); pid = sys_fork(); ---- a/source3/utils/net_rpc.c -+++ b/source3/utils/net_rpc.c -@@ -7791,6 +7791,10 @@ int net_rpc_printer(struct net_context * - {NULL, NULL, 0, NULL, NULL} - }; +diff -Naur samba-3.6.8/source3/rpcclient/rpcclient.c samba-3.6.8.patch/source3/rpcclient/rpcclient.c +--- samba-3.6.8/source3/rpcclient/rpcclient.c 2012-09-14 10:12:09.000000000 +0200 ++++ samba-3.6.8.patch/source3/rpcclient/rpcclient.c 2012-10-22 21:17:48.565839442 +0200 +@@ -624,7 +624,9 @@ + lsarpc_commands, + ds_commands, + samr_commands, ++#ifdef PRINTER_SUPPORT + spoolss_commands, ++#endif + netlogon_commands, + srvsvc_commands, + dfs_commands, +diff -Naur samba-3.6.8/source3/rpc_server/rpc_ep_setup.c samba-3.6.8.patch/source3/rpc_server/rpc_ep_setup.c +--- samba-3.6.8/source3/rpc_server/rpc_ep_setup.c 2012-09-14 10:12:09.000000000 +0200 ++++ samba-3.6.8.patch/source3/rpc_server/rpc_ep_setup.c 2012-10-22 21:17:48.564839423 +0200 +@@ -1110,6 +1110,10 @@ + "rpc_server", + "spoolss", + "embedded"); ++#ifndef PRINTER_SUPPORT ++ if (1) { ++ } else ++#endif + if (StrCaseCmp(rpcsrv_type, "embedded") == 0) { + spoolss_cb.init = spoolss_init_cb; + spoolss_cb.shutdown = spoolss_shutdown_cb; +diff -Naur samba-3.6.8/source3/rpc_server/svcctl/srv_svcctl_nt.c samba-3.6.8.patch/source3/rpc_server/svcctl/srv_svcctl_nt.c +--- samba-3.6.8/source3/rpc_server/svcctl/srv_svcctl_nt.c 2012-09-14 10:12:09.000000000 +0200 ++++ samba-3.6.8.patch/source3/rpc_server/svcctl/srv_svcctl_nt.c 2012-10-22 21:17:48.582839784 +0200 +@@ -85,9 +85,11 @@ + + /* add builtin services */ + ++#ifdef PRINTER_SUPPORT + svcctl_ops[i].name = talloc_strdup( svcctl_ops, "Spooler" ); + svcctl_ops[i].ops = &spoolss_svc_ops; + i++; ++#endif + + svcctl_ops[i].name = talloc_strdup( svcctl_ops, "NETLOGON" ); + svcctl_ops[i].ops = &netlogon_svc_ops; +diff -Naur samba-3.6.8/source3/smbd/close.c samba-3.6.8.patch/source3/smbd/close.c +--- samba-3.6.8/source3/smbd/close.c 2012-09-14 10:12:09.000000000 +0200 ++++ samba-3.6.8.patch/source3/smbd/close.c 2012-10-22 21:17:48.579839724 +0200 +@@ -643,6 +643,9 @@ + status = ntstatus_keeperror(status, tmp); + + if (fsp->print_file) { ++#ifndef PRINTER_SUPPORT ++ return NT_STATUS_OK; ++#endif + /* FIXME: return spool errors */ + print_spool_end(fsp, close_type); + file_free(req, fsp); +diff -Naur samba-3.6.8/source3/smbd/fileio.c samba-3.6.8.patch/source3/smbd/fileio.c +--- samba-3.6.8/source3/smbd/fileio.c 2012-09-14 10:12:09.000000000 +0200 ++++ samba-3.6.8.patch/source3/smbd/fileio.c 2012-10-22 21:17:48.580839744 +0200 +@@ -298,6 +298,10 @@ + uint32_t t; + int ret; +#ifndef PRINTER_SUPPORT -+ return 0; ++ return -1; +#endif + - if (argc == 0) { - if (c->display_usage) { - d_printf(_("Usage:\n")); ---- a/source3/smbd/reply.c -+++ b/source3/smbd/reply.c -@@ -5194,7 +5194,11 @@ void reply_printopen(struct smb_request + ret = print_spool_write(fsp, data, n, pos, &t); + if (ret) { + errno = ret; +diff -Naur samba-3.6.8/source3/smbd/lanman.c samba-3.6.8.patch/source3/smbd/lanman.c +--- samba-3.6.8/source3/smbd/lanman.c 2012-09-14 10:12:09.000000000 +0200 ++++ samba-3.6.8.patch/source3/smbd/lanman.c 2012-10-22 21:17:48.576839664 +0200 +@@ -784,6 +784,10 @@ + union spoolss_JobInfo *job_info = NULL; + union spoolss_PrinterInfo printer_info; + ++#ifndef PRINTER_SUPPORT ++ return False; ++#endif ++ + if (!str1 || !str2 || !p) { + return False; + } +@@ -999,6 +1003,10 @@ + union spoolss_DriverInfo *driver_info; + union spoolss_JobInfo **job_info; + ++#ifndef PRINTER_SUPPORT ++ return False; ++#endif ++ + if (!param_format || !output_format1 || !p) { + return False; + } +@@ -3350,6 +3358,10 @@ + struct spoolss_DevmodeContainer devmode_ctr; + enum spoolss_JobControl command; + ++#ifndef PRINTER_SUPPORT ++ return False; ++#endif ++ + if (!str1 || !str2 || !p) { + return False; + } +@@ -3483,6 +3495,10 @@ + struct sec_desc_buf secdesc_ctr; + enum spoolss_PrinterControl command; + ++#ifndef PRINTER_SUPPORT ++ return False; ++#endif ++ + if (!str1 || !str2 || !QueueName) { + return False; + } +@@ -3649,6 +3665,10 @@ + union spoolss_JobInfo info; + struct spoolss_SetJobInfo1 info1; + ++#ifndef PRINTER_SUPPORT ++ return False; ++#endif ++ + if (!str1 || !str2 || !p) { + return False; + } +@@ -4792,6 +4812,10 @@ + struct spoolss_DevmodeContainer devmode_ctr; + union spoolss_JobInfo info; + ++#ifndef PRINTER_SUPPORT ++ return False; ++#endif ++ + if (!str1 || !str2 || !p) { + return False; + } +@@ -4930,6 +4954,10 @@ + uint32_t count = 0; + union spoolss_JobInfo *info; + ++#ifndef PRINTER_SUPPORT ++ return False; ++#endif ++ + if (!str1 || !str2 || !p) { + return False; + } +@@ -5135,6 +5163,10 @@ + struct spoolss_DevmodeContainer devmode_ctr; + union spoolss_PrinterInfo info; + ++#ifndef PRINTER_SUPPORT ++ return False; ++#endif ++ + if (!str1 || !str2 || !p) { + return False; + } +@@ -5271,6 +5303,10 @@ + union spoolss_PrinterInfo *info; + uint32_t count; + ++#ifndef PRINTER_SUPPORT ++ return False; ++#endif ++ + if (!str1 || !str2 || !p) { + return False; + } +@@ -5374,6 +5410,10 @@ + int succnt; + struct pack_desc desc; + ++#ifndef PRINTER_SUPPORT ++ return False; ++#endif ++ + if (!str1 || !str2 || !p) { + return False; + } +@@ -5438,6 +5478,10 @@ + int succnt; + struct pack_desc desc; + ++#ifndef PRINTER_SUPPORT ++ return False; ++#endif ++ + if (!str1 || !str2 || !p) { + return False; + } +@@ -5502,6 +5546,10 @@ + int succnt; + struct pack_desc desc; + ++#ifndef PRINTER_SUPPORT ++ return False; ++#endif ++ + if (!str1 || !str2 || !p) { + return False; + } +diff -Naur samba-3.6.8/source3/smbd/open.c samba-3.6.8.patch/source3/smbd/open.c +--- samba-3.6.8/source3/smbd/open.c 2012-09-14 10:12:09.000000000 +0200 ++++ samba-3.6.8.patch/source3/smbd/open.c 2012-10-22 21:17:48.578839704 +0200 +@@ -1546,6 +1546,9 @@ + * Most of the passed parameters are ignored. + */ + ++#ifndef PRINTER_SUPPORT ++ return NT_STATUS_ACCESS_DENIED; ++#endif + if (pinfo) { + *pinfo = FILE_WAS_CREATED; + } +diff -Naur samba-3.6.8/source3/smbd/process.c samba-3.6.8.patch/source3/smbd/process.c +--- samba-3.6.8/source3/smbd/process.c 2012-09-14 10:12:09.000000000 +0200 ++++ samba-3.6.8.patch/source3/smbd/process.c 2012-10-22 21:17:48.584839824 +0200 +@@ -2475,8 +2475,10 @@ + + change_to_root_user(); + ++#ifdef PRINTER_SUPPORT + /* update printer queue caches if necessary */ + update_monitored_printq_cache(sconn->msg_ctx); ++#endif + + /* check if we need to reload services */ + check_reload(sconn, time_mono(NULL)); +diff -Naur samba-3.6.8/source3/smbd/reply.c samba-3.6.8.patch/source3/smbd/reply.c +--- samba-3.6.8/source3/smbd/reply.c 2012-09-14 10:12:09.000000000 +0200 ++++ samba-3.6.8.patch/source3/smbd/reply.c 2012-10-22 21:17:48.573839604 +0200 +@@ -5196,7 +5196,11 @@ return; } @@ -64,7 +274,7 @@ reply_nterror(req, NT_STATUS_ACCESS_DENIED); END_PROFILE(SMBsplopen); return; -@@ -5300,7 +5304,10 @@ void reply_printqueue(struct smb_request +@@ -5302,7 +5306,10 @@ is really quite gross and only worked when there was only one printer - I think we should now only accept it if they get it right (tridge) */ @@ -76,143 +286,40 @@ reply_nterror(req, NT_STATUS_ACCESS_DENIED); END_PROFILE(SMBsplretq); return; ---- a/source3/smbd/lanman.c -+++ b/source3/smbd/lanman.c -@@ -784,6 +784,10 @@ static bool api_DosPrintQGetInfo(struct - union spoolss_JobInfo *job_info = NULL; - union spoolss_PrinterInfo printer_info; - +diff -Naur samba-3.6.8/source3/smbd/server.c samba-3.6.8.patch/source3/smbd/server.c +--- samba-3.6.8/source3/smbd/server.c 2012-09-14 10:12:09.000000000 +0200 ++++ samba-3.6.8.patch/source3/smbd/server.c 2012-10-22 21:19:58.704461862 +0200 +@@ -126,7 +126,9 @@ + { + struct tevent_context *ev_ctx = + talloc_get_type_abort(private_data, struct tevent_context); +- +#ifndef PRINTER_SUPPORT -+ return False; ++ return; +#endif -+ - if (!str1 || !str2 || !p) { - return False; + DEBUG(10,("Got message saying pcap was updated. Reloading.\n")); + change_to_root_user(); + reload_printers(ev_ctx, msg); +@@ -1254,6 +1256,7 @@ + exit(1); } -@@ -999,6 +1003,10 @@ static bool api_DosPrintQEnum(struct smb - union spoolss_DriverInfo *driver_info; - union spoolss_JobInfo **job_info; -+#ifndef PRINTER_SUPPORT -+ return False; -+#endif -+ - if (!param_format || !output_format1 || !p) { - return False; ++#ifdef PRINTER_SUPPORT + /* + * The print backend init also migrates the printing tdb's, + * this requires a winreg pipe. +@@ -1289,6 +1292,7 @@ + smbd_messaging_context()); + } } -@@ -3350,6 +3358,10 @@ static bool api_RDosPrintJobDel(struct s - struct spoolss_DevmodeContainer devmode_ctr; - enum spoolss_JobControl command; ++#endif -+#ifndef PRINTER_SUPPORT -+ return False; -+#endif -+ - if (!str1 || !str2 || !p) { - return False; - } -@@ -3483,6 +3495,10 @@ static bool api_WPrintQueueCtrl(struct s - struct sec_desc_buf secdesc_ctr; - enum spoolss_PrinterControl command; - -+#ifndef PRINTER_SUPPORT -+ return False; -+#endif -+ - if (!str1 || !str2 || !QueueName) { - return False; - } -@@ -3649,6 +3665,10 @@ static bool api_PrintJobInfo(struct smbd - union spoolss_JobInfo info; - struct spoolss_SetJobInfo1 info1; - -+#ifndef PRINTER_SUPPORT -+ return False; -+#endif -+ - if (!str1 || !str2 || !p) { - return False; - } -@@ -4792,6 +4812,10 @@ static bool api_WPrintJobGetInfo(struct - struct spoolss_DevmodeContainer devmode_ctr; - union spoolss_JobInfo info; - -+#ifndef PRINTER_SUPPORT -+ return False; -+#endif -+ - if (!str1 || !str2 || !p) { - return False; - } -@@ -4930,6 +4954,10 @@ static bool api_WPrintJobEnumerate(struc - uint32_t count = 0; - union spoolss_JobInfo *info; - -+#ifndef PRINTER_SUPPORT -+ return False; -+#endif -+ - if (!str1 || !str2 || !p) { - return False; - } -@@ -5135,6 +5163,10 @@ static bool api_WPrintDestGetInfo(struct - struct spoolss_DevmodeContainer devmode_ctr; - union spoolss_PrinterInfo info; - -+#ifndef PRINTER_SUPPORT -+ return False; -+#endif -+ - if (!str1 || !str2 || !p) { - return False; - } -@@ -5271,6 +5303,10 @@ static bool api_WPrintDestEnum(struct sm - union spoolss_PrinterInfo *info; - uint32_t count; - -+#ifndef PRINTER_SUPPORT -+ return False; -+#endif -+ - if (!str1 || !str2 || !p) { - return False; - } -@@ -5374,6 +5410,10 @@ static bool api_WPrintDriverEnum(struct - int succnt; - struct pack_desc desc; - -+#ifndef PRINTER_SUPPORT -+ return False; -+#endif -+ - if (!str1 || !str2 || !p) { - return False; - } -@@ -5438,6 +5478,10 @@ static bool api_WPrintQProcEnum(struct s - int succnt; - struct pack_desc desc; - -+#ifndef PRINTER_SUPPORT -+ return False; -+#endif -+ - if (!str1 || !str2 || !p) { - return False; - } -@@ -5502,6 +5546,10 @@ static bool api_WPrintPortEnum(struct sm - int succnt; - struct pack_desc desc; - -+#ifndef PRINTER_SUPPORT -+ return False; -+#endif -+ - if (!str1 || !str2 || !p) { - return False; - } ---- a/source3/smbd/server_exit.c -+++ b/source3/smbd/server_exit.c -@@ -142,7 +142,9 @@ static void exit_server_common(enum serv + if (!is_daemon) { + /* inetd mode */ +diff -Naur samba-3.6.8/source3/smbd/server_exit.c samba-3.6.8.patch/source3/smbd/server_exit.c +--- samba-3.6.8/source3/smbd/server_exit.c 2012-09-14 10:12:09.000000000 +0200 ++++ samba-3.6.8.patch/source3/smbd/server_exit.c 2012-10-22 21:17:48.576839664 +0200 +@@ -141,7 +141,9 @@ rpc_eventlog_shutdown(); rpc_ntsvcs_shutdown(); rpc_svcctl_shutdown(); @@ -222,46 +329,10 @@ rpc_srvsvc_shutdown(); rpc_winreg_shutdown(); ---- a/source3/smbd/open.c -+++ b/source3/smbd/open.c -@@ -1556,6 +1556,9 @@ static NTSTATUS open_file_ntcreate(conne - * Most of the passed parameters are ignored. - */ - -+#ifndef PRINTER_SUPPORT -+ return NT_STATUS_ACCESS_DENIED; -+#endif - if (pinfo) { - *pinfo = FILE_WAS_CREATED; - } ---- a/source3/smbd/close.c -+++ b/source3/smbd/close.c -@@ -638,6 +638,9 @@ static NTSTATUS close_normal_file(struct - status = ntstatus_keeperror(status, tmp); - - if (fsp->print_file) { -+#ifndef PRINTER_SUPPORT -+ return NT_STATUS_OK; -+#endif - /* FIXME: return spool errors */ - print_spool_end(fsp, close_type); - file_free(req, fsp); ---- a/source3/smbd/fileio.c -+++ b/source3/smbd/fileio.c -@@ -298,6 +298,10 @@ ssize_t write_file(struct smb_request *r - uint32_t t; - int ret; - -+#ifndef PRINTER_SUPPORT -+ return -1; -+#endif -+ - ret = print_spool_write(fsp, data, n, pos, &t); - if (ret) { - errno = ret; ---- a/source3/smbd/smb2_create.c -+++ b/source3/smbd/smb2_create.c -@@ -485,7 +485,10 @@ static struct tevent_req *smbd_smb2_crea +diff -Naur samba-3.6.8/source3/smbd/smb2_create.c samba-3.6.8.patch/source3/smbd/smb2_create.c +--- samba-3.6.8/source3/smbd/smb2_create.c 2012-09-14 10:12:09.000000000 +0200 ++++ samba-3.6.8.patch/source3/smbd/smb2_create.c 2012-10-22 21:17:48.581839764 +0200 +@@ -485,7 +485,10 @@ info = FILE_WAS_OPENED; } else if (CAN_PRINT(smb1req->conn)) { status = file_new(smb1req, smb1req->conn, &result); @@ -273,84 +344,17 @@ tevent_req_nterror(req, status); return tevent_req_post(req, ev); } ---- a/source3/rpc_server/svcctl/srv_svcctl_nt.c -+++ b/source3/rpc_server/svcctl/srv_svcctl_nt.c -@@ -85,9 +85,11 @@ bool init_service_op_table( void ) +diff -Naur samba-3.6.8/source3/utils/net_rpc.c samba-3.6.8.patch/source3/utils/net_rpc.c +--- samba-3.6.8/source3/utils/net_rpc.c 2012-09-14 10:12:09.000000000 +0200 ++++ samba-3.6.8.patch/source3/utils/net_rpc.c 2012-10-22 21:17:48.569839523 +0200 +@@ -7791,6 +7791,10 @@ + {NULL, NULL, 0, NULL, NULL} + }; - /* add builtin services */ - -+#ifdef PRINTER_SUPPORT - svcctl_ops[i].name = talloc_strdup( svcctl_ops, "Spooler" ); - svcctl_ops[i].ops = &spoolss_svc_ops; - i++; -+#endif - - svcctl_ops[i].name = talloc_strdup( svcctl_ops, "NETLOGON" ); - svcctl_ops[i].ops = &netlogon_svc_ops; ---- a/source3/librpc/rpc/rpc_common.c -+++ b/source3/librpc/rpc/rpc_common.c -@@ -113,9 +113,11 @@ static bool initialize_interfaces(void) - if (!smb_register_ndr_interface(&ndr_table_winreg)) { - return false; - } -+#ifdef PRINTER_SUPPORT - if (!smb_register_ndr_interface(&ndr_table_spoolss)) { - return false; - } -+#endif - if (!smb_register_ndr_interface(&ndr_table_netdfs)) { - return false; - } ---- a/source3/smbd/process.c -+++ b/source3/smbd/process.c -@@ -2475,8 +2475,10 @@ static bool housekeeping_fn(const struct - - change_to_root_user(); - -+#ifdef PRINTER_SUPPORT - /* update printer queue caches if necessary */ - update_monitored_printq_cache(sconn->msg_ctx); -+#endif - - /* check if we need to reload services */ - check_reload(sconn, time_mono(NULL)); ---- a/source3/smbd/server.c -+++ b/source3/smbd/server.c -@@ -126,7 +126,9 @@ static void smb_pcap_updated(struct mess - { - struct tevent_context *ev_ctx = - talloc_get_type_abort(private_data, struct tevent_context); -- +#ifndef PRINTER_SUPPORT -+ return; ++ return 0; +#endif - DEBUG(10,("Got message saying pcap was updated. Reloading.\n")); - change_to_root_user(); - reload_printers(ev_ctx, msg); -@@ -1211,8 +1213,10 @@ extern void build_options(bool screen); - if (!W_ERROR_IS_OK(registry_init_full())) - exit(1); - -+#ifdef PRINTER_SUPPORT - if (!print_backend_init(smbd_messaging_context())) - exit(1); -+#endif - - /* Open the share_info.tdb here, so we don't have to open - after the fork on every single connection. This is a small -@@ -1256,6 +1260,7 @@ extern void build_options(bool screen); - exit(1); - } - -+#ifdef PRINTER_SUPPORT - /* Publish nt printers, this requires a working winreg pipe */ - pcap_cache_reload(server_event_context(), smbd_messaging_context(), - &reload_printers); -@@ -1284,6 +1289,7 @@ extern void build_options(bool screen); - smbd_messaging_context()); - } - } -+#endif - - if (!is_daemon) { - /* inetd mode */ ++ + if (argc == 0) { + if (c->display_usage) { + d_printf(_("Usage:\n")); diff --git a/packages/network/samba/patches/samba-3.6.7-210-remove_ad_support.patch b/packages/network/samba/patches/samba-3.6.8-210-remove_ad_support.patch similarity index 100% rename from packages/network/samba/patches/samba-3.6.7-210-remove_ad_support.patch rename to packages/network/samba/patches/samba-3.6.8-210-remove_ad_support.patch diff --git a/packages/network/samba/patches/samba-3.6.7-220-remove_services.patch b/packages/network/samba/patches/samba-3.6.8-220-remove_services.patch similarity index 100% rename from packages/network/samba/patches/samba-3.6.7-220-remove_services.patch rename to packages/network/samba/patches/samba-3.6.8-220-remove_services.patch diff --git a/packages/network/samba/patches/samba-3.6.7-230-remove_winreg_support.patch b/packages/network/samba/patches/samba-3.6.8-230-remove_winreg_support.patch similarity index 100% rename from packages/network/samba/patches/samba-3.6.7-230-remove_winreg_support.patch rename to packages/network/samba/patches/samba-3.6.8-230-remove_winreg_support.patch diff --git a/packages/network/samba/patches/samba-3.6.7-240-remove_dfs_api.patch b/packages/network/samba/patches/samba-3.6.8-240-remove_dfs_api.patch similarity index 100% rename from packages/network/samba/patches/samba-3.6.7-240-remove_dfs_api.patch rename to packages/network/samba/patches/samba-3.6.8-240-remove_dfs_api.patch diff --git a/packages/network/samba/patches/samba-3.6.7-250-remove_domain_logon.patch b/packages/network/samba/patches/samba-3.6.8-250-remove_domain_logon.patch similarity index 100% rename from packages/network/samba/patches/samba-3.6.7-250-remove_domain_logon.patch rename to packages/network/samba/patches/samba-3.6.8-250-remove_domain_logon.patch diff --git a/packages/network/samba/patches/samba-3.6.7-260-remove_samr.patch b/packages/network/samba/patches/samba-3.6.8-260-remove_samr.patch similarity index 100% rename from packages/network/samba/patches/samba-3.6.7-260-remove_samr.patch rename to packages/network/samba/patches/samba-3.6.8-260-remove_samr.patch diff --git a/packages/network/samba/patches/samba-3.6.7-270-remove_registry_backend.patch b/packages/network/samba/patches/samba-3.6.8-270-remove_registry_backend.patch similarity index 100% rename from packages/network/samba/patches/samba-3.6.7-270-remove_registry_backend.patch rename to packages/network/samba/patches/samba-3.6.8-270-remove_registry_backend.patch diff --git a/packages/network/samba/patches/samba-3.6.7-280-strip_srvsvc.patch b/packages/network/samba/patches/samba-3.6.8-280-strip_srvsvc.patch similarity index 100% rename from packages/network/samba/patches/samba-3.6.7-280-strip_srvsvc.patch rename to packages/network/samba/patches/samba-3.6.8-280-strip_srvsvc.patch diff --git a/packages/network/samba/patches/samba-3.6.7-290-remove_lsa.patch b/packages/network/samba/patches/samba-3.6.8-290-remove_lsa.patch similarity index 100% rename from packages/network/samba/patches/samba-3.6.7-290-remove_lsa.patch rename to packages/network/samba/patches/samba-3.6.8-290-remove_lsa.patch diff --git a/packages/network/samba/patches/samba-3.6.7-300-assert_debug_level.patch b/packages/network/samba/patches/samba-3.6.8-300-assert_debug_level.patch similarity index 100% rename from packages/network/samba/patches/samba-3.6.7-300-assert_debug_level.patch rename to packages/network/samba/patches/samba-3.6.8-300-assert_debug_level.patch diff --git a/packages/network/samba/patches/samba-3.6.7-310-remove_error_strings.patch b/packages/network/samba/patches/samba-3.6.8-310-remove_error_strings.patch similarity index 100% rename from packages/network/samba/patches/samba-3.6.7-310-remove_error_strings.patch rename to packages/network/samba/patches/samba-3.6.8-310-remove_error_strings.patch diff --git a/packages/network/samba/patches/samba-3.6.7-320-debug_level_checks.patch b/packages/network/samba/patches/samba-3.6.8-320-debug_level_checks.patch similarity index 100% rename from packages/network/samba/patches/samba-3.6.7-320-debug_level_checks.patch rename to packages/network/samba/patches/samba-3.6.8-320-debug_level_checks.patch diff --git a/packages/network/samba/patches/samba-3.6.7-330-librpc_default_print.patch b/packages/network/samba/patches/samba-3.6.8-330-librpc_default_print.patch similarity index 100% rename from packages/network/samba/patches/samba-3.6.7-330-librpc_default_print.patch rename to packages/network/samba/patches/samba-3.6.8-330-librpc_default_print.patch