From 79ae828819193dd9ed5e060f78a88752e30bd1c3 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 22 Sep 2004 23:50:28 +0000 Subject: r2542: I really don't like the 'substitute' code, and I particularly don't like it in the mainline code (outside the smb.conf magic). We will need to have a more useful 'helper' routine for this, but for now we at least get a reliable IP address. Also remove the unused 'socket' structure in the smb server - it seems to have been replaced by the socket library. Andrew Bartlett (This used to be commit d8fd19a2020da6cce691c0db2b00f42e31d672cc) --- source4/smb_server/smb_server.h | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'source4/smb_server/smb_server.h') diff --git a/source4/smb_server/smb_server.h b/source4/smb_server/smb_server.h index e69cf65c8c..59fb03ea2e 100644 --- a/source4/smb_server/smb_server.h +++ b/source4/smb_server/smb_server.h @@ -168,21 +168,9 @@ struct substitute_context { * information associated with a SMB server connection */ struct smbsrv_connection { - /* this is the context for a SMB socket associated with the socket itself */ - struct { - /* the open file descriptor */ - int fd; - - /* the last read error on the socket, if any (replaces smb_read_error global) */ - int read_error; - - /* a count of the number of packets we have received. We - * actually only care about zero/non-zero at this stage */ - unsigned pkt_count; - - /* the network address of the client */ - char *client_addr; - } socket; + /* a count of the number of packets we have received. We + * actually only care about zero/non-zero at this stage */ + unsigned pkt_count; /* context that has been negotiated between the client and server */ struct { -- cgit