diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-09-20 12:31:07 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:58:54 -0500 |
| commit | 7d06a06584e5163b69f712e38dc46afc2668389c (patch) | |
| tree | 7b15e5c67ad99a2a576fac13ecf04287fdacbc61 /source4/smbd/process_single.c | |
| parent | e8d244251732cd744c2c69e3e7bd7a875e704a60 (diff) | |
| download | samba-7d06a06584e5163b69f712e38dc46afc2668389c.tar.gz samba-7d06a06584e5163b69f712e38dc46afc2668389c.tar.bz2 samba-7d06a06584e5163b69f712e38dc46afc2668389c.zip | |
r2447: let the server code use the new lib/socket/ stuff
metze
(This used to be commit 2fd577d2417e117a7e8c1a56feb147eae805df34)
Diffstat (limited to 'source4/smbd/process_single.c')
| -rw-r--r-- | source4/smbd/process_single.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/source4/smbd/process_single.c b/source4/smbd/process_single.c index 8bd00c53b9..f3b69eae28 100644 --- a/source4/smbd/process_single.c +++ b/source4/smbd/process_single.c @@ -36,23 +36,22 @@ static void single_start_server(void) */ static void single_accept_connection(struct event_context *ev, struct fd_event *srv_fde, time_t t, uint16_t flags) { - int accepted_fd; - struct sockaddr addr; - socklen_t in_addrlen = sizeof(addr); + NTSTATUS status; + struct socket_context *sock; struct server_socket *server_socket = srv_fde->private; struct server_connection *conn; /* accept an incoming connection. */ - accepted_fd = accept(srv_fde->fd,&addr,&in_addrlen); - if (accepted_fd == -1) { + status = socket_accept(server_socket->socket, &sock, 0); + if (!NT_STATUS_IS_OK(status)) { DEBUG(0,("accept_connection_single: accept: %s\n", - strerror(errno))); + nt_errstr(status))); return; } - conn = server_setup_connection(ev, server_socket, accepted_fd, t); + conn = server_setup_connection(ev, server_socket, sock, t); if (!conn) { - DEBUG(0,("server_setup_connection(ev, server_socket, accepted_fd) failed\n")); + DEBUG(0,("server_setup_connection(ev, server_socket, sock, t) failed\n")); return; } |