Changeset 745 for trunk/server/source3/include/includes.h

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/include/includes.h (modified) (20 diffs)

trunk/server/source3/include/includes.h

@@ -23 +23 @@
 #include "../replace/replace.h"
 
+#if _SAMBA_BUILD_ == 4
+# undef _SAMBA_BUILD_
+# define _SAMBA_BUILD_ 3
+#endif
+
 /* make sure we have included the correct config.h */
 #ifndef NO_CONFIG_H /* for some tests */
@@ -35 +40 @@
    still have comflicts with their header files (e.g. IRIX 6.4) */
 
-#if !defined(__cplusplus) && defined(DEVELOPER)
+#if !defined(__cplusplus) && defined(DEVELOPER) && defined(__linux__)
 #define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
 #define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
@@ -49 +54 @@
 #include "local.h"
 
-#ifdef AIX
-#define DEFAULT_PRINTING PRINT_AIX
-#define PRINTCAP_NAME "/etc/qconfig"
-#endif
-
-#ifdef HPUX
-#define DEFAULT_PRINTING PRINT_HPUX
-#endif
-
-#ifdef QNX
-#define DEFAULT_PRINTING PRINT_QNX
-#endif
-
 #ifdef SUNOS4
 /* on SUNOS4 termios.h conflicts with sys/ioctl.h */
@@ -77 +69 @@
 #endif /* RELIANTUNIX */
 
-#include "system/capability.h"
 #include "system/dir.h"
-#include "system/filesys.h"
-#include "system/glob.h"
-#include "system/iconv.h"
 #include "system/locale.h"
-#include "system/network.h"
-#include "system/passwd.h"
-#include "system/readline.h"
-#include "system/select.h"
-#include "system/shmem.h"
-#include "system/syslog.h"
-#include "system/terminal.h"
 #include "system/time.h"
 #include "system/wait.h"
@@ -146 +127 @@
 #endif
 
-#if HAVE_LBER_H
-#include <lber.h>
-#if defined(HPUX) && !defined(_LBER_TYPES_H)
-/* Define ber_tag_t and ber_int_t for using
- * HP LDAP-UX Integration products' LDAP libraries.
-*/
-#ifndef ber_tag_t
-typedef unsigned long ber_tag_t;
-typedef int ber_int_t;
-#endif
-#endif /* defined(HPUX) && !defined(_LBER_TYPES_H) */
-#ifndef LBER_USE_DER
-#define LBER_USE_DER 0x01
-#endif
-#endif
-
-#if HAVE_LDAP_H
-#include <ldap.h>
-#ifndef LDAP_CONST
-#define LDAP_CONST const
-#endif
-#ifndef LDAP_OPT_SUCCESS
-#define LDAP_OPT_SUCCESS 0
-#endif
-/* Solaris 8 and maybe other LDAP implementations spell this "..._INPROGRESS": */
-#if defined(LDAP_SASL_BIND_INPROGRESS) && !defined(LDAP_SASL_BIND_IN_PROGRESS)
-#define LDAP_SASL_BIND_IN_PROGRESS LDAP_SASL_BIND_INPROGRESS
-#endif
-/* Solaris 8 defines SSL_LDAP_PORT, not LDAPS_PORT and it only does so if
-   LDAP_SSL is defined - but SSL is not working. We just want the
-   port number! Let's just define LDAPS_PORT correct. */
-#if !defined(LDAPS_PORT)
-#define LDAPS_PORT 636
-#endif
-#else
+#ifndef HAVE_LDAP_H
 #undef HAVE_LDAP
-#endif
-
-#if HAVE_GSSAPI_GSSAPI_H
-#include <gssapi/gssapi.h>
-#elif HAVE_GSSAPI_GSSAPI_GENERIC_H
-#include <gssapi/gssapi_generic.h>
-#elif HAVE_GSSAPI_H
-#include <gssapi.h>
-#endif
-
-#if HAVE_COM_ERR_H
-#include <com_err.h>
 #endif
 
@@ -237 +172 @@
 #if defined(HAVE_AIO_H) && defined(WITH_AIO)
 #include <aio.h>
-#endif
-
-#ifdef WITH_MADVISE_PROTECTED
-#include <sys/mman.h>
 #endif
 
@@ -252 +183 @@
 #endif
 
