diff options
| author | Jeremy Allison <jra@samba.org> | 2004-09-28 05:33:30 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:52:49 -0500 |
| commit | 39efdab4c150f1a6dc1fec1ce26cb0bf1e53669b (patch) | |
| tree | b19893216c906eae07be299c6bdd4f86883b0133 | |
| parent | 4a96fb5d12cfa109a242414b6570cd0e6ce25ece (diff) | |
| download | samba-39efdab4c150f1a6dc1fec1ce26cb0bf1e53669b.tar.gz samba-39efdab4c150f1a6dc1fec1ce26cb0bf1e53669b.tar.bz2 samba-39efdab4c150f1a6dc1fec1ce26cb0bf1e53669b.zip | |
r2708: Don't look for bzero, we don't use it.
Samba4 torture tester treates maxentries = 0 as maxentries ==1.
Jeremy.
(This used to be commit 38f3d3e263f59f94f243907447b5a82f67d3e3f7)
| -rw-r--r-- | source3/configure.in | 2 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/source3/configure.in b/source3/configure.in index 69152d8fc8..3eecc48b21 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -958,7 +958,7 @@ if test x"$ac_cv_func_execl" = x"no"; then fi AC_CHECK_FUNCS(dlopen dlclose dlsym dlerror waitpid getcwd strdup strndup strnlen strtoul strerror chown fchown chmod fchmod chroot link mknod mknod64) -AC_CHECK_FUNCS(fstat strchr utime utimes getrlimit fsync bzero memset strlcpy strlcat setpgid) +AC_CHECK_FUNCS(fstat strchr utime utimes getrlimit fsync memset strlcpy strlcat setpgid) AC_CHECK_FUNCS(memmove vsnprintf snprintf asprintf vasprintf setsid glob strpbrk pipe crypt16 getauthuid) AC_CHECK_FUNCS(strftime sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent) AC_CHECK_FUNCS(initgroups select poll rdchk getgrnam getgrent pathconf realpath) diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 825481984d..31a74ae482 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -1357,7 +1357,12 @@ static int call_trans2findfirst(connection_struct *conn, char *inbuf, char *outb close_if_end = %d requires_resume_key = %d level = 0x%x, max_data_bytes = %d\n", dirtype, maxentries, close_after_first, close_if_end, requires_resume_key, info_level, max_data_bytes)); - + + if (!maxentries) { + /* W2K3 seems to treat zero as 1. */ + maxentries = 1; + } + switch (info_level) { case SMB_INFO_STANDARD: case SMB_INFO_QUERY_EA_SIZE: @@ -1583,6 +1588,11 @@ resume_key = %d resume name = %s continue=%d level = %d\n", dptr_num, max_data_bytes, maxentries, close_after_request, close_if_end, requires_resume_key, resume_key, resume_name, continue_bit, info_level)); + if (!maxentries) { + /* W2K3 seems to treat zero as 1. */ + maxentries = 1; + } + switch (info_level) { case SMB_INFO_STANDARD: case SMB_INFO_QUERY_EA_SIZE: |