svn commit: samba r2707 - in trunk/source: . smbd

[jra at samba.org]

Author: jra
Date: 2004-09-28 05:33:06 +0000 (Tue, 28 Sep 2004)
New Revision: 2707

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/trunk/source&rev=2707&nolog=1

Log:
Don't look for bzero, we don't use it.
Samba4 torture tester treates maxentries = 0 as maxentries ==1.
Jeremy.

Modified:
   trunk/source/configure.in
   trunk/source/smbd/trans2.c


Changeset:
Modified: trunk/source/configure.in
===================================================================
--- trunk/source/configure.in	2004-09-28 02:13:53 UTC (rev 2706)
+++ trunk/source/configure.in	2004-09-28 05:33:06 UTC (rev 2707)
@@ -960,7 +960,7 @@
 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)

Modified: trunk/source/smbd/trans2.c
===================================================================
--- trunk/source/smbd/trans2.c	2004-09-28 02:13:53 UTC (rev 2706)
+++ trunk/source/smbd/trans2.c	2004-09-28 05:33:06 UTC (rev 2707)
@@ -1357,7 +1357,12 @@
 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 @@
 		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: