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

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/smbd/process.c (modified) (3 diffs)

trunk/server/source3/smbd/process.c

@@ -155 +155 @@
         }
 
-        len = smb_len(buf_out) + 4;
+        len = smb_len_large(buf_out) + 4;
 
         ret = write_data(sconn->sock, buf_out+nwritten, len - nwritten);
@@ -923 +923 @@
         DEBUG(10,("event_add_idle: %s %p\n", result->name, result->te));
         return result;
-}
-
-static void smbd_sig_term_handler(struct tevent_context *ev,
-                                  struct tevent_signal *se,
-                                  int signum,
-                                  int count,
-                                  void *siginfo,
-                                  void *private_data)
-{
-        exit_server_cleanly("termination signal");
-}
-
-void smbd_setup_sig_term_handler(void)
-{
-        struct tevent_signal *se;
-
-        se = tevent_add_signal(smbd_event_context(),
-                               smbd_event_context(),
-                               SIGTERM, 0,
-                               smbd_sig_term_handler,
-                               NULL);
-        if (!se) {
-                exit_server("failed to setup SIGTERM handler");
-        }
-}
-
-static void smbd_sig_hup_handler(struct tevent_context *ev,
-                                  struct tevent_signal *se,
-                                  int signum,
-                                  int count,
-                                  void *siginfo,
-                                  void *private_data)
-{
-        struct messaging_context *msg_ctx = talloc_get_type_abort(
-                private_data, struct messaging_context);
-        change_to_root_user();
-        DEBUG(1,("Reloading services after SIGHUP\n"));
-        reload_services(msg_ctx, smbd_server_conn->sock, False);
-        if (am_parent) {
-                pcap_cache_reload(ev, msg_ctx, &reload_pcap_change_notify);
-        }
-}
-
-void smbd_setup_sig_hup_handler(struct tevent_context *ev,
-                                struct messaging_context *msg_ctx)
-{
-        struct tevent_signal *se;
-
-        se = tevent_add_signal(ev, ev, SIGHUP, 0, smbd_sig_hup_handler,
-                               msg_ctx);
-        if (!se) {
-                exit_server("failed to setup SIGHUP handler");
-        }
 }
 
@@ -2034 +1981 @@
                  */
                 req->chain_outbuf = TALLOC_REALLOC_ARRAY(
-                        req, req->outbuf, uint8_t, smb_len(req->outbuf) + 4);
+                        req, req->outbuf, uint8_t,
+                        smb_len_large(req->outbuf) + 4);
                 if (req->chain_outbuf == NULL) {
                         smb_panic("talloc failed");