Changeset 862 for trunk/server/source3/smbd/server.c

Timestamp:

May 13, 2014, 11:39:04 AM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/smbd/server.c (modified) (8 diffs)

trunk/server/source3/smbd/server.c

@@ -21 +21 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef __OS2__
-#define INCL_DOSEXCEPTIONS
-#define INCL_DOSPROCESS
-#define INCL_DOSMODULEMGR
-#define INCL_LOADEXCEPTQ
-#define INCL_FORKEXCEPTQ
-#include "os2.h"
-#include "exceptq.h"
-#undef FILE_CREATE
-#undef FILE_OPEN
-#endif
 
 #include "includes.h"
@@ -120 +109 @@
         change_to_root_user();
         reload_services(msg, smbd_server_conn->sock, False);
-        if (am_parent) {
-                pcap_cache_reload(ev_ctx, msg,
-                                  &reload_pcap_change_notify);
-        }
+        /* printer reload triggered by background printing process */
 }
 
@@ -143 +129 @@
         reload_printers(ev_ctx, msg);
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 /*******************************************************************
@@ -784 +821 @@
                            smb_stat_cache_delete);
         messaging_register(msg_ctx, NULL, MSG_DEBUG, smbd_msg_debug);
-        messaging_register(msg_ctx, server_event_context(), MSG_PRINTER_PCAP,
-                           smb_pcap_updated);
         brl_register_msgs(msg_ctx);
 
@@ -909 +944 @@
         NTSTATUS status;
 
-#ifdef __OS2__
-        EXCEPTIONREGISTRATIONRECORD ExRegRec;
-        LoadExceptq(&ExRegRec, NULL, NULL);
-#endif
         /*
          * Do this before any other talloc operation
@@ -1264 +1295 @@
                 exit(1);
 
-        /* Publish nt printers, this requires a working winreg pipe */
-        pcap_cache_reload(server_event_context(), smbd_messaging_context(),
-                          &reload_printers);
-
         /* only start the background queue daemon if we are 
            running as a daemon -- bad things will happen if
@@ -1275 +1302 @@
         if (is_daemon && !interactive
             && lp_parm_bool(-1, "smbd", "backgroundqueue", true)) {
-                start_background_queue(smbd_event_context(),
-                                       smbd_messaging_context());
+                /* background queue is responsible for printcap cache updates */
+                messaging_register(smbd_server_conn->msg_ctx,
+                                   smbd_event_context(),
+                                   MSG_PRINTER_PCAP, smb_pcap_updated);
+                start_background_queue(server_event_context(),
+                                       smbd_server_conn->msg_ctx);
+        } else {
+                DEBUG(3, ("running without background printer process, dynamic "
+                          "printer updates disabled\n"));
+                /* Publish nt printers, this requires a working winreg pipe */
+                pcap_cache_reload(server_event_context(),
+                                  smbd_messaging_context(),
+                                  &reload_printers_full);
         }
 
@@ -1335 +1373 @@
         exit_server_cleanly(NULL);
         TALLOC_FREE(frame);
-#ifdef __OS2__
-        UninstallExceptq(&ExRegRec);
-#endif
         return(0);
 }