-/* If we have --enable-developer and the valgrind header is present,
- * then we're OK to use it.  Set a macro so this logic can be done only
- * once. */
-#if defined(DEVELOPER)
-#if (HAVE_VALGRIND_H || HAVE_VALGRIND_VALGRIND_H)
-#define VALGRIND
-#endif
-#endif
-
-
 /* we support ADS if we want it and have krb5 and ldap libs */
 #if defined(WITH_ADS) && defined(HAVE_KRB5) && defined(HAVE_LDAP)
@@ -384 +305 @@
 
 #ifdef LARGE_SMB_INO_T
-#define SINO_T_VAL(p, ofs, v) (SIVAL((p),(ofs),(v)&0xFFFFFFFF), SIVAL((p),(ofs)+4,(v)>>32))
-#define INO_T_VAL(p, ofs) ((SMB_INO_T)(((uint64_t)(IVAL(p,ofs)))| (((uint64_t)(IVAL(p,(ofs)+4))) << 32)))
+#define SINO_T_VAL(p, ofs, v) SBVAL(p, ofs, v)
+#define INO_T_VAL(p, ofs) ((SMB_INO_T)BVAL(p, ofs))
 #else 
-#define SINO_T_VAL(p, ofs, v) (SIVAL(p,ofs,v),SIVAL(p,(ofs)+4,0))
+#define SINO_T_VAL(p, ofs, v) SBVAL(p, ofs, ((uint64_t)(v)) & UINT32_MAX)
 #define INO_T_VAL(p, ofs) ((SMB_INO_T)(IVAL((p),(ofs))))
 #endif
@@ -399 +320 @@
 #endif
 
-#define SBIG_UINT(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32))
-#define BIG_UINT(p, ofs) ((((uint64_t) IVAL(p,(ofs)+4))<<32)|IVAL(p,ofs))
-#define IVAL2_TO_SMB_BIG_UINT(buf,off) ( (((uint64_t)(IVAL((buf),(off)))) & ((uint64_t)0xFFFFFFFF)) | \
-                (( ((uint64_t)(IVAL((buf),(off+4)))) & ((uint64_t)0xFFFFFFFF) ) << 32 ) )
-
+/* TODO: remove this macros */
+#define SBIG_UINT(p, ofs, v) SBVAL(p, ofs, v)
+#define BIG_UINT(p, ofs) BVAL(p, ofs)
+#define IVAL2_TO_SMB_BIG_UINT(p, ofs) BVAL(p, ofs)
 
 /* this should really be a 64 bit type if possible */
@@ -553 +473 @@
 #endif
 
-#ifndef HAVE_STRUCT_TIMESPEC
-struct timespec {
-        time_t tv_sec;            /* Seconds.  */
-        long tv_nsec;           /* Nanoseconds.  */
-};
-#endif
-
 enum timestamp_set_resolution {
         TIMESTAMP_SET_SECONDS = 0,
@@ -565 +478 @@
         TIMESTAMP_SET_NT_OR_BETTER
 };
-
-#ifdef HAVE_BROKEN_GETGROUPS
-#define GID_T int
-#else
-#define GID_T gid_t
-#endif
-
-#ifndef NGROUPS_MAX
-#define NGROUPS_MAX 32 /* Guess... */
-#endif
 
 /* Our own fstrings */
@@ -600 +503 @@
 #endif
 
-/* Samba 3 doesn't use iconv_convenience: */
-extern void *cmdline_lp_ctx;
-struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
-
 /* Lists, trees, caching, database... */
 #include "../lib/util/util.h"
@@ -610 +509 @@
 #include "../lib/util/memory.h"
 #include "../lib/util/attr.h"
-#include "intl.h"
+#include "../lib/util/tsort.h"
 #include "../lib/util/dlinklist.h"
-#include "tdb.h"
-#include "util_tdb.h"
-
-#include "talloc.h"
+
+#include <talloc.h>
 
 #include "event.h"
-#include "../lib/util/tevent_unix.h"
-#include "../lib/util/tevent_ntstatus.h"
-#include "../lib/tsocket/tsocket.h"
 
 #include "../lib/util/data_blob.h"
 #include "../lib/util/time.h"
-#include "../lib/util/asn1.h"
-
-#include "ads.h"
-#include "ads_dns.h"
-#include "interfaces.h"
-#include "trans2.h"
+#include "../lib/util/debug.h"
+#include "../lib/util/debug_s3.h"
+
+#include "../libcli/util/ntstatus.h"
 #include "../libcli/util/error.h"
