From 0e8fd3398771da2f016d72830179507f3edda51b Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Sat, 4 May 1996 07:50:46 +0000 Subject: Initial version imported to CVS (This used to be commit 291551d80711daab7b7581720bcd9a08d6096517) --- source3/include/local.h | 167 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) create mode 100644 source3/include/local.h (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h new file mode 100644 index 0000000000..2775453e15 --- /dev/null +++ b/source3/include/local.h @@ -0,0 +1,167 @@ +/* local definitions for file server */ +#ifndef _LOCAL_H +#define _LOCAL_H + +/* This defines the section name in the configuration file that will contain */ +/* global parameters - that is, parameters relating to the whole server, not */ +/* just services. This name is then reserved, and may not be used as a */ +/* a service name. It will default to "global" if not defined here. */ +#define GLOBAL_NAME "global" +#define GLOBAL_NAME2 "globals" + +/* This defines the section name in the configuration file that will + refer to the special "homes" service */ +#define HOMES_NAME "homes" + +/* This defines the section name in the configuration file that will + refer to the special "printers" service */ +#define PRINTERS_NAME "printers" + +/* This defines the name of the printcap file. It is MOST UNLIKELY that + this will change BUT! Specifying a file with the format of a printcap + file but containing only a subset of the printers actually in your real + printcap file is a quick-n-dirty way to allow dynamic access to a subset + of available printers. +*/ +#define PRINTCAP_NAME "/etc/printcap" + +/* set these to define the limits of the server. NOTE These are on a + per-client basis. Thus any one machine can't connect to more than + MAX_CONNECTIONS services, but any number of machines may connect at + one time. */ +#define MAX_CONNECTIONS 127 +#define MAX_OPEN_FILES 100 + +/* the max number of connections that the smbstatus program will show */ +#define MAXSTATUS 1000 + +/* max number of directories open at once */ +/* note that with the new directory code this no longer requires a + file handle per directory, but large numbers do use more memory */ +#define MAXDIR 64 + +#define WORDMAX 0xFFFF + + +/* separators for lists */ +#define LIST_SEP " \t,;:\n\r" + +#ifndef LOCKDIR +#define LOCKDIR "/tmp/samba" +#endif + +/* this is where browse lists are kept in the lock dir */ +#define SERVER_LIST "browse.dat" + +/* the print command on the server, %s is replaced with the filename */ +/* note that the -r removes the file after printing - you'll run out */ +/* of disk pretty quickly if you don't. This command is only used as */ +/* the default - it can be overridden in the configuration file. */ +#define PRINT_COMMAND "lpr -r %s" + +/* the lpq command on the server. the printername is passed as an argument */ +#ifndef LPQ_COMMAND +#define LPQ_COMMAND "lpq -P" +#endif + +/* shall guest entries in printer queues get changed to user entries, + so they can be deleted using the windows print manager? */ +#define LPQ_GUEST_TO_USER + +/* shall filenames with illegal chars in them get mangled in long + filename listings? */ +#define MANGLE_LONG_FILENAMES + +/* define this if you want to stop spoofing with .. and soft links + NOTE: This also slows down the server considerably */ +#define REDUCE_PATHS + +/* the size of the directory cache */ +#define DIRCACHESIZE 20 + +/* what type of filesystem do we want this to show up as in a NT file + manager window? */ +#define FSTYPE_STRING "Samba" + +/* we have two time standards - local and GMT. This will try to sort them out. + */ + +#define LOCAL_TO_GMT 1 +#define GMT_TO_LOCAL (-1) + +/* do you want smbd to send a 1 byte packet to nmbd to trigger it to start + when smbd starts? */ +#ifndef PRIME_NMBD +#define PRIME_NMBD 1 +#endif + +/* do you want session setups at user level security with a invalid + password to be rejected or allowed in as guest? WinNT rejects them + but it can be a pain as it means "net view" needs to use a password + + You have 3 choices: + + GUEST_SESSSETUP = 0 means session setups with an invalid password + are rejected. + + GUEST_SESSSETUP = 1 means session setups with an invalid password + are rejected, unless the username does not exist, in which case it + is treated as a guest login + + GUEST_SESSSETUP = 2 means session setups with an invalid password + are treated as a guest login + + Note that GUEST_SESSSETUP only has an effect in user or server + level security. + */ +#ifndef GUEST_SESSSETUP +#define GUEST_SESSSETUP 0 +#endif + +/* the default pager to use for the client "more" command. Users can + override this with the PAGER environment variable */ +#ifndef PAGER +#define PAGER "more" +#endif + +/* the size of the uid cache used to reduce valid user checks */ +#define UID_CACHE_SIZE 4 + +/* the following control timings of various actions. Don't change + them unless you know what you are doing. These are all in seconds */ +#define DEFAULT_SMBD_TIMEOUT (60*60*24*7) +#define SMBD_RELOAD_CHECK (10) +#define SHARE_MODES_CHECK (10) +#define SHARE_MODES_CLEAN (300) +#define IDLE_CLOSED_TIMEOUT (60) +#define DPTR_IDLE_TIMEOUT (120) +#define SMBD_SELECT_LOOP (10) +#define NMBD_SELECT_LOOP (10) +#define BROWSE_INTERVAL (60) +#define REGISTRATION_INTERVAL (10*60) +#define NMBD_INETD_TIMEOUT (120) +#define NMBD_MAX_TTL (24*60*60) +#define LPQ_LOCK_TIMEOUT (5) + +/* the following are in milliseconds */ +#define LOCK_RETRY_TIMEOUT (100) + +/* do you want to dump core (carefully!) when an internal error is + encountered? Samba will be careful to make the core file only + accessible to root */ +#define DUMP_CORE 1 + +/* what is the longest significant password available on your system? + Knowing this speeds up password searches a lot */ +#ifndef PASSWORD_LENGTH +#define PASSWORD_LENGTH 8 +#endif + +#define SMB_ALIGNMENT 1 + + +/* shall we support browse requests via a FIFO to nmbd? */ +#define ENABLE_FIFO 1 + + +#endif -- cgit From 11f7553c7495ecae3e918d8329107174c2ce0149 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 5 May 1996 11:25:07 +0000 Subject: turn on KEEP_PASSWORD_SERVER_OPEN by default (This used to be commit d2676cdd0b44fc4fc825118e510bac2c3f1e40d9) --- source3/include/local.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 2775453e15..fba7955902 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -163,5 +163,8 @@ /* shall we support browse requests via a FIFO to nmbd? */ #define ENABLE_FIFO 1 +/* keep the password server open, this uses up a aocket, but is needed + by many apps */ +#define KEEP_PASSWORD_SERVER_OPEN 1 #endif -- cgit From 58734631b4233ec08b7a262587e400792f31f185 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 31 May 1996 15:13:29 +0000 Subject: Lots of changes! - add faq info on NT printer handling - add "delete readonly" option to help rcs users - add stuff to man pages on new printer options - add "proxy name resolution" option - add "command string" -c option to smbclient (thanks Ken) - split time functions into time.c - rearrange the quotas stuff a bit and fix some bugs - complete rehash of the time handling code thanks to Paul Eggert - fix nmblookup output a bit - add plp print queue parsing from Bertrand Wallrich (This used to be commit 635b56f19c817527c52e9bbde31faa6a8a47777b) --- source3/include/local.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index fba7955902..9572243e73 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -83,12 +83,6 @@ manager window? */ #define FSTYPE_STRING "Samba" -/* we have two time standards - local and GMT. This will try to sort them out. - */ - -#define LOCAL_TO_GMT 1 -#define GMT_TO_LOCAL (-1) - /* do you want smbd to send a 1 byte packet to nmbd to trigger it to start when smbd starts? */ #ifndef PRIME_NMBD -- cgit From a2c1623827406667a4f2f058c24f1d971f6627f8 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 4 Jun 1996 06:42:03 +0000 Subject: a huge pile of changes :-) The biggest thing is the integration of Lukes new nmbd. Its still largely untested, so we will really need some feedback I've also added auto prototype generation and cleaned up a lot of minor things as a result (This used to be commit 0d8dcfa13c527ec2c8aca39ba49c09e4e694b26c) --- source3/include/local.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 9572243e73..2cfacd66b3 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -130,7 +130,7 @@ #define IDLE_CLOSED_TIMEOUT (60) #define DPTR_IDLE_TIMEOUT (120) #define SMBD_SELECT_LOOP (10) -#define NMBD_SELECT_LOOP (10) +#define NMBD_SELECT_LOOP (2) #define BROWSE_INTERVAL (60) #define REGISTRATION_INTERVAL (10*60) #define NMBD_INETD_TIMEOUT (120) -- cgit From 396311075cc808278e6dd8469e3ac7eb7e7498c7 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 13 Aug 1996 08:57:55 +0000 Subject: - sequent-ptx support from bressler@iftccu.ca.boeing.com (Rick Bressler) - machten support from Trevor Strohman (trev@figment.tenon.com) - added qinfo command to client as part of drag-and-drop printer support for win95 from David Chappell He also added the "printer driver" option - use sigblock() on more systems and use sigsetmask(0) instead of sigunblock() as its more portable. This beats a problem with zombies on heavilily loaded systems. - added internals.doc written by David Chappell into the source tree - get rid of PRINT_COMMAND options from local.h as they are no longer relevent - new kanji code from Fujita - don't set the recursion_available flag on queries in nmbd - fix a potential bug with pointer subtraction in printing.c - got rid of error_count code as the real fix (the EOF problem) is now in (This used to be commit aa6f8b04d125b5bc00f267abf72b800228aabf7d) --- source3/include/local.h | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 2cfacd66b3..5a577909e1 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -53,17 +53,6 @@ /* this is where browse lists are kept in the lock dir */ #define SERVER_LIST "browse.dat" -/* the print command on the server, %s is replaced with the filename */ -/* note that the -r removes the file after printing - you'll run out */ -/* of disk pretty quickly if you don't. This command is only used as */ -/* the default - it can be overridden in the configuration file. */ -#define PRINT_COMMAND "lpr -r %s" - -/* the lpq command on the server. the printername is passed as an argument */ -#ifndef LPQ_COMMAND -#define LPQ_COMMAND "lpq -P" -#endif - /* shall guest entries in printer queues get changed to user entries, so they can be deleted using the windows print manager? */ #define LPQ_GUEST_TO_USER -- cgit From 9155889092ac9ff476d950a0c1b624ebad3cdad6 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 22 Aug 1996 06:32:03 +0000 Subject: - add timeouts to connect() for password server connections. This makes multiple password servers practical. (This used to be commit 5c3e8326cc45d3cbd076475e445ce461a2bf7560) --- source3/include/local.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 5a577909e1..3f8572e73d 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -150,4 +150,8 @@ by many apps */ #define KEEP_PASSWORD_SERVER_OPEN 1 +/* how long to wait for a socket connect to happen */ +#define LONG_CONNECT_TIMEOUT 30 +#define SHORT_CONNECT_TIMEOUT 5 + #endif -- cgit From e23f2b9cef8428bda51b413642d9720ba5c590d5 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 4 Oct 1996 09:31:07 +0000 Subject: - changed the umask handling. We now set the umask to 0 and explicitly set the mode on all created files. I think this is a better policy. - change the debug levels on some items - fix a charset handling bug which affected foreign and extended charset users - no longer switch back to the original directory when idle, instead switch to / as the original directory may not be readable by ordinary users. - fix some bugs where the create mode of files was not being explicitly set (it was relying on the umask and using fopen). Not a big bug as it only affected obscure commands like the messaging ops. - got rid of the lock code in the lpq cache as its no longer needed - rewrote smbrun to be faster and to remove the security hole. We now don't actually need a external smbrun binary, its all done by smbd. - add a more explicit warning about uids and gids of -1 or 65535 (This used to be commit 5aa735c940ccdb6acae5f28449d484181c912e49) --- source3/include/local.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 3f8572e73d..115617094c 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -154,4 +154,8 @@ #define LONG_CONNECT_TIMEOUT 30 #define SHORT_CONNECT_TIMEOUT 5 + +/* the directory to sit in when idle */ +#define IDLE_DIR "/" + #endif -- cgit From 8781e4d787763a6b50d7b3819b33ace208ff7784 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 7 Oct 1996 01:56:21 +0000 Subject: - changed the default nmbd loop timout to 10 seconds (2 seconds was much too short) - got rid of many unnecessary calls to time(NULL) in nmbd. They were causing it to chew too much CPU time when idle. Now we pass a time value in from the top level. (This used to be commit 3cd7303dbc2118db7084a6d8872403d825c52323) --- source3/include/local.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 115617094c..465e0029b6 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -119,7 +119,7 @@ #define IDLE_CLOSED_TIMEOUT (60) #define DPTR_IDLE_TIMEOUT (120) #define SMBD_SELECT_LOOP (10) -#define NMBD_SELECT_LOOP (2) +#define NMBD_SELECT_LOOP (10) #define BROWSE_INTERVAL (60) #define REGISTRATION_INTERVAL (10*60) #define NMBD_INETD_TIMEOUT (120) -- cgit From ec85f2e53d18a818440cf716ad6b6892594cae85 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 7 Oct 1996 15:04:48 +0000 Subject: - revert to old idle dir code (marty pointed out a problem with the new code) - handle server level security in the new "detect NT password length stuffups" code (This used to be commit 7c135d499409d4ddedb978f681559dae90ac4288) --- source3/include/local.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 465e0029b6..12d3fb9e88 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -156,6 +156,6 @@ /* the directory to sit in when idle */ -#define IDLE_DIR "/" +/* #define IDLE_DIR "/" */ #endif -- cgit From 08d00eb68ee93eaead0f3bbaabc3d89540e0818e Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 24 Oct 1996 00:09:08 +0000 Subject: - added support for TMPDIR env variable - fixed fault.c for linux 2.1 - put back in the FIND_SELF failing code - cleaned up casts in encryption (This used to be commit 3af04f1580b2569c0a4f2549bf6352c7a25afa0d) --- source3/include/local.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 12d3fb9e88..01eac55652 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -47,6 +47,7 @@ #define LIST_SEP " \t,;:\n\r" #ifndef LOCKDIR +/* this should have been set in the Makefile */ #define LOCKDIR "/tmp/samba" #endif -- cgit From 0776dea81fbf353669714a5e3ff6d62ff6303ed6 Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Mon, 14 Jul 1997 19:45:34 +0000 Subject: local.h: Removed ununsed SHARE_MODES_XXX defines. Upped SMBD_RELOAD_CHECK from 10 to 60. server.c: Removed unused code (was If 0'ed out). trans2.c: Backed out Luke's ctime->mtime change. I don't think it is correct. Left the other fixes, though. util.c: Changed veto/hide files separator back to '/'. Jeremy (jallison@whistle.com) (This used to be commit b47121624c8824d3e1d8992cb950ebad52ba5c58) --- source3/include/local.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 01eac55652..fc589d7ac0 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -114,9 +114,7 @@ /* the following control timings of various actions. Don't change them unless you know what you are doing. These are all in seconds */ #define DEFAULT_SMBD_TIMEOUT (60*60*24*7) -#define SMBD_RELOAD_CHECK (10) -#define SHARE_MODES_CHECK (10) -#define SHARE_MODES_CLEAN (300) +#define SMBD_RELOAD_CHECK (60) #define IDLE_CLOSED_TIMEOUT (60) #define DPTR_IDLE_TIMEOUT (120) #define SMBD_SELECT_LOOP (10) -- cgit From cef59090bb2fd3f8a9efd1a453cb90264b891d58 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 26 Sep 1997 18:55:29 +0000 Subject: Adding Andrews buffer overflow fixes into the main branch. Jeremy (jallison@whistle.com) (This used to be commit e7eb1f044d3101679dc7a118820ea5efe0cd837c) --- source3/include/local.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index fc589d7ac0..9548bf74b6 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -42,6 +42,8 @@ #define WORDMAX 0xFFFF +/* the maximum password length before we declare a likely attack */ +#define MAX_PASSWORD_LENGTH 200 /* separators for lists */ #define LIST_SEP " \t,;:\n\r" -- cgit From a0cd12e221af54e00aa7dd971c080881da8b32ac Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 30 Sep 1997 02:38:19 +0000 Subject: dir.c: more pstrcpys. local.h: Add OPLOCK_BREAK_TIMEOUT. password.c: Fix for paranoia password server security bug. proto.h: Updated. reply.c: Oplock changes. server.c: Massive oplock changes - nearly there.... smb.h: oplock definitions. util.c: Add local message processing queues for oplocks. Jeremy (jallison@whistle.com) (This used to be commit 92f1553db2cdf6f32881eb984a87050cf3e4760b) --- source3/include/local.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 9548bf74b6..e7eff2a300 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -159,4 +159,9 @@ /* the directory to sit in when idle */ /* #define IDLE_DIR "/" */ +/* Timout (in seconds) to wait for an oplock breal + message to return. */ + +#define OPLOCK_BREAK_TIMEOUT 120 + #endif -- cgit From 5864551aef50295addd1c8aa690a52870f70626d Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 1 Oct 1997 23:32:22 +0000 Subject: OPLOCK CHECK-IN - oplocks are now *OPERATIONAL* !!!! Yipeee. At least as far as I can check in a short time :-). local.h: Changed OPLOCK_BREAK_TIMEOUT to 30 seconds. locking.c: Big changes to delete oplocks on a share mode entry. proto.h: updated. reply.c: Added oplock break code in lockingX reply & readbraw reply. server.c: Add batch oplock code. Force server shutdown if client fails to respond to oplock break. smb.h: Fix silly slow share mode oplock define bug. status.c: Add oplock status info. Jeremy (jallison@whistle.com) (This used to be commit 4c83d37239f15f855fc10f01d7b4bf4217fb9eda) --- source3/include/local.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index e7eff2a300..3ce75eeb4e 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -162,6 +162,6 @@ /* Timout (in seconds) to wait for an oplock breal message to return. */ -#define OPLOCK_BREAK_TIMEOUT 120 +#define OPLOCK_BREAK_TIMEOUT 30 #endif -- cgit From e5494e2c093fecd4b493ab925f7c7d30b79bc98d Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 9 Oct 1997 06:36:04 +0000 Subject: bracket some macros change MAX_PASSWORD_LENGTH to MAX_PASS_LEN to prevent conflict on some systems add #ifdef around soft link dependent code (for systems that don't have soft links) (This used to be commit e10ba4b97a219e87b62d32834bf15ed2e323ed2e) --- source3/include/local.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 3ce75eeb4e..22d1b2a08e 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -43,7 +43,7 @@ #define WORDMAX 0xFFFF /* the maximum password length before we declare a likely attack */ -#define MAX_PASSWORD_LENGTH 200 +#define MAX_PASS_LEN 200 /* separators for lists */ #define LIST_SEP " \t,;:\n\r" -- cgit From f3f44f7dbbc360733da329ef55bb0353ae0a8443 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 9 Oct 1997 18:40:52 +0000 Subject: local.h: Fix spelling mistake :-). namedbsubnet.c: Stop registering 1x name unless we can be a local master. reply.c: Remove ERRbaddirectory code. server.c: Remove abort() - use exit_server() instead. trans2.c: Remove ERRbaddirectory code. Jeremy (jallison@whistle.com) (This used to be commit 76247228896d39312ba896fa229076be3271e2e4) --- source3/include/local.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 22d1b2a08e..97857727c7 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -159,7 +159,7 @@ /* the directory to sit in when idle */ /* #define IDLE_DIR "/" */ -/* Timout (in seconds) to wait for an oplock breal +/* Timout (in seconds) to wait for an oplock break message to return. */ #define OPLOCK_BREAK_TIMEOUT 30 -- cgit From ac219021786268533540009b8d8598f87568338f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 21 Oct 1997 09:11:19 +0000 Subject: get rid of the KEEP_PASSWORD_SERVER_OPEN define (This used to be commit ed484d4501e855f467ce2b3cfa63855acfe5e516) --- source3/include/local.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 97857727c7..a218dd8fc6 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -147,10 +147,6 @@ /* shall we support browse requests via a FIFO to nmbd? */ #define ENABLE_FIFO 1 -/* keep the password server open, this uses up a aocket, but is needed - by many apps */ -#define KEEP_PASSWORD_SERVER_OPEN 1 - /* how long to wait for a socket connect to happen */ #define LONG_CONNECT_TIMEOUT 30 #define SHORT_CONNECT_TIMEOUT 5 -- cgit From 464dc5433641566abeeabd07f46ab569c986a3b0 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 27 Oct 1997 13:38:07 +0000 Subject: also disable read prediction in 1.9.18 (This used to be commit 0f15558efb26b7215540a588dfe8733e9346d407) --- source3/include/local.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index a218dd8fc6..c1f1de2132 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -160,4 +160,9 @@ #define OPLOCK_BREAK_TIMEOUT 30 + +/* the read preciction code has been disabled until some problems with + it are worked out */ +#define USE_READ_PREDICTION 0 + #endif -- cgit From ec35f1c1cc363b84867fea49f6b2b5e3c0b9b889 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 6 Nov 1997 19:11:16 +0000 Subject: local.h: Added OPLOCK_BREAK_TIMEOUT_FUDGEFACTOR. proto.h: The usual. server.c: Added timestring() messages to oplock logs. Added fix to allow file open processing to continue is an oplock break message times out. Jeremy. (This used to be commit c45369217169fac261b32db71469c007db4b4a03) --- source3/include/local.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index c1f1de2132..ae791d84e6 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -156,10 +156,14 @@ /* #define IDLE_DIR "/" */ /* Timout (in seconds) to wait for an oplock break - message to return. */ + message to return from the client. */ #define OPLOCK_BREAK_TIMEOUT 30 +/* Timout (in seconds) to add to the oplock break timeout + to wait for the smbd to smbd message to return. */ + +#define OPLOCK_BREAK_TIMEOUT_FUDGEFACTOR 2 /* the read preciction code has been disabled until some problems with it are worked out */ -- cgit From 6a012a815317e2a3a31d2816943ae0750eb15cd5 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 2 Dec 1997 23:28:14 +0000 Subject: the default GUEST_ACCOUNT should be here not in smb.h (This used to be commit 13c2f432d61381a055378d303dfc8806ea4eea42) --- source3/include/local.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index ae791d84e6..2e7fa22354 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -75,6 +75,12 @@ manager window? */ #define FSTYPE_STRING "Samba" + +/* the default guest account - normally set in the Makefile or smb.conf */ +#ifndef GUEST_ACCOUNT +#define GUEST_ACCOUNT "nobody" +#endif + /* do you want smbd to send a 1 byte packet to nmbd to trigger it to start when smbd starts? */ #ifndef PRIME_NMBD -- cgit From cc12fc66d1f958c3c04d6f106b4e9128f6bce925 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 3 Dec 1997 03:21:25 +0000 Subject: I'm slowly getting though the todo list :-) This change allows people to select the SYSLOG_FACILITY in local.h, or add it to the Makefile if they want to. (This used to be commit afe88facbfb85113105bf516e066b6c1e971f6b7) --- source3/include/local.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 2e7fa22354..9a31032ee6 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -25,6 +25,11 @@ */ #define PRINTCAP_NAME "/etc/printcap" +/* define what facility to use for syslog */ +#ifndef SYSLOG_FACILITY +#define SYSLOG_FACILITY LOG_DAEMON +#endif + /* set these to define the limits of the server. NOTE These are on a per-client basis. Thus any one machine can't connect to more than MAX_CONNECTIONS services, but any number of machines may connect at -- cgit From 69460b470f44c82b677a41d65ab4e172fc7b284b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 3 Dec 1997 03:43:05 +0000 Subject: allow users to disable the NetWkstaUserLogon call in server level security by changing a setting in local.h or adding it to their Makefile. See comment in local.h (This used to be commit cc10fdf7583ec644850445ad96afd8b22b71e86f) --- source3/include/local.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 9a31032ee6..ca8d231dcd 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -25,6 +25,16 @@ */ #define PRINTCAP_NAME "/etc/printcap" +/* this affects server level security. With this set (recommended) + samba will do a full NetWkstaUserLogon to confirm that the client + really should have login rights. This can cause problems with + machines in trust relationships in which case you can disable it + here, but be warned, we have heard that some NT machines will then + allow anyone in with any password! Make sure you test it. */ +#ifndef USE_NETWKSTAUSERLOGON +#define USE_NETWKSTAUSERLOGON 1 +#endif + /* define what facility to use for syslog */ #ifndef SYSLOG_FACILITY #define SYSLOG_FACILITY LOG_DAEMON -- cgit From 7a668a7641cd747455b7a9854dbc208a3e4bc7ef Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 3 Dec 1997 05:08:07 +0000 Subject: applied a patch from Norm Jacobs to allow "printcap name = lpstat" to use lpstat to obtain the printer list on systemV systems. I've now made this the default on all SYSV systems. Jeremy, you were a little worried about the security of this patch. I believe it's OK as the user has no control over the options given to popen() and the pipe is only open for reading. (This used to be commit 6a83de0ae954bb18d3f15382f2b0b3259fedff09) --- source3/include/local.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index ca8d231dcd..c4bdcc80d5 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -23,7 +23,16 @@ printcap file is a quick-n-dirty way to allow dynamic access to a subset of available printers. */ + +#ifndef PRINTCAP_NAME +#ifdef AIX +#define PRINTCAP_NAME "/etc/qconfig" +#elif defined(SYSV) +#define PRINTCAP_NAME "lpstat" +#else #define PRINTCAP_NAME "/etc/printcap" +#endif +#endif /* this affects server level security. With this set (recommended) samba will do a full NetWkstaUserLogon to confirm that the client -- cgit From e94d5632392bb98d026ef2076702ef7b0870aea5 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 3 Dec 1997 05:22:24 +0000 Subject: put the default PRINTCAP_NAME def in includes.h not local.h so that it can see the SYSV definitions (This used to be commit e439115366804982af6faba75714dbe2626edead) --- source3/include/local.h | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index c4bdcc80d5..10906d1ff1 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -17,23 +17,6 @@ refer to the special "printers" service */ #define PRINTERS_NAME "printers" -/* This defines the name of the printcap file. It is MOST UNLIKELY that - this will change BUT! Specifying a file with the format of a printcap - file but containing only a subset of the printers actually in your real - printcap file is a quick-n-dirty way to allow dynamic access to a subset - of available printers. -*/ - -#ifndef PRINTCAP_NAME -#ifdef AIX -#define PRINTCAP_NAME "/etc/qconfig" -#elif defined(SYSV) -#define PRINTCAP_NAME "lpstat" -#else -#define PRINTCAP_NAME "/etc/printcap" -#endif -#endif - /* this affects server level security. With this set (recommended) samba will do a full NetWkstaUserLogon to confirm that the client really should have login rights. This can cause problems with -- cgit From 89652787c3894c7a79345a2ea67a4de741a0f760 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 29 Jan 1998 08:25:46 +0000 Subject: Makefile: Fix for OSF1 typo. asyncdns.c: Fixes that went into 1.9.18p2 - allow unclocking of sigterm. chgpasswd.c: char -> unsigned char fixes. includes.h: AIX fix to get prototype for inet_ntoa. local.h: Tune size of shared memory based on MAX_OPEN_FILES. nmbd_mynames.c: Fix for nmbd repeated refresh bug. nmbd_responserecordsdb.c: Fix for nmbd repeated refresh bug. nmbd_winsserver.c: Fix for multi-homed registration optimisation. smb.h: Moved default shared memory size to local.h Jeremy. (This used to be commit fa5466805685d461564054d7d9947948fc56ae93) --- source3/include/local.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 10906d1ff1..0e2a927d2e 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -39,6 +39,11 @@ #define MAX_CONNECTIONS 127 #define MAX_OPEN_FILES 100 +/* Default size of shared memory used for share mode locking */ +#ifndef SHMEM_SIZE +#define SHMEM_SIZE (1024*MAX_OPEN_FILES) +#endif + /* the max number of connections that the smbstatus program will show */ #define MAXSTATUS 1000 -- cgit From 5546e28e69b1a43dbb48e024e233d8ebf7fa667a Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Sat, 7 Feb 1998 12:15:20 +0000 Subject: A small raft of changes, I will sync up with 1.9.18 also. chgpasswd.c: Fixed typo in debug message. includes.h: Fix include for aix. kanji.c: Added cap_to_sj as inverse of sj_to_cap. loadparm.c: local.h: password.c: Added code for "networkstation user login" parameter. - patch from Rob Nielsen . printing.c: Added further aix printing fixes. reply.c: Changed access time fetch to a function. trans2.c: Changed access time fetch to a function. time.c: Changed access time fetch to a function. server.c: Made NT redirector workaround final. util.c: Added debug for write_socket failing. Jeremy. (This used to be commit a031404623c22d62f8de035be2239f609af08112) --- source3/include/local.h | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 0e2a927d2e..b2a8f5ec57 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -17,16 +17,6 @@ refer to the special "printers" service */ #define PRINTERS_NAME "printers" -/* this affects server level security. With this set (recommended) - samba will do a full NetWkstaUserLogon to confirm that the client - really should have login rights. This can cause problems with - machines in trust relationships in which case you can disable it - here, but be warned, we have heard that some NT machines will then - allow anyone in with any password! Make sure you test it. */ -#ifndef USE_NETWKSTAUSERLOGON -#define USE_NETWKSTAUSERLOGON 1 -#endif - /* define what facility to use for syslog */ #ifndef SYSLOG_FACILITY #define SYSLOG_FACILITY LOG_DAEMON @@ -37,7 +27,7 @@ MAX_CONNECTIONS services, but any number of machines may connect at one time. */ #define MAX_CONNECTIONS 127 -#define MAX_OPEN_FILES 100 +#define MAX_OPEN_FILES 10 /* Default size of shared memory used for share mode locking */ #ifndef SHMEM_SIZE -- cgit From 99e11e171e40703271ad2a7934708cee66b0bb82 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 11 Feb 1998 11:07:14 +0000 Subject: Makefile: Added AIX 3.2.5. loadparm.c: Added "win95 bug compatibility" parameter. local.h: Replaced MAX_OPEN_FILES back to 100 from 10 (oops). reply.c: Fixed ulogoff check against uid - changed to vuid. server.c: Changed file struct save of uid - changed to vuid. smb.h: Changed id in struct current_user to vuid. Changed file struct uid to vuid. time.c: Added "win95 bug compatibility" atime -> mtime return. trans2.c: Added "win95 bug compatibility" fixes. uid.c: Changed id in struct current_user to vuid - added checks to set/reset it. util.c: Added code to expand environment variables. version.h : still at 1.9.18 (head branch doesn't matter too much at present). Jeremy. (This used to be commit adc903bcf59ad1664babd7f1d43675d3a75bfbc9) --- source3/include/local.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index b2a8f5ec57..22862a9a1f 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -27,7 +27,7 @@ MAX_CONNECTIONS services, but any number of machines may connect at one time. */ #define MAX_CONNECTIONS 127 -#define MAX_OPEN_FILES 10 +#define MAX_OPEN_FILES 100 /* Default size of shared memory used for share mode locking */ #ifndef SHMEM_SIZE -- cgit From c4855a8e028914281f179bd3bce8fc7cb249eaf7 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 16 Mar 1998 07:23:51 +0000 Subject: changed the default "keepalive" value to 300 seconds. This is more important now that oplocks are being used. (This used to be commit 7bccd2c360a270df227c140aeecb943d8d187855) --- source3/include/local.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 22862a9a1f..d9e12e506b 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -159,6 +159,8 @@ #define LONG_CONNECT_TIMEOUT 30 #define SHORT_CONNECT_TIMEOUT 5 +/* the default netbios keepalive timeout */ +#define DEFAULT_KEEPALIVE 300 /* the directory to sit in when idle */ /* #define IDLE_DIR "/" */ -- cgit From 15cf7db4c94042a512864a07437689a19609acbe Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 17 Mar 1998 00:02:19 +0000 Subject: changed the default MAXSTATUS from 1000 to 100000 This number limits the number of simultaneous connections to the server. The 1000 limit is from a looong time ago when I couldn't imagine anyone wanting to have 1000 simultaneous clients. Now I hear that people are testing with such numbers. I wonder when I'll change it from 100k ? (This used to be commit bae865da2dca175a8fe25922aeee8e785521e19b) --- source3/include/local.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index d9e12e506b..9a62aa7eb3 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -34,8 +34,8 @@ #define SHMEM_SIZE (1024*MAX_OPEN_FILES) #endif -/* the max number of connections that the smbstatus program will show */ -#define MAXSTATUS 1000 +/* the max number of simultanous connections to the server by all clients */ +#define MAXSTATUS 100000 /* max number of directories open at once */ /* note that with the new directory code this no longer requires a -- cgit From bee4067bd4771ee7883ab6365e91df86a1230618 Mon Sep 17 00:00:00 2001 From: John Terpstra Date: Sat, 21 Mar 1998 03:03:59 +0000 Subject: Getting ready for first Red Hat Linux RPMs for 1.9.19 pre-alpha release (This used to be commit 4e424d0ba652bf9c5dfd3c44216b6145538cf821) --- source3/include/local.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 9a62aa7eb3..144c2d2838 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -1,3 +1,6 @@ +/* Copyright (C) 1995-1998 Samba-Team */ +/* Copyright (C) 1998 John H Terpstra */ + /* local definitions for file server */ #ifndef _LOCAL_H #define _LOCAL_H @@ -17,6 +20,11 @@ refer to the special "printers" service */ #define PRINTERS_NAME "printers" +/* Yves Gaige requested this set this */ +/* to a maximum of 8 if old smb clients break because of long printer names. */ +#define MAXPRINTERLEN 15 + + /* define what facility to use for syslog */ #ifndef SYSLOG_FACILITY #define SYSLOG_FACILITY LOG_DAEMON -- cgit From b61b50ac2c42968a499d1c048fa5ee89e321f8a0 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 17 Jul 1998 00:47:16 +0000 Subject: local.h: Added NTFS define if HAVE_NT_SMBS is defined. nttrans.c: Fixed issue with access DELETE on renaming files. Jeremy. (This used to be commit 0fcf167af898a9c7a20fddc0d95c887477a22ed1) --- source3/include/local.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 144c2d2838..f32700c0eb 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -83,8 +83,11 @@ /* what type of filesystem do we want this to show up as in a NT file manager window? */ +#ifdef HAVE_NT_SMBS +#define FSTYPE_STRING "NTFS" +#else /* HAVE_NT_SMBS */ #define FSTYPE_STRING "Samba" - +#endif /* HAVE_NT_SMBS */ /* the default guest account - normally set in the Makefile or smb.conf */ #ifndef GUEST_ACCOUNT -- cgit From 471087c9d28a4058efc16f98784cb179ffc1e4c4 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 17 Jul 1998 22:21:24 +0000 Subject: Code added to fix the renaming of a directory under NT SMB calls. local.h: Changed MAXDIR to MAX_OPEN_DIRECTORIES - shmem size also tuned by this. dir.c: Use MAX_OPEN_DIRECTORIES. nttrans.c: Allow opening of a directory to succeed. Doesn't actually open a file descriptor but takes a files_struct slot marked as an fd. reply.c: Changed to close any outstanding is_directory files. reply_close changed to understand directory files. server.c: Added open_directory(), close_directory() calls. smb.h: Added is_directory to files_struct. Changed OPEN_FNUM to check that target is !is_directory (this prevents the normal file calls from processing a directory files_struct. Jeremy. (This used to be commit e01ce693f47e75e277f3440d46e32b0bd866b550) --- source3/include/local.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index f32700c0eb..4a69325b77 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -37,19 +37,19 @@ #define MAX_CONNECTIONS 127 #define MAX_OPEN_FILES 100 +/* max number of directories open at once */ +/* note that with the new directory code this no longer requires a + file handle per directory, but large numbers do use more memory */ +#define MAX_OPEN_DIRECTORIES 64 + /* Default size of shared memory used for share mode locking */ #ifndef SHMEM_SIZE -#define SHMEM_SIZE (1024*MAX_OPEN_FILES) +#define SHMEM_SIZE (1024*(MAX_OPEN_FILES+MAX_OPEN_DIRECTORIES)) #endif /* the max number of simultanous connections to the server by all clients */ #define MAXSTATUS 100000 -/* max number of directories open at once */ -/* note that with the new directory code this no longer requires a - file handle per directory, but large numbers do use more memory */ -#define MAXDIR 64 - #define WORDMAX 0xFFFF /* the maximum password length before we declare a likely attack */ -- cgit From f5866fd4ba8da9acde87c7f9da8f1a242540e287 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 22 Jul 1998 13:59:19 +0000 Subject: Fixed bug found by Richard Sharpe. After increasing files_struct size by MAX_OPEN_DIRECTORIES for nttrans I forgot to update the code that enumerates the array. Created new MAX_FNUMS in local.h, changed all code that iterates through the files_struct array to use this. (sorry Richard). Jeremy. (This used to be commit 339b10222269d71c7a493cc08b7b1bfd35fd55fc) --- source3/include/local.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 4a69325b77..a55af443ec 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -42,6 +42,8 @@ file handle per directory, but large numbers do use more memory */ #define MAX_OPEN_DIRECTORIES 64 +#define MAX_FNUMS (MAX_OPEN_FILES+MAX_OPEN_DIRECTORIES) + /* Default size of shared memory used for share mode locking */ #ifndef SHMEM_SIZE #define SHMEM_SIZE (1024*(MAX_OPEN_FILES+MAX_OPEN_DIRECTORIES)) -- cgit From 1aa138922e5c0e4925ff5cbfcdb4e7cad367b31b Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 27 Jul 1998 18:50:45 +0000 Subject: chgpasswd.c: Fixed up debug calls to stop crashes if ptsname failed. local.h: Kept FSTYPE_STRING as Samba for now. nmbd_browsesync.c: Added bugfix from Matt Chapman mattyc@cyberdude.com - lmb_browserlist is now a struct ubi_dlList not a struct browse_cache_record *. server.c: smb.h: uid.c: password.c: Removed attrs code - it is not used anywhere. Jeremy (This used to be commit ef1af7fe6d5c58ae57b8e4efff0729e1a315da43) --- source3/include/local.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index a55af443ec..0a369d80e2 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -85,11 +85,7 @@ /* what type of filesystem do we want this to show up as in a NT file manager window? */ -#ifdef HAVE_NT_SMBS -#define FSTYPE_STRING "NTFS" -#else /* HAVE_NT_SMBS */ #define FSTYPE_STRING "Samba" -#endif /* HAVE_NT_SMBS */ /* the default guest account - normally set in the Makefile or smb.conf */ #ifndef GUEST_ACCOUNT -- cgit From 64578c0589a3a741f81fb55c16eeb882128da00b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 29 Jul 1998 03:08:05 +0000 Subject: merge from the autoconf2 branch to the main branch (This used to be commit 3bda7ac417107a7b01d91805ca71c4330657ed21) --- source3/include/local.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 0a369d80e2..afe1a3b1c6 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -152,12 +152,6 @@ accessible to root */ #define DUMP_CORE 1 -/* what is the longest significant password available on your system? - Knowing this speeds up password searches a lot */ -#ifndef PASSWORD_LENGTH -#define PASSWORD_LENGTH 8 -#endif - #define SMB_ALIGNMENT 1 -- cgit From 35f815d2786ec1bd99676f62ff5e636e81809e51 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 9 Aug 1998 13:25:34 +0000 Subject: this gets smbd compiling and linking correctly with the new layout. (This used to be commit d08fa39cec5c71a9034dbf4241fc7e195f1bbaa5) --- source3/include/local.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index afe1a3b1c6..2350c00211 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -5,6 +5,11 @@ #ifndef _LOCAL_H #define _LOCAL_H +/* The default workgroup - usually overridden in smb.conf */ +#ifndef WORKGROUP +#define WORKGROUP "WORKGROUP" +#endif + /* This defines the section name in the configuration file that will contain */ /* global parameters - that is, parameters relating to the whole server, not */ /* just services. This name is then reserved, and may not be used as a */ -- cgit From c629b4c53f2523585e6b05de9589ae73ebe99e78 Mon Sep 17 00:00:00 2001 From: John Blair Date: Thu, 13 Aug 1998 18:56:09 +0000 Subject: Added the APPLEDOUBLE macro for the name of the directory containing a file's Macintosh resource fork (normally .AppleDouble under Netatalk). (This used to be commit 1313451f2161f69d33e7f1d41a1bf5615f61014c) --- source3/include/local.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 2350c00211..fb67babcda 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -187,4 +187,7 @@ it are worked out */ #define USE_READ_PREDICTION 0 +/* name of directory that netatalk uses to store macintosh resource forks */ +#define APPLEDOUBLE ".AppleDouble/" + #endif -- cgit From 127655cc888ac40332d4e8e5b94aab03f5120aae Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 15 Aug 1998 07:27:34 +0000 Subject: this checkin gets rid of the global Files[] array and makes it local in files.c it should now be faily easy to expand the default MAX_OPEN_FILES to many thousands. (This used to be commit b088c804f98908eb02f05ab2f2e8a61691a0a582) --- source3/include/local.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index fb67babcda..af12f83551 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -29,6 +29,10 @@ /* to a maximum of 8 if old smb clients break because of long printer names. */ #define MAXPRINTERLEN 15 +/* max number of directories open at once */ +/* note that with the new directory code this no longer requires a + file handle per directory, but large numbers do use more memory */ +#define MAX_OPEN_DIRECTORIES 64 /* define what facility to use for syslog */ #ifndef SYSLOG_FACILITY @@ -40,18 +44,13 @@ MAX_CONNECTIONS services, but any number of machines may connect at one time. */ #define MAX_CONNECTIONS 127 -#define MAX_OPEN_FILES 100 - -/* max number of directories open at once */ -/* note that with the new directory code this no longer requires a - file handle per directory, but large numbers do use more memory */ -#define MAX_OPEN_DIRECTORIES 64 -#define MAX_FNUMS (MAX_OPEN_FILES+MAX_OPEN_DIRECTORIES) +/* this must be larger than the sum of the open files and directories */ +#define PIPE_HANDLE_OFFSET 0x7000 /* Default size of shared memory used for share mode locking */ #ifndef SHMEM_SIZE -#define SHMEM_SIZE (1024*(MAX_OPEN_FILES+MAX_OPEN_DIRECTORIES)) +#define SHMEM_SIZE (1024*1024) #endif /* the max number of simultanous connections to the server by all clients */ -- cgit From f2d538a105a61ce6d2852700fc328e15ac158827 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 17 Aug 1998 03:06:20 +0000 Subject: some cleanups from the conversion of Pipes[] to a linked list. I also removed most cases where a pnum is used and substituted a pipes_struct*. in files.c I added a offset of 0x1000 to all file handles on the wire. This makes it much less likely that bad parsing will give us the wrong field. (This used to be commit 8bc2627ff28d340db65bfa017daca2dc291d5ef7) --- source3/include/local.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index af12f83551..1db1e9d4c1 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -45,9 +45,6 @@ one time. */ #define MAX_CONNECTIONS 127 -/* this must be larger than the sum of the open files and directories */ -#define PIPE_HANDLE_OFFSET 0x7000 - /* Default size of shared memory used for share mode locking */ #ifndef SHMEM_SIZE #define SHMEM_SIZE (1024*1024) -- cgit From 983dc71c9844675ad364f3ea59ddd04b87857b55 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 17 Aug 1998 06:13:32 +0000 Subject: moved connection_struct handling code into smbd/conn.c and changed it to a linked list with bitmap format. (This used to be commit b7aaab1b6b2d2f72b2bb7c11f5c7bf081a6093d9) --- source3/include/local.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 1db1e9d4c1..ead97e565d 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -39,12 +39,6 @@ #define SYSLOG_FACILITY LOG_DAEMON #endif -/* set these to define the limits of the server. NOTE These are on a - per-client basis. Thus any one machine can't connect to more than - MAX_CONNECTIONS services, but any number of machines may connect at - one time. */ -#define MAX_CONNECTIONS 127 - /* Default size of shared memory used for share mode locking */ #ifndef SHMEM_SIZE #define SHMEM_SIZE (1024*1024) -- cgit From c7da9992cb39fc84a6a915dd2158beaf5e616617 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 18 Sep 1998 03:00:20 +0000 Subject: gto ri of a bunch more #ifdef LARGE_SMB_OFF_T checks by introducing a SOFF_T() macro for setting an SMB_OFF_T variable also limited mmap based reads to MAX_MMAP_SIZE. We really can't mmap 2^50 bytes due to virtual address space problems. (This used to be commit 4e784b18899eddd2399a51fa7d8c219560432922) --- source3/include/local.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index ead97e565d..bf41af70d7 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -125,6 +125,11 @@ /* the size of the uid cache used to reduce valid user checks */ #define UID_CACHE_SIZE 4 +/* if mmap is enabled, then this is the maximum size of file to use + the mmap code on. We don't want to mmap huge files as virtual + address spaces are limited */ +#define MAX_MMAP_SIZE (100*0x100000) + /* the following control timings of various actions. Don't change them unless you know what you are doing. These are all in seconds */ #define DEFAULT_SMBD_TIMEOUT (60*60*24*7) -- cgit From bc97ab2b7ca6849696b391412333a96ff0ad682f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 20 Sep 1998 15:39:12 +0000 Subject: add a define for SMB_SEARCH_BITS and change comment on FSTYPE_STRING (This used to be commit 9c275bcd98cbbd9367d9b7a2204889fcefd74638) --- source3/include/local.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index bf41af70d7..f68f57eff7 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -78,8 +78,8 @@ /* the size of the directory cache */ #define DIRCACHESIZE 20 -/* what type of filesystem do we want this to show up as in a NT file - manager window? */ +/* what default type of filesystem do we want this to show up as in a + NT file manager window? */ #define FSTYPE_STRING "Samba" /* the default guest account - normally set in the Makefile or smb.conf */ -- cgit From 6da95a6f1d17ad69ab572fbc627167f5edb593fb Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 26 Sep 1998 10:31:40 +0000 Subject: changed the default filesystem type to NTFS (from Samba) I've finally changed this because I've found a real effect that this has. Win95 shows long filenames in a directory listing in a dos box only if this is set to NTFS or HPFS (only ones I've found so far anyway). If NTFS poses problems of some kind then we should try HPFS I wonder if this change will trigger any attempts to use ACLs ? (This used to be commit 410d54fa0dba319e802d7327d89c4c1e61f2db65) --- source3/include/local.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index f68f57eff7..6903e5854f 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -80,7 +80,7 @@ /* what default type of filesystem do we want this to show up as in a NT file manager window? */ -#define FSTYPE_STRING "Samba" +#define FSTYPE_STRING "NTFS" /* the default guest account - normally set in the Makefile or smb.conf */ #ifndef GUEST_ACCOUNT -- cgit From 5b4d94e20fdb5888da1b71a7b6a30ebede6cb06a Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 30 Sep 1998 01:49:24 +0000 Subject: (Finally) implemented "max open files" as a global smb.conf parameter. Sets up the files array correctly - limited by the smb.conf parameter and by the max fd's per process as found by getrlimit(). Jeremy. (This used to be commit eca24bd24352c688cdf48c1ef14adb8ac353468f) --- source3/include/local.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 6903e5854f..a31c5c35b4 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -44,6 +44,17 @@ #define SHMEM_SIZE (1024*1024) #endif +/* + * Default number of maximum open files per smbd. This is + * also limited by the maximum available file descriptors + * per process and can also be set in smb.conf as "max open files" + * in the [global] section. + */ + +#ifndef MAX_OPEN_FILES +#define MAX_OPEN_FILES 4096 +#endif + /* the max number of simultanous connections to the server by all clients */ #define MAXSTATUS 100000 -- cgit From 8883e74ed44f5b25cc8f5a06e65a525587036f6c Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 30 Sep 1998 03:05:29 +0000 Subject: Upped default MAX_OPEN_FILES to 10000 after conversation with tridge. As we're only using 1 bit per fd when idle it doesn't matter too much.... Jeremy. (This used to be commit dba55b2d3453bd18e1a0cb031d012733e5a214b9) --- source3/include/local.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index a31c5c35b4..7c63ab830b 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -52,7 +52,7 @@ */ #ifndef MAX_OPEN_FILES -#define MAX_OPEN_FILES 4096 +#define MAX_OPEN_FILES 10000 #endif /* the max number of simultanous connections to the server by all clients */ -- cgit From 053d6c605caebf5ed61b86f320da6a35f0c5257f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 21 Oct 1998 00:31:14 +0000 Subject: at the interop Isaac (at least I _think_ it was Isaac) said that if a MS client doesn't respond to a oplock break request then we might try resending the request. This morning Sues Win95 machine had this problem (thus forcing me to do something about it!). When starting winword her box refused to answer an oplock break request. I have added code to resend the oplock break request up to 3 times at 10 second intervals before killing the socket. of course, as soon as I did this her box started to behave again so I haven't been able to tell if this fix actually works, but it can't be worse than dropping the socket immediately. (This used to be commit a1c4d8351b9171416693e6d7a9045bdce9217edb) --- source3/include/local.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 7c63ab830b..85e61c63c4 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -184,6 +184,10 @@ #define OPLOCK_BREAK_TIMEOUT 30 +/* how many times do we try to resend the oplock break request - useful + for buggy MS clients */ +#define OPLOCK_BREAK_RESENDS 3 + /* Timout (in seconds) to add to the oplock break timeout to wait for the smbd to smbd message to return. */ -- cgit From ab521a11a1e994e99a043d3622c9692c04299bbd Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 9 Nov 1998 04:17:11 +0000 Subject: I talked to Dave Miller and he thinks that we should have TCP_NODELAY on by default on OSes that support it, given the network IO pattern that Samba uses. He doesn't think it will cause problems. (This used to be commit 15016aa024854ca56ef20d1f29f54f9698a1911b) --- source3/include/local.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 85e61c63c4..c609f65342 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -173,6 +173,14 @@ #define LONG_CONNECT_TIMEOUT 30 #define SHORT_CONNECT_TIMEOUT 5 +/* default socket options. Dave Miller thinks we should default to TCP_NODELAY + given the socket IO pattern that Samba uses*/ +#ifdef TCP_NODELAY +#define DEFAULT_SOCKET_OPTIONS "TCP_NODELAY" +#else +#define DEFAULT_SOCKET_OPTIONS "" +#endif + /* the default netbios keepalive timeout */ #define DEFAULT_KEEPALIVE 300 -- cgit From 375e53826c59c33d52009307f757b71a1fe3d589 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 10 Nov 1998 20:51:25 +0000 Subject: include/local.h: include/smb.h: param/loadparm.c: Made GUEST_SESSSETUP run time selectable. Horror of horrors :-). printing/printing.c: Added J.F.'s latest fix. rpc_parse/parse_misc.c: parse_reg.c: rpcclient/cmd_reg.c: rpcclient/display.c: SGI compiler signed/unsigned issues. smbd/reply.c: Made GUEST_SESSSETUP run time selectable. Horror of horrors :-). utils/testparm.c: Added extra test. Jeremy. (This used to be commit 9668a5ef50be2e6b575f9989e87ee2ff8da5ac1d) --- source3/include/local.h | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index c609f65342..e6e2fd4bad 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -104,29 +104,6 @@ #define PRIME_NMBD 1 #endif -/* do you want session setups at user level security with a invalid - password to be rejected or allowed in as guest? WinNT rejects them - but it can be a pain as it means "net view" needs to use a password - - You have 3 choices: - - GUEST_SESSSETUP = 0 means session setups with an invalid password - are rejected. - - GUEST_SESSSETUP = 1 means session setups with an invalid password - are rejected, unless the username does not exist, in which case it - is treated as a guest login - - GUEST_SESSSETUP = 2 means session setups with an invalid password - are treated as a guest login - - Note that GUEST_SESSSETUP only has an effect in user or server - level security. - */ -#ifndef GUEST_SESSSETUP -#define GUEST_SESSSETUP 0 -#endif - /* the default pager to use for the client "more" command. Users can override this with the PAGER environment variable */ #ifndef PAGER -- cgit From 3db52feb1f3b2c07ce0b06ad4a7099fa6efe3fc7 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 13 Dec 1999 13:27:58 +0000 Subject: first pass at updating head branch to be to be the same as the SAMBA_2_0 branch (This used to be commit 453a822a76780063dff23526c35408866d0c0154) --- source3/include/local.h | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index e6e2fd4bad..961670f3a6 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -32,7 +32,15 @@ /* max number of directories open at once */ /* note that with the new directory code this no longer requires a file handle per directory, but large numbers do use more memory */ -#define MAX_OPEN_DIRECTORIES 64 +#define MAX_OPEN_DIRECTORIES 256 + +/* max number of directory handles */ +/* As this now uses the bitmap code this can be + quite large. */ +#define MAX_DIRECTORY_HANDLES 2048 + +/* maximum number of file caches per smbd */ +#define MAX_WRITE_CACHES 10 /* define what facility to use for syslog */ #ifndef SYSLOG_FACILITY @@ -98,12 +106,6 @@ #define GUEST_ACCOUNT "nobody" #endif -/* do you want smbd to send a 1 byte packet to nmbd to trigger it to start - when smbd starts? */ -#ifndef PRIME_NMBD -#define PRIME_NMBD 1 -#endif - /* the default pager to use for the client "more" command. Users can override this with the PAGER environment variable */ #ifndef PAGER @@ -121,16 +123,18 @@ /* the following control timings of various actions. Don't change them unless you know what you are doing. These are all in seconds */ #define DEFAULT_SMBD_TIMEOUT (60*60*24*7) -#define SMBD_RELOAD_CHECK (60) +#define SMBD_RELOAD_CHECK (180) #define IDLE_CLOSED_TIMEOUT (60) #define DPTR_IDLE_TIMEOUT (120) -#define SMBD_SELECT_LOOP (10) +#define SMBD_SELECT_TIMEOUT (60) +#define SMBD_SELECT_TIMEOUT_WITH_PENDING_LOCKS (10) #define NMBD_SELECT_LOOP (10) #define BROWSE_INTERVAL (60) #define REGISTRATION_INTERVAL (10*60) #define NMBD_INETD_TIMEOUT (120) #define NMBD_MAX_TTL (24*60*60) #define LPQ_LOCK_TIMEOUT (5) +#define NMBD_INTERFACES_RELOAD (120) /* the following are in milliseconds */ #define LOCK_RETRY_TIMEOUT (100) @@ -146,17 +150,9 @@ /* shall we support browse requests via a FIFO to nmbd? */ #define ENABLE_FIFO 1 -/* how long to wait for a socket connect to happen */ -#define LONG_CONNECT_TIMEOUT 30 -#define SHORT_CONNECT_TIMEOUT 5 - -/* default socket options. Dave Miller thinks we should default to TCP_NODELAY - given the socket IO pattern that Samba uses*/ -#ifdef TCP_NODELAY -#define DEFAULT_SOCKET_OPTIONS "TCP_NODELAY" -#else -#define DEFAULT_SOCKET_OPTIONS "" -#endif +/* how long (in miliseconds) to wait for a socket connect to happen */ +#define LONG_CONNECT_TIMEOUT 30000 +#define SHORT_CONNECT_TIMEOUT 5000 /* the default netbios keepalive timeout */ #define DEFAULT_KEEPALIVE 300 @@ -169,10 +165,6 @@ #define OPLOCK_BREAK_TIMEOUT 30 -/* how many times do we try to resend the oplock break request - useful - for buggy MS clients */ -#define OPLOCK_BREAK_RESENDS 3 - /* Timout (in seconds) to add to the oplock break timeout to wait for the smbd to smbd message to return. */ @@ -185,4 +177,13 @@ /* name of directory that netatalk uses to store macintosh resource forks */ #define APPLEDOUBLE ".AppleDouble/" +/* + * Default passwd chat script. + */ + +#define DEFAULT_PASSWD_CHAT "*new*password* %n\\n *new*password* %n\\n *changed*" + +/* Minimum length of allowed password when changing UNIX password. */ +#define MINPASSWDLENGTH 5 + #endif -- cgit From 211697ee6cbeb2bbe86b96e17b922dd16d45c0e9 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 29 Dec 1999 02:00:38 +0000 Subject: Converted most of the functions in lib/util_str.c to smb_ucs2_t equivalents. Jeremy. (This used to be commit 1ba42aca2163c534f6be4e4a733604e3dffe0ed8) --- source3/include/local.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 961670f3a6..9da39fe991 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -74,6 +74,9 @@ /* separators for lists */ #define LIST_SEP " \t,;:\n\r" +/* wchar separators for lists */ +#define LIST_SEP_W wchar_list_sep + #ifndef LOCKDIR /* this should have been set in the Makefile */ #define LOCKDIR "/tmp/samba" -- cgit From 574788039f53fada4769731ea3fafe9710417b71 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 3 Jan 2000 03:17:16 +0000 Subject: added the unexpected packet database (unexpected.tdb) this means "nmblookup -S" now always works, even with broken servers the database stores all unexpected replies and these can be accessed by any client. while doing this I cleaned up a couple of functions, and put in place a better trn_id generator. in most places the code got quite a bit simpler due to the addition of simple helper functions. I haven't yet put the code in to take advantage of this for pdc replies - that will be next. Jeremys pdc finding code will then work :) (This used to be commit 280e6359d36c9bc8dcded302f15c3a1db8e3feeb) --- source3/include/local.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 9da39fe991..bd75d4e385 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -138,6 +138,7 @@ #define NMBD_MAX_TTL (24*60*60) #define LPQ_LOCK_TIMEOUT (5) #define NMBD_INTERFACES_RELOAD (120) +#define NMBD_UNEXPECTED_TIMEOUT (15) /* the following are in milliseconds */ #define LOCK_RETRY_TIMEOUT (100) -- cgit From d99bec71701d611b0d8ee44d92cb8ed28162af56 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 17 Apr 2000 06:11:08 +0000 Subject: got rid of some more old configure tests and includes (This used to be commit f137648504362479143d50477fa38ebf7147968b) --- source3/include/local.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index bd75d4e385..81212f9988 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -118,11 +118,6 @@ /* the size of the uid cache used to reduce valid user checks */ #define UID_CACHE_SIZE 4 -/* if mmap is enabled, then this is the maximum size of file to use - the mmap code on. We don't want to mmap huge files as virtual - address spaces are limited */ -#define MAX_MMAP_SIZE (100*0x100000) - /* the following control timings of various actions. Don't change them unless you know what you are doing. These are all in seconds */ #define DEFAULT_SMBD_TIMEOUT (60*60*24*7) -- cgit From f3a861e04e33901c89408a9c89ebaa81fc606f97 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 4 May 2000 07:59:34 +0000 Subject: - use full_name instead of real_name - got rid of guest map code in lpq parser (This used to be commit 8e53f781d3cf6a7007764916a0d8e8f1abea1f66) --- source3/include/local.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 81212f9988..fbde799e5c 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -85,10 +85,6 @@ /* this is where browse lists are kept in the lock dir */ #define SERVER_LIST "browse.dat" -/* shall guest entries in printer queues get changed to user entries, - so they can be deleted using the windows print manager? */ -#define LPQ_GUEST_TO_USER - /* shall filenames with illegal chars in them get mangled in long filename listings? */ #define MANGLE_LONG_FILENAMES -- cgit From a7f6c0a642428372f5fab30a5eb94f9bcc0f6173 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 6 Jul 2000 03:53:49 +0000 Subject: don't need shmem any more (This used to be commit a81371a4fd6f7972b054bea90428d1d2fd6d1d22) --- source3/include/local.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index fbde799e5c..b5590f9f91 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -47,11 +47,6 @@ #define SYSLOG_FACILITY LOG_DAEMON #endif -/* Default size of shared memory used for share mode locking */ -#ifndef SHMEM_SIZE -#define SHMEM_SIZE (1024*1024) -#endif - /* * Default number of maximum open files per smbd. This is * also limited by the maximum available file descriptors -- cgit From 23e5cf060d282c9ba9bdf49884ce23a13b285aac Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 13 Mar 2001 00:55:19 +0000 Subject: this patch does a number of things: - removes SMB_ALIGNMENT. That macro caused all sorts of problems with getting unicode aligned right in sub-protocols (such as SMBtrans and SMBtrans2). I believe the performance reasons for having SMB_ALIGNMENT has gone away with the new variants of the SMB protocol anyway, as newer commands tend to have their own internal alignment. - fix the locations where we set smb_flg2 to absolute values. We must never do this if we want a hope of coping with unicode. - add initial support for unicode on the wire in smbd. Currently enabled using SMBD_USE_UNICODE environment variable. (This used to be commit b98b1435e9d8f8622444c9ff33082977e661f16b) --- source3/include/local.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index b5590f9f91..f693d18623 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -134,9 +134,6 @@ accessible to root */ #define DUMP_CORE 1 -#define SMB_ALIGNMENT 1 - - /* shall we support browse requests via a FIFO to nmbd? */ #define ENABLE_FIFO 1 -- cgit From 9ce5a03ccbcc21c60a3dbc39b1dbd06b30655852 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 18 Apr 2001 16:41:04 +0000 Subject: merge from 2.2 (This used to be commit f52a5014ee325f9d91f266f88eac51b6136a75b9) --- source3/include/local.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index f693d18623..e534f39306 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -173,4 +173,12 @@ /* Minimum length of allowed password when changing UNIX password. */ #define MINPASSWDLENGTH 5 +/* maximum ID number used for session control. This cannot be larger + than 62*62 for the current code */ +#define MAX_SESSION_ID 3000 + +#ifndef SESSION_TEMPLATE +#define SESSION_TEMPLATE "smb/%d" +#endif + #endif -- cgit From e3ca9f33bb979cc341286e37f4f2f5d3e47c4124 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 30 Apr 2001 22:12:38 +0000 Subject: Ensure correct password change script gets selected --with-pam. Jeremy. (This used to be commit 6703f621ea798bd1877bd3baa523307ee288dccd) --- source3/include/local.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index e534f39306..6449816c25 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -168,7 +168,11 @@ * Default passwd chat script. */ +#ifdef WITH_PAM +#define DEFAULT_PASSWD_CHAT "(current) New Retype" +#else #define DEFAULT_PASSWD_CHAT "*new*password* %n\\n *new*password* %n\\n *changed*" +#endif /* Minimum length of allowed password when changing UNIX password. */ #define MINPASSWDLENGTH 5 -- cgit From aac630b382fefff2e3ead291d2d838832a180925 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 2 May 2001 23:32:09 +0000 Subject: Had to add a "pam password change" parameter (defaults to "off") and inlined the pam password change code to ensure that existing and working password chat scripts don't break with 2.2.1. PAM password changing has to be explicitly requested. Allowed wildcards in pam password change matching (matches password chat script matching). Had to add const (sorry Tim :-) to ms_fnmatch() to stop warnings. Don't worry - the const changes are isolated and don't cause any other warnings :-). Jeremy. (This used to be commit 47b4d82536c09bffe3a0d9917fa31d935f1be7d8) --- source3/include/local.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 6449816c25..e534f39306 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -168,11 +168,7 @@ * Default passwd chat script. */ -#ifdef WITH_PAM -#define DEFAULT_PASSWD_CHAT "(current) New Retype" -#else #define DEFAULT_PASSWD_CHAT "*new*password* %n\\n *new*password* %n\\n *changed*" -#endif /* Minimum length of allowed password when changing UNIX password. */ #define MINPASSWDLENGTH 5 -- cgit From 998fcd3f1ea496c0799cf9259d93135e13b4875e Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Sun, 6 May 2001 20:56:14 +0000 Subject: Patch from David_Tiller@ccnotes.ccity.com finally applied now I've thought about it to stop account lockouts with "security=server" mode. Sorry for the delay David. Jeremy. (This used to be commit e8819715038ed49b07ed5639b1b88ad12e994b53) --- source3/include/local.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index e534f39306..e9e4fb2d35 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -100,6 +100,11 @@ #define GUEST_ACCOUNT "nobody" #endif +/* user to test password server with as invalid in security=server mode. */ +#ifndef INVALID_USER_PREFIX +#define INVALID_USER_PREFIX "sambatest" +#endif + /* the default pager to use for the client "more" command. Users can override this with the PAGER environment variable */ #ifndef PAGER -- cgit From c6d1e756649408412d72e5ad2789804b2908b6f2 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 1 Oct 2001 10:54:11 +0000 Subject: - fix handling of 0 last_change_time and must_change_time - move the arbitrary 21 day timeout to local.h (This used to be commit 11075f543470c3283accce0246d0b2983420695a) --- source3/include/local.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index e9e4fb2d35..53ef564610 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -186,4 +186,7 @@ #define SESSION_TEMPLATE "smb/%d" #endif +/* the maximum age in seconds of a password. Should be a lp_ parameter */ +#define MAX_PASSWORD_AGE (21*24*60*60) + #endif -- cgit From 22afba62c9add7efa0de76defd8abb9b352473e2 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 12 Nov 2001 01:00:54 +0000 Subject: Fixed allocation bug in database prog. Some format fixes. Jeremy. (This used to be commit 9ff6b0c20cc88ef0bcd62a596fcb96f898b5b29d) --- source3/include/local.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 53ef564610..84f5a3d1df 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -189,4 +189,7 @@ /* the maximum age in seconds of a password. Should be a lp_ parameter */ #define MAX_PASSWORD_AGE (21*24*60*60) +/* Allocation roundup. */ +#define SMB_ROUNDUP_ALLOCATION_SIZE 0x100000 + #endif -- cgit From caef2d2884fb202bd6184f9a676ecff94c7ab600 Mon Sep 17 00:00:00 2001 From: Martin Pool Date: Mon, 19 Nov 2001 03:35:27 +0000 Subject: LIBDIR and LOCKDIR are dynamically configured too. (This used to be commit 868999ad3c82ad72f11d5b3208b0e42b1ed95096) --- source3/include/local.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 84f5a3d1df..cec48850a9 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -72,11 +72,6 @@ /* wchar separators for lists */ #define LIST_SEP_W wchar_list_sep -#ifndef LOCKDIR -/* this should have been set in the Makefile */ -#define LOCKDIR "/tmp/samba" -#endif - /* this is where browse lists are kept in the lock dir */ #define SERVER_LIST "browse.dat" -- cgit From 94dd5cded7921da779fdeffe0e829eaaf2f4984d Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 6 Dec 2001 07:17:25 +0000 Subject: allow a MAX_DEBUG_LEVEL setting in local.h (or the Makefile) This allows embedded systems to compile out the higher debug levels. It should gain speed as well as reducing the code size. Setting it to 1 saves about 300k of code on my system. (This used to be commit f34cac3b312f273a2363919655ddd1e25cb91305) --- source3/include/local.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index cec48850a9..da9fee0564 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -10,6 +10,15 @@ #define WORKGROUP "WORKGROUP" #endif +/* the maximum debug level to compile into the code. This assumes a good + optimising compiler that can remove unused code + for embedded or low-memory systems set this to a value like 2 to get + only important messages. This gives *much* smaller binaries +*/ +#ifndef MAX_DEBUG_LEVEL +#define MAX_DEBUG_LEVEL 1000 +#endif + /* This defines the section name in the configuration file that will contain */ /* global parameters - that is, parameters relating to the whole server, not */ /* just services. This name is then reserved, and may not be used as a */ -- cgit From 9e007457e4aa0ed8656782be1b8af42fc217614b Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 14 Jan 2002 19:34:28 +0000 Subject: Removed MAXSTATUS which was set incorrectly - thus causing tdb traversal of the connections db on smbd startup. This should fix the Solaris large load bug.... (fingers crossed). Jeremy. (This used to be commit 5b2b9c25af28543e67762805d1387524cbb6c39d) --- source3/include/local.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index da9fee0564..c7abe207c8 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -68,7 +68,8 @@ #endif /* the max number of simultanous connections to the server by all clients */ -#define MAXSTATUS 100000 +/* zero means no limit. */ +#define MAXSTATUS 0 #define WORDMAX 0xFFFF -- cgit From 9cd0306baa1b3a78b40ab97b5d199b90a4c34aa6 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 11 Apr 2002 02:20:56 +0000 Subject: This split the mangling code up to allow for the possibility of multiple mangling implementation, selectable using "mangling method = " in smb.conf It also tidies the interface a little, although it is still nasty. (This used to be commit be23d87a178e7d0691e7d942adf89bb3d2d533c2) --- source3/include/local.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index c7abe207c8..1ecd63738e 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -197,4 +197,10 @@ /* Allocation roundup. */ #define SMB_ROUNDUP_ALLOCATION_SIZE 0x100000 +/* shall we deny oplocks to clients that get timeouts? */ +#define FASCIST_OPLOCK_BACKOFF 1 + +/* this enables the "rabbit pellet" fix for SMBwritebraw */ +#define RABBIT_PELLET_FIX 1 + #endif -- cgit From e90b65284812aaa5ff9e9935ce9bbad7791cbbcd Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 15 Jul 2002 10:35:28 +0000 Subject: updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce) --- source3/include/local.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 1ecd63738e..24f3fa7724 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -77,7 +77,7 @@ #define MAX_PASS_LEN 200 /* separators for lists */ -#define LIST_SEP " \t,;:\n\r" +#define LIST_SEP " \t,;\n\r" /* wchar separators for lists */ #define LIST_SEP_W wchar_list_sep -- cgit From b2edf254eda92f775e7d3d9b6793b4d77f9000b6 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 17 Aug 2002 17:00:51 +0000 Subject: sync 3.0 branch with head (This used to be commit 3928578b52cfc949be5e0ef444fce1558d75f290) --- source3/include/local.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 24f3fa7724..2538715c41 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -187,8 +187,20 @@ than 62*62 for the current code */ #define MAX_SESSION_ID 3000 +/* For the benifit of PAM and the 'session exec' scripts, we fake up a terminal + name. This can be in one of two forms: The first for systems not using + utmp (and therefore not constrained as to length or the need for a number + < 3000 or so) and the second for systems with this 'well behaved terminal + like name' constraint. +*/ + #ifndef SESSION_TEMPLATE -#define SESSION_TEMPLATE "smb/%d" +/* Paramaters are 'pid' and 'vuid' */ +#define SESSION_TEMPLATE "smb/%lu/%d" +#endif + +#ifndef SESSION_UTMP_TEMPLATE +#define SESSION_UTMP_TEMPLATE "smb/%d" #endif /* the maximum age in seconds of a password. Should be a lp_ parameter */ -- cgit From a834a73e341059be154426390304a42e4a011f72 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 25 Sep 2002 15:19:00 +0000 Subject: sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139) --- source3/include/local.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 2538715c41..5096e13fc3 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -67,10 +67,6 @@ #define MAX_OPEN_FILES 10000 #endif -/* the max number of simultanous connections to the server by all clients */ -/* zero means no limit. */ -#define MAXSTATUS 0 - #define WORDMAX 0xFFFF /* the maximum password length before we declare a likely attack */ @@ -117,7 +113,7 @@ #endif /* the size of the uid cache used to reduce valid user checks */ -#define UID_CACHE_SIZE 4 +#define VUID_CACHE_SIZE 32 /* the following control timings of various actions. Don't change them unless you know what you are doing. These are all in seconds */ @@ -126,7 +122,6 @@ #define IDLE_CLOSED_TIMEOUT (60) #define DPTR_IDLE_TIMEOUT (120) #define SMBD_SELECT_TIMEOUT (60) -#define SMBD_SELECT_TIMEOUT_WITH_PENDING_LOCKS (10) #define NMBD_SELECT_LOOP (10) #define BROWSE_INTERVAL (60) #define REGISTRATION_INTERVAL (10*60) -- cgit From 3665777a5bc7ffa92f64ba17daf4cc66c3607198 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 4 Oct 2002 22:53:18 +0000 Subject: Add a timeout to tdb_lock_bystring(). Ensure we never have more than MAX_PRINT_JOBS in a queue. Jeremy. (This used to be commit 9fe3c0b90d4bff2217e3cb5a34b4683ca314c06e) --- source3/include/local.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 5096e13fc3..2be9c1e101 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -210,4 +210,7 @@ /* this enables the "rabbit pellet" fix for SMBwritebraw */ #define RABBIT_PELLET_FIX 1 +/* Max number of jobs per print queue. */ +#define PRINT_MAX_JOBID 10000 + #endif -- cgit From 83219da3028a0341a9c7b2db38738ca30288686b Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 22 Oct 2002 22:17:29 +0000 Subject: Fix for systems that allow more than 65536 open files per process. Jeremy. (This used to be commit 947a56ce00e552e8b8d2ed64435eabde6225f044) --- source3/include/local.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 2be9c1e101..20fa5ff52a 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -213,4 +213,7 @@ /* Max number of jobs per print queue. */ #define PRINT_MAX_JOBID 10000 +/* Max number of open RPC pipes. */ +#define MAX_OPEN_PIPES 2048 + #endif -- cgit From 6b2eb72df0bcf9143d013e64410ebde78d57b1c4 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 16 Jan 2003 20:08:26 +0000 Subject: Fixed up mutex protection around winbindd logon code. Sync with APP-HEAD. Jeremy. (This used to be commit daf179bcd6297b525bfc644efb154734723f4d58) --- source3/include/local.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 20fa5ff52a..bf828b5894 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -216,4 +216,12 @@ /* Max number of open RPC pipes. */ #define MAX_OPEN_PIPES 2048 +/* Tuning for server auth mutex. */ +#define CLI_AUTH_TIMEOUT 5000 /* In milli-seconds. */ +#define NUM_CLI_AUTH_CONNECT_RETRIES 3 +/* Number in seconds to wait for the mutex. This must be less than 30 seconds. */ +#define SERVER_MUTEX_WAIT_TIME ( ((NUM_CLI_AUTH_CONNECT_RETRIES) * ((CLI_AUTH_TIMEOUT)/1000)) + 5) +/* Number in seconds for winbindd to wait for the mutex. Make this 2 * smbd wait time. */ +#define WINBIND_SERVER_MUTEX_WAIT_TIME (( ((NUM_CLI_AUTH_CONNECT_RETRIES) * ((CLI_AUTH_TIMEOUT)/1000)) + 5)*2) + #endif -- cgit From 9770ba3f4c73603a9d77facdfbc7cc8e030cb25c Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 15 Feb 2003 02:03:55 +0000 Subject: Remove obsolete file lib/netatalk.c - We now have a vfs module (This used to be commit fcc7a197b1ec85f9492e335a824317a904b0c919) --- source3/include/local.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index bf828b5894..e16cdbbc5d 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -166,9 +166,6 @@ it are worked out */ #define USE_READ_PREDICTION 0 -/* name of directory that netatalk uses to store macintosh resource forks */ -#define APPLEDOUBLE ".AppleDouble/" - /* * Default passwd chat script. */ -- cgit From e0989e13042c89911c4d8bff409222e8e3c4678e Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 28 Feb 2003 00:25:55 +0000 Subject: *Excellent* patch from Michael Steffens to limit the unix domain sockets used by winbindd (also solves FD_SETSIZE problem in winbindd to boot !). Adds a "last_access" field to winbindd connections, and will close the oldest idle connection once the number of open connections goes over WINBINDD_MAX_SIMULTANEOUS_CLIENTS (defined in local.h as 200 currently). Jeremy. (This used to be commit 7a586552a3aeb4a26495f0965af4bd027456a011) --- source3/include/local.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index e16cdbbc5d..29b0641119 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -221,4 +221,6 @@ /* Number in seconds for winbindd to wait for the mutex. Make this 2 * smbd wait time. */ #define WINBIND_SERVER_MUTEX_WAIT_TIME (( ((NUM_CLI_AUTH_CONNECT_RETRIES) * ((CLI_AUTH_TIMEOUT)/1000)) + 5)*2) +/* Max number of simultaneous winbindd socket connections. */ +#define WINBINDD_MAX_SIMULTANEOUS_CLIENTS 200 #endif -- cgit From 10bf059b62480d502652408e9c138445859789fc Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 14 Apr 2003 21:49:49 +0000 Subject: Backport my backtrace patch from HEAD (This used to be commit 66fcf6b4938a87e5ded7c7e5830a6a54e4439544) --- source3/include/local.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 29b0641119..4c3c58e14f 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -223,4 +223,8 @@ /* Max number of simultaneous winbindd socket connections. */ #define WINBINDD_MAX_SIMULTANEOUS_CLIENTS 200 + +/* Buffer size to use when printing backtraces */ +#define BACKTRACE_STACK_SIZE 64 + #endif -- cgit From 059181a169e17da053b04553cfb7151985b56b32 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 29 Oct 2003 04:58:48 +0000 Subject: parameterise the listen backlog in smbd and make it larger by default. A backlog of 5 is way too small these days. (This used to be commit bbb92d2b0ea6bc10c71bed62924bfc95c11172a5) --- source3/include/local.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 4c3c58e14f..540365047a 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -227,4 +227,7 @@ /* Buffer size to use when printing backtraces */ #define BACKTRACE_STACK_SIZE 64 +/* size of listen() backlog in smbd */ +#define SMBD_LISTEN_BACKLOG 50 + #endif -- cgit From 2fc57c9a2ce3a266534dd20e6fed4883e052c557 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 8 Jun 2004 16:14:31 +0000 Subject: r1085: Now it's had some proper user testing, merge in the deferred open fix. I'm still doing more testing, but it fixes a behaviour that we've been wrong on ever since the start of Samba. Jeremy. (This used to be commit 894cc6d16296b934c112786eec896846156aee5d) --- source3/include/local.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 540365047a..ee8d672553 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -230,4 +230,7 @@ /* size of listen() backlog in smbd */ #define SMBD_LISTEN_BACKLOG 50 +/* Number of microseconds to wait before a sharing violation. */ +#define SHARING_VIOLATION_USEC_WAIT 950000 + #endif -- cgit From c531f726c4431dc7bdeaf53864bfe30347e426f1 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 1 Jul 2004 22:55:38 +0000 Subject: r1325: Always use GetTimeOfDay() (wrapper). Ensure ldap replication sleep time is not more than 5 seconds. Should fix issue reported by Chris Garrigues . Jeremy. (This used to be commit fbc06831d3a7e8645409158ee1ae1f9f192913a7) --- source3/include/local.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index ee8d672553..7ac2e25612 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -233,4 +233,6 @@ /* Number of microseconds to wait before a sharing violation. */ #define SHARING_VIOLATION_USEC_WAIT 950000 +#define MAX_LDAP_REPLICATION_SLEEP_TIME 5000 /* In milliseconds. */ + #endif -- cgit From f95e9fc45b1d34c55b04318b79928adabd8f09e2 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 25 Feb 2005 02:22:44 +0000 Subject: r5548: Stop lying about allocation sizes to Windows clients. It was a nice idea, and aparently improved performance in some circumstances, but it breaks the VC++ compiler :-(. Not cool. Fix bug #2146. Jeremy. (This used to be commit b9f147634df0126320ffe3b9a23068e76f6c1681) --- source3/include/local.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 7ac2e25612..7d5baa21fa 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -198,9 +198,6 @@ /* the maximum age in seconds of a password. Should be a lp_ parameter */ #define MAX_PASSWORD_AGE (21*24*60*60) -/* Allocation roundup. */ -#define SMB_ROUNDUP_ALLOCATION_SIZE 0x100000 - /* shall we deny oplocks to clients that get timeouts? */ #define FASCIST_OPLOCK_BACKOFF 1 -- cgit From 02fdabc2a7f0199bc5f42afb2c744f3c740122e4 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 3 Mar 2005 03:43:57 +0000 Subject: r5636: Re-add the allocation size - parameterized by share as "allocation roundup size", by default set as 1Mb. From advice by BlueArc about Windows client behaviour. VC++ people can set this to zero to turn it off. Jeremy. (This used to be commit 833ca101772bfab65dbd79eb64f63464177f144e) --- source3/include/local.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 7d5baa21fa..8960a4af55 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -198,6 +198,9 @@ /* the maximum age in seconds of a password. Should be a lp_ parameter */ #define MAX_PASSWORD_AGE (21*24*60*60) +/* Default allocation roundup. */ +#define SMB_ROUNDUP_ALLOCATION_SIZE 0x100000 + /* shall we deny oplocks to clients that get timeouts? */ #define FASCIST_OPLOCK_BACKOFF 1 -- cgit From a00c76d9fb11241f968336834ba4e4ced926e727 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 1 Nov 2005 02:07:26 +0000 Subject: r11435: Allow the hash size of the tdb open (locking) database to be set in local.h. Change from the default (131) to another prime (1049). Should this be an smb.conf tunable parameter based on the number of open file descriptors available ? If so what scaling factor ? More tests to follow. Jeremy. (This used to be commit 6a902ec49ffea5d0ca0308d5ff51584cece41043) --- source3/include/local.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 8960a4af55..c9b54ab1a2 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -235,4 +235,7 @@ #define MAX_LDAP_REPLICATION_SLEEP_TIME 5000 /* In milliseconds. */ +/* tdb hash size for the open database. */ +#define SMB_OPEN_DATABASE_TDB_HASH_SIZE 1049 + #endif -- cgit From 0af1500fc0bafe61019f1b2ab1d9e1d369221240 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 3 Feb 2006 22:19:41 +0000 Subject: r13316: Let the carnage begin.... Sync with trunk as off r13315 (This used to be commit 17e63ac4ed8325c0d44fe62b2442449f3298559f) --- source3/include/local.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index c9b54ab1a2..916fb6e46d 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -238,4 +238,13 @@ /* tdb hash size for the open database. */ #define SMB_OPEN_DATABASE_TDB_HASH_SIZE 1049 +/* Characters we disallow in sharenames. */ +#define INVALID_SHARENAME_CHARS "%<>*?|/\\+=;:\"," + +/* Seconds between connection attempts to a remote server. */ +#define FAILED_CONNECTION_CACHE_TIMEOUT 30 + +/* Default hash size for the winbindd cache. */ +#define WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE 5000 + #endif -- cgit From 81d4f40bbe202e5dae3d4d1070b02edf16a9f62e Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 29 Mar 2006 22:19:01 +0000 Subject: r14763: Add a new tuning parameter, open files database hash size, this allows us to experiment with ensuring the tdb hash size for our open files and locking db are appropriately sized. Make the hash size larger by default (10007 instead of 1049) and make the locking db hash size the same as the open file db hash size. Jeremy. (This used to be commit e7225f7e813423c3e2a94af6a9d7ce8a1b50a166) --- source3/include/local.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 916fb6e46d..fb93197636 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -236,7 +236,7 @@ #define MAX_LDAP_REPLICATION_SLEEP_TIME 5000 /* In milliseconds. */ /* tdb hash size for the open database. */ -#define SMB_OPEN_DATABASE_TDB_HASH_SIZE 1049 +#define SMB_OPEN_DATABASE_TDB_HASH_SIZE 10007 /* Characters we disallow in sharenames. */ #define INVALID_SHARENAME_CHARS "%<>*?|/\\+=;:\"," -- cgit From 38af904c314396091de1062ec19591326abddec6 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 18 Jul 2006 01:20:26 +0000 Subject: r17107: Make the 200 ms timeout value tunable in local.h... Might need to be a parameter ? Jeremy. (This used to be commit 98d8d9399bb287319578daaf2a2fb42f3c48f858) --- source3/include/local.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index fb93197636..6d32f4fe6e 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -247,4 +247,7 @@ /* Default hash size for the winbindd cache. */ #define WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE 5000 +/* Windows minimum lock resolution timeout in ms */ +#define WINDOWS_MINIMUM_LOCK_TIMEOUT_MS 200 + #endif -- cgit From 206e7eeb6fb5491155ac4b54e13b7b81ae6c29a0 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 7 Apr 2008 09:27:22 +0200 Subject: smbd: make it possible to change the write time delay for testing metze (This used to be commit df8c100c2b53575a0d425a2daf52e2d59904746a) --- source3/include/local.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/include/local.h') diff --git a/source3/include/local.h b/source3/include/local.h index 6d32f4fe6e..c125ded371 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -233,6 +233,9 @@ /* Number of microseconds to wait before a sharing violation. */ #define SHARING_VIOLATION_USEC_WAIT 950000 +/* Number of microseconds to wait before a updating the write time (2 secs). */ +#define WRITE_TIME_UPDATE_USEC_DELAY 2000000 + #define MAX_LDAP_REPLICATION_SLEEP_TIME 5000 /* In milliseconds. */ /* tdb hash size for the open database. */ -- cgit