r23792: convert Samba4 to GPLv3

[bbaumbach/samba-autobuild/.git] / source4 / smbd / process_thread.c

diff --git a/source4/smbd/process_thread.c b/source4/smbd/process_thread.c
index 3f624bf871d0cece14f2cfe3282c60f7108956de..349ed44bc9cf47944a7e7ec04441cb11169aed47 100644 (file)
--- a/source4/smbd/process_thread.c
+++ b/source4/smbd/process_thread.c
@@ -9,7 +9,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -18,8 +18,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -31,13 +30,9 @@
 #include "system/wait.h"
 #include "system/filesys.h"
 #include "lib/events/events.h"
-#include "dlinklist.h"
-#include "smb_server/smb_server.h"
+#include "lib/util/dlinklist.h"
 #include "lib/util/mutex.h"
-
-/* For specifying event context to GSSAPI below */
-#include "system/kerberos.h"
-#include "heimdal/lib/gssapi/gssapi_locl.h"
+#include "smbd/process_model.h"
 
 static pthread_key_t title_key;
 
@@ -368,7 +363,7 @@ static int thread_rwlock_unlock(smb_rwlock_t *rwlock, const char *name)
 }
 
 /*****************************************************************
- Log suspicious usage (primarily for possible thread-unsafe behavior.
+ Log suspicious usage (primarily for possible thread-unsafe behavior).
 *****************************************************************/  
 static void thread_log_suspicious_usage(const char* from, const char* info)
 {
@@ -534,9 +529,6 @@ static void thread_model_init(struct event_context *event_context)
        d_ops.log_task_id = thread_log_task_id;
 
        register_debug_handlers("thread", &d_ops);
-
-       /* Hack to ensure that GSSAPI uses the right event context */
-       gssapi_krb5_init_ev(event_context);
 }