-#include "ntioctl.h"
 #include "../lib/util/charset/charset.h"
 #include "dynconfig.h"
-#include "util_getent.h"
-#include "debugparse.h"
-#include "privileges.h"
-#include "messages.h"
 #include "locking.h"
 #include "smb_perfcount.h"
-#include "smb_signing.h"
 #include "smb.h"
-#include "nameserv.h"
-#include "secrets.h"
 #include "../lib/util/byteorder.h"
-#include "privileges.h"
-#include "rpc_misc.h"
-#include "rpc_dce.h"
-#include "../librpc/gen_ndr/schannel.h"
-#include "mapping.h"
-#include "passdb.h"
-#include "rpc_secdes.h"
-#include "../libgpo/gpo.h"
-#include "msdfs.h"
-#include "rap.h"
-#include "../lib/crypto/md5.h"
-#include "../lib/crypto/md4.h"
-#include "../lib/crypto/arcfour.h"
-#include "../lib/crypto/crc32.h"
-#include "../lib/crypto/hmacmd5.h"
-#include "ntlmssp.h"
-#include "auth.h"
-#include "ntdomain.h"
-#include "reg_objects.h"
-#include "reg_db.h"
-#include "librpc/gen_ndr/perfcount.h"
-#include "librpc/gen_ndr/notify.h"
-#include "librpc/gen_ndr/xattr.h"
-#include "librpc/gen_ndr/messaging.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
-#include "librpc/rpc/dcerpc.h"
-#include "nt_printing.h"
-#include "idmap.h"
-#include "client.h"
-
-#include "session.h"
-#include "popt.h"
-#include "mangle.h"
+
 #include "module.h"
-#include "nsswitch/winbind_client.h"
-#include "dbwrap.h"
-#include "packet.h"
-#include "ctdbd_conn.h"
 #include "../lib/util/talloc_stack.h"
-#include "memcache.h"
-#include "async_smb.h"
-#include "../lib/async_req/async_sock.h"
-#include "talloc_dict.h"
-#include "services.h"
-#include "eventlog.h"
 #include "../lib/util/smb_threads.h"
 #include "../lib/util/smb_threads_internal.h"
-#include "tldap.h"
-#include "tldap_util.h"
-
-#include "lib/smbconf/smbconf.h"
-#include "lib/smbconf/smbconf_init.h"
-#include "lib/smbconf/smbconf_reg.h"
-#include "lib/smbconf/smbconf_txt.h"
-
-/* Defines for wisXXX functions. */
-#define UNI_UPPER    0x1
-#define UNI_LOWER    0x2
-#define UNI_DIGIT    0x4
-#define UNI_XDIGIT   0x8
-#define UNI_SPACE    0x10
-
-#include "nsswitch/winbind_nss.h"
-
-/* forward declaration from printing.h to get around 
-   header file dependencies */
-
-struct printjob;
-
-/* forward declarations from smbldap.c */
-
-#include "smbldap.h"
-
-/*
- * Reasons for cache flush.
- */
-
-enum flush_reason_enum {
-    SEEK_FLUSH,
-    READ_FLUSH,
-    WRITE_FLUSH,
-    READRAW_FLUSH,
-    OPLOCK_RELEASE_FLUSH,
-    CLOSE_FLUSH,
-    SYNC_FLUSH,
-    SIZECHANGE_FLUSH,
-    /* NUM_FLUSH_REASONS must remain the last value in the enumeration. */
-    NUM_FLUSH_REASONS};
-
-#include "nss_info.h"
-#include "modules/nfs4_acls.h"
-#include "nsswitch/libwbclient/wbclient.h"
 
 /***** prototypes *****/
@@ -742 +539 @@
 #include "proto.h"
 #endif
