Fixes for HPUX.

I have added a new define for configure - HAVE_EXPLICIT_LARGEFILE_SUPPORT.
This is tested for at the end of configure by the following check :
"As a gating factor for large file support, in order to
use <4GB files we must have the following minimal support
available.
long long, a 64 bit off_t or off64_t, a 64 bit ino_t or
ino64_t. If we don't have all of these then disable large
file support."

I have to do this as HPUX will detect the open64 etc.
functions in libc but *THEY DON'T WORK* before HPUX11.x.

The definitions in include/includes.h that set up large
file defines, and the calls in lib/system.c that use the explicit
large file functions are now depended on HAVE_EXPLICIT_LARGEFILE_SUPPORT
also being defined.

include/rpc_lsa.h: Upped number of groups to 96 as a temporary
measure.

Jeremy.

3 files changed, 12 insertions, 11 deletions

diff --git a/source/include/config.h.in b/source/include/config.h.in
index edcbf6d11ae..6833033146e 100644
--- a/source/include/config.h.in
+++ b/source/include/config.h.in
@@ -168,6 +168,7 @@
 #undef HAVE_TRUNCATED_SALT
 #undef BROKEN_NISPLUS_INCLUDE_FILES
 #undef HAVE_RPC_AUTH_ERROR_CONFLICT
+#undef HAVE_EXPLICIT_LARGEFILE_SUPPORT
 
 /* The number of bytes in a int.  */
 #undef SIZEOF_INT
diff --git a/source/include/includes.h b/source/include/includes.h
index a05caeb49bb..cb64c3513a5 100644
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -438,7 +438,7 @@
  */
 
 #ifndef SMB_INO_T
-#  ifdef HAVE_INO64_T
+#  if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_INO64_T)
 #    define SMB_INO_T ino64_t
 #  else
 #    define SMB_INO_T ino_t
@@ -446,7 +446,7 @@
 #endif
 
 #ifndef LARGE_SMB_INO_T
-#  if defined(HAVE_INO64_T) || (defined(SIZEOF_INO_T) && (SIZEOF_INO_T == 8))
+#  if (defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_INO64_T)) || (defined(SIZEOF_INO_T) && (SIZEOF_INO_T == 8))
 #    define LARGE_SMB_INO_T 1
 #  endif
 #endif
@@ -458,7 +458,7 @@
 #endif
 
 #ifndef SMB_OFF_T
-#  ifdef HAVE_OFF64_T
+#  if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_OFF64_T)
 #    define SMB_OFF_T off64_t
 #  else
 #    define SMB_OFF_T off_t
@@ -473,7 +473,7 @@
  */
 
 #ifndef LARGE_SMB_OFF_T
-#  if defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8))
+#  if (defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_OFF64_T)) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8))
 #    define LARGE_SMB_OFF_T 1
 #  endif
 #endif
@@ -489,7 +489,7 @@
  */
 
 #ifndef SMB_STRUCT_STAT
-#  if defined(HAVE_STAT64) && defined(HAVE_OFF64_T)
+#  if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_STAT64) && defined(HAVE_OFF64_T)
 #    define SMB_STRUCT_STAT struct stat64
 #  else
 #    define SMB_STRUCT_STAT struct stat
@@ -501,7 +501,7 @@
  */
 
 #ifndef SMB_STRUCT_DIRENT
-#  if defined(HAVE_STRUCT_DIRENT64)
+#  if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_STRUCT_DIRENT64)
 #    define SMB_STRUCT_DIRENT struct dirent64
 #  else
 #    define SMB_STRUCT_DIRENT struct dirent
@@ -513,7 +513,7 @@
  */
 
 #ifndef SMB_STRUCT_FLOCK
-#  if defined(HAVE_STRUCT_FLOCK64) && defined(HAVE_OFF64_T)
+#  if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_STRUCT_FLOCK64) && defined(HAVE_OFF64_T)
 #    define SMB_STRUCT_FLOCK struct flock64
 #  else
 #    define SMB_STRUCT_FLOCK struct flock
@@ -521,7 +521,7 @@
 #endif
 
 #ifndef SMB_F_SETLKW
-#  if defined(HAVE_STRUCT_FLOCK64) && defined(HAVE_OFF64_T)
+#  if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_STRUCT_FLOCK64) && defined(HAVE_OFF64_T)
 #    define SMB_F_SETLKW F_SETLKW64
 #  else
 #    define SMB_F_SETLKW F_SETLKW
@@ -529,7 +529,7 @@
 #endif
 
 #ifndef SMB_F_SETLK
-#  if defined(HAVE_STRUCT_FLOCK64) && defined(HAVE_OFF64_T)
+#  if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_STRUCT_FLOCK64) && defined(HAVE_OFF64_T)
 #    define SMB_F_SETLK F_SETLK64
 #  else
 #    define SMB_F_SETLK F_SETLK
@@ -537,7 +537,7 @@
 #endif
 
 #ifndef SMB_F_GETLK
-#  if defined(HAVE_STRUCT_FLOCK64) && defined(HAVE_OFF64_T)
+#  if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_STRUCT_FLOCK64) && defined(HAVE_OFF64_T)
 #    define SMB_F_GETLK F_GETLK64
 #  else
 #    define SMB_F_GETLK F_GETLK
diff --git a/source/include/rpc_lsa.h b/source/include/rpc_lsa.h
index b8aaa562f08..6b0485dc96a 100644
--- a/source/include/rpc_lsa.h
+++ b/source/include/rpc_lsa.h
@@ -51,7 +51,7 @@ enum SID_NAME_USE
 /* XXXX these are here to get a compile! */
 #define LSA_LOOKUPRIDS      0xFD
 
-#define LSA_MAX_GROUPS 32
+#define LSA_MAX_GROUPS 96
 #define LSA_MAX_SIDS 32
 
 /* DOM_QUERY - info class 3 and 5 LSA Query response */