*/
#include "includes.h"
+#include "smbd/smbd.h"
#include "smbd/globals.h"
-#include "librpc/gen_ndr/messaging.h"
#include "nt_printing.h"
+#include "printing/pcap.h"
+#include "printing/load.h"
+#include "auth.h"
+#include "messages.h"
+#include "lib/param/loadparm.h"
-/****************************************************************************
- Reload printers
-**************************************************************************/
-void reload_printers(struct messaging_context *msg_ctx)
+static bool snum_is_shared_printer(int snum)
{
- struct auth_serversupplied_info *server_info = NULL;
+ return (lp_browseable(snum) && lp_snum_ok(snum) && lp_print_ok(snum));
+}
+
+/**
+ * @brief Purge stale printers and reload from pre-populated pcap cache.
+ *
+ * This function should normally only be called as a callback on a successful
+ * pcap_cache_reload() or after a MSG_PRINTER_CAP message is received.
+ *
+ * This function can cause DELETION of printers and drivers from our registry,
+ * so calling it on a failed pcap reload may REMOVE permanently all printers
+ * and drivers.
+ *
+ * @param[in] ev The event context.
+ *
+ * @param[in] msg_ctx The messaging context.
+ */
+void delete_and_reload_printers(struct tevent_context *ev,
+ struct messaging_context *msg_ctx)
+{
+ struct auth_session_info *session_info = NULL;
struct spoolss_PrinterInfo2 *pinfo2 = NULL;
+ int n_services;
+ int pnum;
int snum;
- int n_services = lp_numservices();
- int pnum = lp_servicenumber(PRINTERS_NAME);
const char *pname;
+ const char *sname;
NTSTATUS status;
- bool skip = false;
- pcap_cache_reload(server_event_context(), msg_ctx);
+ /* Get pcap printers updated */
+ load_printers(ev, msg_ctx);
+
+ n_services = lp_numservices();
+ pnum = lp_servicenumber(PRINTERS_NAME);
+
+ DEBUG(10, ("reloading printer services from pcap cache\n"));
- status = make_server_info_system(talloc_tos(), &server_info);
+ status = make_session_info_system(talloc_tos(), &session_info);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("reload_printers: "
- "Could not create system server_info\n"));
+ DEBUG(3, ("reload_printers: "
+ "Could not create system session_info\n"));
/* can't remove stale printers before we
* are fully initilized */
- skip = true;
+ return;
}
- /* remove stale printers */
- for (snum = 0; skip == false && snum < n_services; snum++) {
- /* avoid removing PRINTERS_NAME or non-autoloaded printers */
- if (snum == pnum || !(lp_snum_ok(snum) && lp_print_ok(snum) &&
- lp_autoloaded(snum)))
+ /*
+ * Add default config for printers added to smb.conf file and remove
+ * stale printers
+ */
+ for (snum = 0; snum < n_services; snum++) {
+ /* avoid removing PRINTERS_NAME */
+ if (snum == pnum) {
continue;
+ }
+
+ /* skip no-printer services */
+ if (!snum_is_shared_printer(snum)) {
+ continue;
+ }
- pname = lp_printername(snum);
- if (!pcap_printername_ok(pname)) {
+ sname = lp_const_servicename(snum);
+ pname = lp_printername(session_info, snum);
+
+ /* check printer, but avoid removing non-autoloaded printers */
+ if (lp_autoloaded(snum) && !pcap_printername_ok(pname)) {
DEBUG(3, ("removing stale printer %s\n", pname));
- if (is_printer_published(server_info, server_info,
+ if (is_printer_published(session_info, session_info,
msg_ctx,
- NULL, lp_servicename(snum),
- NULL, &pinfo2)) {
- nt_printer_publish(server_info,
- server_info,
+ NULL,
+ lp_servicename(session_info,
+ snum),
+ &pinfo2)) {
+ nt_printer_publish(session_info,
+ session_info,
msg_ctx,
pinfo2,
DSPRINT_UNPUBLISH);
TALLOC_FREE(pinfo2);
}
- nt_printer_remove(server_info, server_info, msg_ctx,
+ nt_printer_remove(session_info, session_info, msg_ctx,
pname);
lp_killservice(snum);
+ } else {
+ DEBUG(8, ("Adding default registry entry for printer "
+ "[%s], if it doesn't exist.\n", sname));
+ nt_printer_add(session_info, session_info, msg_ctx,
+ sname);
}
}
- load_printers(server_event_context(), msg_ctx);
+ /* Make sure deleted printers are gone */
+ load_printers(ev, msg_ctx);
- TALLOC_FREE(server_info);
+ TALLOC_FREE(session_info);
}
/****************************************************************************
Reload the services file.
**************************************************************************/
-bool reload_services(struct messaging_context *msg_ctx, bool test)
+bool reload_services(struct smbd_server_connection *sconn,
+ bool (*snumused) (struct smbd_server_connection *, int),
+ bool test)
{
bool ret;
if (lp_loaded()) {
- char *fname = lp_configfile();
+ char *fname = lp_configfile(talloc_tos());
if (file_exist(fname) &&
!strcsequal(fname, get_dyn_CONFIGFILE())) {
set_dyn_CONFIGFILE(fname);
test = False;
}
+ TALLOC_FREE(fname);
}
reopen_logs();
if (test && !lp_file_list_changed())
return(True);
- lp_killunused(conn_snum_used);
-
- ret = lp_load(get_dyn_CONFIGFILE(), False, False, True, True);
+ lp_killunused(sconn, snumused);
- reload_printers(msg_ctx);
+ ret = lp_load(get_dyn_CONFIGFILE(),
+ false, /* global only */
+ false, /* save defaults */
+ true, /* add_ipc */
+ true); /* initialize globals */
/* perhaps the config filename is now set */
- if (!test)
- reload_services(msg_ctx, True);
+ if (!test) {
+ reload_services(sconn, snumused, true);
+ }
reopen_logs();
load_interfaces();
- if (smbd_server_fd() != -1) {
- set_socket_options(smbd_server_fd(),"SO_KEEPALIVE");
- set_socket_options(smbd_server_fd(), lp_socket_options());
+ if (sconn != NULL) {
+ set_socket_options(sconn->sock, "SO_KEEPALIVE");
+ set_socket_options(sconn->sock, lp_socket_options());
}
mangle_reset_cache();
git.samba.org / obnox / samba / samba-obnox.git / blobdiff