From edbfc0f6e70150e321822365bf0eead2821551bd Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 2 Nov 2004 02:57:18 +0000 Subject: r3453: - split out the auth and popt includes - tidied up some of the system includes - moved a few more structures back from misc.idl to netlogon.idl and samr.idl now that pidl knows about inter-IDL dependencies (This used to be commit 7b7477ac42d96faac1b0ff361525d2c63cedfc64) --- source4/include/includes.h | 165 +-------------------------------------------- 1 file changed, 1 insertion(+), 164 deletions(-) (limited to 'source4/include/includes.h') diff --git a/source4/include/includes.h b/source4/include/includes.h index c38c0acc8b..f45665ad05 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -72,12 +72,10 @@ /** Feel free to add definitions for other compilers here. */ #endif -#include #include -#include #include -#include #include +#include #ifdef HAVE_STDINT_H #include @@ -87,53 +85,15 @@ #include #endif -#ifdef HAVE_STRINGS_H -#include -#endif - -#ifdef HAVE_MEMORY_H -#include -#endif - -#ifdef HAVE_MALLOC_H -#include -#endif - -#ifdef HAVE_FCNTL_H -#include -#else -#ifdef HAVE_SYS_FCNTL_H -#include -#endif -#endif - -#include - -#ifdef HAVE_SYS_IOCTL_H -#include -#endif - #include - #include -#ifdef HAVE_SYS_MODE_H -/* apparently AIX needs this for S_ISLNK */ -#ifndef S_ISLNK -#include -#endif -#endif - #ifdef HAVE_STDARG_H #include #else #include #endif -#ifdef HAVE_STROPTS_H -#include -#endif - /* we support ADS if we want it and have krb5 and ldap libs */ #if defined(WITH_ADS) && defined(HAVE_KRB5) && defined(HAVE_LDAP) #define HAVE_ADS @@ -220,10 +180,6 @@ struct ipv4_addr { #define UINT16_MAX 65535 #endif -/* - * Type for stat structure. - */ - #ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) #endif @@ -300,12 +256,6 @@ extern int errno; #include "librpc/rpc/dcerpc.h" #include "librpc/gen_ndr/tables.h" -#include "libcli/auth/ntlmssp.h" -#include "libcli/auth/credentials.h" -#include "libcli/auth/gensec.h" -#include "libcli/auth/spnego.h" -#include "auth/auth.h" - #include "smb_interfaces.h" #include "smbd/server.h" #include "smbd/service.h" @@ -491,105 +441,11 @@ int vasprintf(char **ptr, const char *format, va_list ap); #define MSG_WAITALL 0 #endif -/* default socket options. Dave Miller thinks we should default to TCP_NODELAY - given the socket IO pattern that Samba uses */ -#ifdef TCP_NODELAY -#define DEFAULT_SOCKET_OPTIONS "TCP_NODELAY" -#else -#define DEFAULT_SOCKET_OPTIONS "" -#endif - /* Load header file for dynamic linking stuff */ - #ifdef HAVE_DLFCN_H #include #endif -/* dmalloc -- free heap debugger (dmalloc.org). This should be near - * the *bottom* of include files so as not to conflict. */ -#ifdef ENABLE_DMALLOC -# include -#endif - - -/* Some POSIX definitions for those without */ - -#ifndef S_IFDIR -#define S_IFDIR 0x4000 -#endif -#ifndef S_ISDIR -#define S_ISDIR(mode) ((mode & 0xF000) == S_IFDIR) -#endif -#ifndef S_IRWXU -#define S_IRWXU 00700 /* read, write, execute: owner */ -#endif -#ifndef S_IRUSR -#define S_IRUSR 00400 /* read permission: owner */ -#endif -#ifndef S_IWUSR -#define S_IWUSR 00200 /* write permission: owner */ -#endif -#ifndef S_IXUSR -#define S_IXUSR 00100 /* execute permission: owner */ -#endif -#ifndef S_IRWXG -#define S_IRWXG 00070 /* read, write, execute: group */ -#endif -#ifndef S_IRGRP -#define S_IRGRP 00040 /* read permission: group */ -#endif -#ifndef S_IWGRP -#define S_IWGRP 00020 /* write permission: group */ -#endif -#ifndef S_IXGRP -#define S_IXGRP 00010 /* execute permission: group */ -#endif -#ifndef S_IRWXO -#define S_IRWXO 00007 /* read, write, execute: other */ -#endif -#ifndef S_IROTH -#define S_IROTH 00004 /* read permission: other */ -#endif -#ifndef S_IWOTH -#define S_IWOTH 00002 /* write permission: other */ -#endif -#ifndef S_IXOTH -#define S_IXOTH 00001 /* execute permission: other */ -#endif - -/* For sys_adminlog(). */ -#ifndef LOG_EMERG -#define LOG_EMERG 0 /* system is unusable */ -#endif - -#ifndef LOG_ALERT -#define LOG_ALERT 1 /* action must be taken immediately */ -#endif - -#ifndef LOG_CRIT -#define LOG_CRIT 2 /* critical conditions */ -#endif - -#ifndef LOG_ERR -#define LOG_ERR 3 /* error conditions */ -#endif - -#ifndef LOG_WARNING -#define LOG_WARNING 4 /* warning conditions */ -#endif - -#ifndef LOG_NOTICE -#define LOG_NOTICE 5 /* normal but significant condition */ -#endif - -#ifndef LOG_INFO -#define LOG_INFO 6 /* informational */ -#endif - -#ifndef LOG_DEBUG -#define LOG_DEBUG 7 /* debug-level messages */ -#endif - extern int DEBUGLEVEL; #ifndef RTLD_LAZY @@ -631,25 +487,6 @@ time_t timegm(struct tm *tm); #define strlen(x) valgrind_strlen(x) #endif -/* - * Veritas File System. Often in addition to native. - * Quotas different. - */ -#if defined(HAVE_SYS_FS_VX_QUOTA_H) -#define VXFS_QUOTA -#endif - -#if HAVE_SYS_ATTRIBUTES_H -#include -#endif - -/* mutually exclusive (SuSE 8.2) */ -#if HAVE_ATTR_XATTR_H -#include -#elif HAVE_SYS_XATTR_H -#include -#endif - #define TALLOC_ABORT(reason) smb_panic(reason) -- cgit