configure configure.in: Added checks for statvfs64. Last bit of 64 bit widening (I hope :-).

include/config.h.in: Added #undef STAT_STATVFS64.
include/includes.h: Added SMB_STRUCT_STATVFS type, Changed SMB_BIG_INTEGER to
                    SMB_BIG_UINT and SMB_BIG_INT types.
include/smb.h: Added flag defines from CIFS spec.
lib/debug.c: Fixed one more mode_t issue.
lib/system.c: Added sys_statvfs wrapper.
lib/util.c: Changed trim_string to use size_t.
param/loadparm.c: Moved "blocking locks" into locking section. Alphabetised
                  locking options. Question - shuld we do this for all options ?
passdb/ldap.c: Changed SMB_BIG_INTEGER to SMB_BIG_UINT.
passdb/nispass.c: Changed SMB_BIG_INTEGER to SMB_BIG_UINT.
passdb/smbpass.c: Changed SMB_BIG_INTEGER to SMB_BIG_UINT.
smbd/dfree.c: Changed to use 64 bit types if available. Moved to use unsigned
              types.
smbd/dosmode.c: Fixed one more mode_t issue.
smbd/negprot.c: Changed literals to be FLAG_ #defines.
smbd/nttrans.c: Removed dead code.
smbd/open.c: Changed disk_free call.
smbd/process.c: Changed literals to be FLAG_ #defines.
smbd/reply.c: Changed disk_free call.
smbd/trans2.c: Fixed but in SMB_QUERY_FS_VOLUME_INFO call. Was using
               UNICODE - should use ascii.
tests/summary.c: Added STAT_STATVFS64 check.
Jeremy.
(This used to be commit c512b1b91fb7f2a7a93b9033a33e06d966daadb4)

3 files changed, 15 insertions, 15 deletions

diff --git a/source3/passdb/ldap.c b/source3/passdb/ldap.c
index e58e339df6..e27b4fbea7 100644
--- a/source3/passdb/ldap.c
+++ b/source3/passdb/ldap.c
@@ -893,25 +893,25 @@ static void endldappwent(void *vp)
 }
 
 /*************************************************************************
- Return the current position in the ldap passwd list as an SMB_BIG_INTEGER.
+ Return the current position in the ldap passwd list as an SMB_BIG_UINT.
  This must be treated as an opaque token.
 
  do not call this function directly.  use passdb.c instead.
 
 *************************************************************************/
-static SMB_BIG_INTEGER getldappwpos(void *vp)
+static SMB_BIG_UINT getldappwpos(void *vp)
 {
-	return 0;
+	return (SMB_BIG_UINT)0;
 }
 
 /*************************************************************************
- Set the current position in the ldap passwd list from SMB_BIG_INTEGER.
+ Set the current position in the ldap passwd list from SMB_BIG_UINT.
  This must be treated as an opaque token.
 
  do not call this function directly.  use passdb.c instead.
 
 *************************************************************************/
-static BOOL setldappwpos(void *vp, SMB_BIG_INTEGER tok)
+static BOOL setldappwpos(void *vp, SMB_BIG_UINT tok)
 {
 	return False;
 }
diff --git a/source3/passdb/nispass.c b/source3/passdb/nispass.c
index 50b7dd2a2e..04c1c23b2e 100644
--- a/source3/passdb/nispass.c
+++ b/source3/passdb/nispass.c
@@ -223,25 +223,25 @@ static struct sam_passwd *getnisp21pwent(void *vp)
 }
 
 /*************************************************************************
- Return the current position in the nisplus passwd list as an SMB_BIG_INTEGER.
+ Return the current position in the nisplus passwd list as an SMB_BIG_UINT.
  This must be treated as an opaque token.
 
  do not call this function directly.  use passdb.c instead.
 
 *************************************************************************/
-static SMB_BIG_INTEGER getnisppwpos(void *vp)
+static SMB_BIG_UINT getnisppwpos(void *vp)
 {
-	return 0;
+	return (SMB_BIG_UINT)0;
 }
 
 /*************************************************************************
- Set the current position in the nisplus passwd list from SMB_BIG_INTEGER.
+ Set the current position in the nisplus passwd list from SMB_BIG_UINT.
  This must be treated as an opaque token.
 
  do not call this function directly.  use passdb.c instead.
 
 *************************************************************************/
-static BOOL setnisppwpos(void *vp, SMB_BIG_INTEGER tok)
+static BOOL setnisppwpos(void *vp, SMB_BIG_UINT tok)
 {
 	return False;
 }
diff --git a/source3/passdb/smbpass.c b/source3/passdb/smbpass.c
index 34de513476..a2b648b2fd 100644
--- a/source3/passdb/smbpass.c
+++ b/source3/passdb/smbpass.c
@@ -399,21 +399,21 @@ static struct sam_passwd *getsmbfile21pwent(void *vp)
 }
 
 /*************************************************************************
- Return the current position in the smbpasswd list as an SMB_BIG_INTEGER
+ Return the current position in the smbpasswd list as an SMB_BIG_UINT.
  This must be treated as an opaque token.
 *************************************************************************/
 
-static SMB_BIG_INTEGER getsmbfilepwpos(void *vp)
+static SMB_BIG_UINT getsmbfilepwpos(void *vp)
 {
-  return (SMB_BIG_INTEGER)sys_ftell((FILE *)vp);
+  return (SMB_BIG_UINT)sys_ftell((FILE *)vp);
 }
 
 /*************************************************************************
- Set the current position in the smbpasswd list from an SMB_BIG_INTEGER.
+ Set the current position in the smbpasswd list from an SMB_BIG_UINT.
  This must be treated as an opaque token.
 *************************************************************************/
 
-static BOOL setsmbfilepwpos(void *vp, SMB_BIG_INTEGER tok)
+static BOOL setsmbfilepwpos(void *vp, SMB_BIG_UINT tok)
 {
   return !sys_fseek((FILE *)vp, (SMB_OFF_T)tok, SEEK_SET);
 }