s3-param: Use same function name for "max xmit" as lib/param

Again, this helps with merging the FN_ list.

Andrew Bartlett

diff --git a/source3/include/proto.h b/source3/include/proto.h
index b7bb95998b4378b35378d810a192e2f8b1a40120..b8a2409ab5a9c362083fff5360b5ce6b371f77b3 100644 (file)
--- 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 6e1769a2fbcf75c994d66fedceebdc8d0789a743..308069652f66f3310b466f6484c479479da10944 100644 (file)
--- 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 f955959fd411cee0ab49eabbf7894b40c8c0039f..2d38e049a96307c970d47f7f5c792dc31f2a959e 100644 (file)
--- 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;