diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-05-28 17:28:04 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-05-30 04:15:12 +0200 |
| commit | 9f4b6fa0ccdd5b0f499a26aa246e04d6652befc9 (patch) | |
| tree | 1032dd17ca55bfcc509b5faefa1e6b17614c8543 | |
| parent | 21681569795040c62e5cbd38b39ae4df351cbe23 (diff) | |
| download | samba-9f4b6fa0ccdd5b0f499a26aa246e04d6652befc9.tar.gz samba-9f4b6fa0ccdd5b0f499a26aa246e04d6652befc9.tar.bz2 samba-9f4b6fa0ccdd5b0f499a26aa246e04d6652befc9.zip | |
s3-param: Use same function name for "max xmit" as lib/param
Again, this helps with merging the FN_ list.
Andrew Bartlett
| -rw-r--r-- | source3/include/proto.h | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 2 | ||||
| -rw-r--r-- | source3/smbd/process.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index b7bb95998b..b8a2409ab5 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1241,7 +1241,7 @@ int lp_min_wins_ttl(void); int lp_max_log_size(void); int lp_max_open_files(void); int lp_open_files_db_hash_size(void); -int lp_maxxmit(void); +int lp_max_xmit(void); int lp_maxmux(void); int lp_passwordlevel(void); int lp_usernamelevel(void); diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 6e1769a2fb..308069652f 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -5223,7 +5223,7 @@ FN_GLOBAL_INTEGER(max_smbd_processes, iMaxSmbdProcesses) FN_GLOBAL_INTEGER(max_stat_cache_size, iMaxStatCacheSize) FN_GLOBAL_INTEGER(max_ttl, max_ttl) FN_GLOBAL_INTEGER(max_wins_ttl, max_wins_ttl) -FN_GLOBAL_INTEGER(maxxmit, max_xmit) +FN_GLOBAL_INTEGER(max_xmit, max_xmit) FN_GLOBAL_INTEGER(min_wins_ttl, min_wins_ttl) FN_GLOBAL_INTEGER(name_cache_timeout, name_cache_timeout) FN_GLOBAL_INTEGER(open_files_db_hash_size, open_files_db_hash_size) diff --git a/source3/smbd/process.c b/source3/smbd/process.c index f955959fd4..2d38e049a9 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -3466,7 +3466,7 @@ void smbd_process(struct tevent_context *ev_ctx, sconn->nbt.got_session = false; - sconn->smb1.negprot.max_recv = MIN(lp_maxxmit(),BUFFER_SIZE); + sconn->smb1.negprot.max_recv = MIN(lp_max_xmit(),BUFFER_SIZE); sconn->smb1.sessions.done_sesssetup = false; sconn->smb1.sessions.max_send = BUFFER_SIZE; |