diff options
| author | Jeremy Allison <jra@samba.org> | 1999-01-04 21:53:51 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1999-01-04 21:53:51 +0000 |
| commit | 953a15ba1a3d59253f6abe0c86b7b09ea1cc303b (patch) | |
| tree | d784cdb0a38cf627e237cf71c29b5c9a91ad6e52 /source/include | |
| parent | 0258a4e63b9c1ee47cb492f52e86119fb2671ab2 (diff) | |
| download | samba-953a15ba1a3d59253f6abe0c86b7b09ea1cc303b.tar.gz samba-953a15ba1a3d59253f6abe0c86b7b09ea1cc303b.tar.xz samba-953a15ba1a3d59253f6abe0c86b7b09ea1cc303b.zip | |
Added autoconf test for FTRUNCATE_NEEDS_ROOT.
Fixed <rpc/rpc.h> include bug for SCO.
Test for <arpa/inet.h> include for HPUX7.x.
Jeremy.
Diffstat (limited to 'source/include')
| -rw-r--r-- | source/include/config.h.in | 5 | ||||
| -rw-r--r-- | source/include/includes.h | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/source/include/config.h.in b/source/include/config.h.in index f63b98e76a9..edcbf6d11ae 100644 --- a/source/include/config.h.in +++ b/source/include/config.h.in @@ -99,6 +99,7 @@ #undef HAVE_SYSV_IPC #undef HAVE_FCNTL_LOCK #undef HAVE_FTRUNCATE_EXTEND +#undef FTRUNCATE_NEEDS_ROOT #undef HAVE_TRAPDOOR_UID #undef HAVE_ROOT #undef HAVE_UNION_SEMUN @@ -166,6 +167,7 @@ #undef HAVE_STRUCT_DIRENT64 #undef HAVE_TRUNCATED_SALT #undef BROKEN_NISPLUS_INCLUDE_FILES +#undef HAVE_RPC_AUTH_ERROR_CONFLICT /* The number of bytes in a int. */ #undef SIZEOF_INT @@ -653,6 +655,9 @@ /* Define if you have the yp_get_default_domain function. */ #undef HAVE_YP_GET_DEFAULT_DOMAIN +/* Define if you have the <arpa/inet.h> header file. */ +#undef HAVE_ARPA_INET_H + /* Define if you have the <compat.h> header file. */ #undef HAVE_COMPAT_H diff --git a/source/include/includes.h b/source/include/includes.h index a811731c302..b05d8fbfd59 100644 --- a/source/include/includes.h +++ b/source/include/includes.h @@ -314,6 +314,12 @@ #endif #if defined(HAVE_RPC_RPC_H) +/* + * Check for AUTH_ERROR define conflict with rpc/rpc.h in prot.h. + */ +#if defined(HAVE_SYS_SECURITY_H) && defined(HAVE_RPC_AUTH_ERROR_CONFLICT) +#undef AUTH_ERROR +#endif #include <rpc/rpc.h> #endif |