s4-smbd: removed unnecessary includes

[kai/samba.git] / source4 / smbd / service_stream.c

diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c
index fe07dc5a38ffc0c24fbce8ed07e47cb4ec59a547..ab35eb04bf5b6e39e8339910c8d57843e7ff2d15 100644 (file)
--- a/source4/smbd/service_stream.c
+++ b/source4/smbd/service_stream.c
@@ -23,9 +23,6 @@
 #include "includes.h"
 #include <tevent.h>
 #include "process_model.h"
-#include "lib/socket/socket.h"
-#include "smbd/service.h"
-#include "smbd/service_stream.h"
 #include "lib/messaging/irpc.h"
 #include "cluster/cluster.h"
 #include "param/param.h"
@@ -136,7 +133,7 @@ NTSTATUS stream_new_connection_merge(struct tevent_context *ev,
 
        talloc_steal(srv_conn, sock);
 
-       srv_conn->private       = private_data;
+       srv_conn->private_data  = private_data;
        srv_conn->model_ops     = model_ops;
        srv_conn->socket        = sock;
        srv_conn->server_id     = cluster_id(0, 0);
@@ -177,7 +174,7 @@ static void stream_new_connection(struct tevent_context *ev,
 
        talloc_steal(srv_conn, sock);
 
-       srv_conn->private       = stream_socket->private_data;
+       srv_conn->private_data  = stream_socket->private_data;
        srv_conn->model_ops     = stream_socket->model_ops;
        srv_conn->socket        = sock;
        srv_conn->server_id     = server_id;
@@ -328,7 +325,8 @@ NTSTATUS stream_setup_socket(struct tevent_context *event_context,
 
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0,("Failed to listen on %s:%u - %s\n",
-                       sock_addr, *port, nt_errstr(status)));
+                        sock_addr, port ? (unsigned int)(*port) : 0,
+                        nt_errstr(status)));
                talloc_free(stream_socket);
                return status;
        }