diff options
| author | Simo Sorce <idra@samba.org> | 2010-07-16 09:57:03 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2010-07-16 09:57:03 -0400 |
| commit | 378e4d5b8d30733f0f28cc2bceb28d9b9b594707 (patch) | |
| tree | 9f6faebdcf58c73e0297bfdf3b905ef256f8e478 /source4/smb_server/smb/receive.c | |
| parent | 2f249538ac8f2a54d9c8f8dbf0107db2f33bfe16 (diff) | |
| parent | 6b266b85cf34145ac1f03d8f787b81121e4ec92b (diff) | |
| download | samba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.tar.gz samba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.tar.bz2 samba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4/smb_server/smb/receive.c')
| -rw-r--r-- | source4/smb_server/smb/receive.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/smb_server/smb/receive.c b/source4/smb_server/smb/receive.c index f58071bf55..c2503efabc 100644 --- a/source4/smb_server/smb/receive.c +++ b/source4/smb_server/smb/receive.c @@ -663,12 +663,12 @@ NTSTATUS smbsrv_init_smb_connection(struct smbsrv_connection *smb_conn, struct l /* this is the size that w2k uses, and it appears to be important for good performance */ - smb_conn->negotiate.max_recv = lp_max_xmit(lp_ctx); + smb_conn->negotiate.max_recv = lpcfg_max_xmit(lp_ctx); smb_conn->negotiate.zone_offset = get_time_zone(time(NULL)); - smb_conn->config.security = lp_security(lp_ctx); - smb_conn->config.nt_status_support = lp_nt_status_support(lp_ctx); + smb_conn->config.security = lpcfg_security(lp_ctx); + smb_conn->config.nt_status_support = lpcfg_nt_status_support(lp_ctx); status = smbsrv_init_sessions(smb_conn, UINT16_MAX); NT_STATUS_NOT_OK_RETURN(status); |