-#include "libcli/security/secace.h"
-#include "libcli/security/secacl.h"
-#include "libcli/security/security_descriptor.h"
-
-#if defined(HAVE_POSIX_ACLS)
-#include "modules/vfs_posixacl.h"
-#endif
-
-#if defined(HAVE_TRU64_ACLS)
-#include "modules/vfs_tru64acl.h"
-#endif
-
-#if defined(HAVE_SOLARIS_ACLS) || defined(HAVE_UNIXWARE_ACLS)
-#include "modules/vfs_solarisacl.h"
-#endif
-
-#if defined(HAVE_HPUX_ACLS)
-#include "modules/vfs_hpuxacl.h"
-#endif
-
-#if defined(HAVE_IRIX_ACLS)
-#include "modules/vfs_irixacl.h"
-#endif
-
-#ifdef HAVE_LDAP
-#include "ads_protos.h"
-#endif
-
-/* We need this after proto.h to reference GetTimeOfDay(). */
-#include "smbprofile.h"
 
 /* String routines */
@@ -778 +545 @@
 #include "safe_string.h"
 
-/* prototypes from lib/util_transfer_file.c */
-#include "transfer_file.h"
-
-#ifndef DEFAULT_PRINTING
-#ifdef HAVE_CUPS
-#define DEFAULT_PRINTING PRINT_CUPS
-#define PRINTCAP_NAME "cups"
-#elif defined(SYSV)
-#define DEFAULT_PRINTING PRINT_SYSV
-#define PRINTCAP_NAME "lpstat"
-#else
-#define DEFAULT_PRINTING PRINT_BSD
-#define PRINTCAP_NAME "/etc/printcap"
-#endif
-#endif
-
-#ifndef PRINTCAP_NAME
-#define PRINTCAP_NAME "/etc/printcap"
-#endif
-
 #ifndef SIGCLD
 #define SIGCLD SIGCHLD
@@ -806 +553 @@
 #endif
 
-#ifndef MAP_FILE
-#define MAP_FILE 0
-#endif
-
 #if defined(HAVE_PUTPRPWNAM) && defined(AUTH_CLEARTEXT_SEG_CHARS)
 #define OSF1_ENH_SEC 1
-#endif
-
-#ifndef ALLOW_CHANGE_PASSWORD
-#if (defined(HAVE_TERMIOS_H) && defined(HAVE_DUP2) && defined(HAVE_SETSID))
-#define ALLOW_CHANGE_PASSWORD 1
-#endif
-#endif
-
-/* what is the longest significant password available on your system? 
- Knowing this speeds up password searches a lot */
-#ifndef PASSWORD_LENGTH
-#define PASSWORD_LENGTH 8
-#endif
-
-#ifndef HAVE_PIPE
-#define SYNC_DNS 1
 #endif
 
@@ -851 +578 @@
 #endif
 
-
-#if HAVE_KERNEL_SHARE_MODES
-#ifndef LOCK_MAND 
-#define LOCK_MAND       32      /* This is a mandatory flock */
-#define LOCK_READ       64      /* ... Which allows concurrent read operations */
-#define LOCK_WRITE      128     /* ... Which allows concurrent write operations */
-#define LOCK_RW         192     /* ... Which allows concurrent read & write ops */
-#endif
-#endif
-
-extern int DEBUGLEVEL;
 
 #define MAX_SEC_CTX_DEPTH 8    /* Maximum number of security contexts */
@@ -879 +595 @@
 
 
-/* needed for some systems without iconv. Doesn't really matter
-   what error code we use */
-#ifndef EILSEQ
-#define EILSEQ EIO
-#endif
-
 /* add varargs prototypes with printf checking */
 /*PRINTFLIKE2 */
@@ -922 +632 @@
 #endif
 
-#ifdef HAVE_LDAP
-
-/* function declarations not included in proto.h */
-LDAP *ldap_open_with_timeout(const char *server, int port, unsigned int to);
-
-#endif  /* HAVE_LDAP */
-
-#if defined(HAVE_LINUX_READAHEAD) && ! defined(HAVE_READAHEAD_DECL)
-ssize_t readahead(int fd, off64_t offset, size_t count);
-#endif
-
 #ifdef TRUE
 #undef TRUE
@@ -960 +659 @@
 void exit_server_fault(void) _NORETURN_;
 
-#ifdef HAVE_LIBNSCD
-#include "libnscd.h"
-#endif
-
-#if defined(HAVE_IPV6)
-void in6_addr_to_sockaddr_storage(struct sockaddr_storage *ss,
-                                  struct in6_addr ip);
-#endif
-
 /* samba3 doesn't use uwrap yet */
 #define uwrap_enabled() 0
 
+#define BASE_RID (0x000003E8L)
+
 #endif /* _INCLUDES_H */