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)

diff --git a/source3/configure.in b/source3/configure.in
index 69152d8fc8f85f187587ccdcbee5da6312af374e..3eecc48b219f4a09d717c815b618e90f67eaff00 100644 (file)
--- 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 825481984d8ff9e97be9334d849a269f3e510788..31a74ae482fa396708e95a4ab7488020899b30ee 100644 (file)
--- 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: