diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-11-02 02:57:18 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:13 -0500 |
| commit | edbfc0f6e70150e321822365bf0eead2821551bd (patch) | |
| tree | 38164393e1f9b5225662453fb6253947e7fdc086 /source4/param/loadparm.c | |
| parent | 452ddd94ba22bebe0fda5ee6a7ddceae2057fe40 (diff) | |
| download | samba-edbfc0f6e70150e321822365bf0eead2821551bd.tar.gz samba-edbfc0f6e70150e321822365bf0eead2821551bd.tar.bz2 samba-edbfc0f6e70150e321822365bf0eead2821551bd.zip | |
r3453: - split out the auth and popt includes
- tidied up some of the system includes
- moved a few more structures back from misc.idl to netlogon.idl and samr.idl now that pidl
knows about inter-IDL dependencies
(This used to be commit 7b7477ac42d96faac1b0ff361525d2c63cedfc64)
Diffstat (limited to 'source4/param/loadparm.c')
| -rw-r--r-- | source4/param/loadparm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 8e6538cc12..5b46118200 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -55,6 +55,7 @@ #include "includes.h" #include "system/time.h" #include "system/iconv.h" +#include "system/network.h" #include "librpc/gen_ndr/ndr_svcctl.h" BOOL in_client = False; /* Not in the client by default */ @@ -911,7 +912,9 @@ static void init_globals(void) /* options that can be set on the command line must be initialised via the slower do_parameter() to ensure that FLAG_CMDLINE is obeyed */ - do_parameter("socket options", DEFAULT_SOCKET_OPTIONS); +#ifdef TCP_NODELAY + do_parameter("socket options", "TCP_NODELAY"); +#endif do_parameter("workgroup", DEFAULT_WORKGROUP); do_parameter("netbios name", get_myname()); do_parameter("max protocol", "NT1"); |