CVE-2016-2115: s3:winbindd: use lp_client_ipc_{min,max}_protocol()

[samba.git] / source4 / include / includes.h

diff --git a/source4/include/includes.h b/source4/include/includes.h
index a2c8b3472d6a29ed3236cff8af42c967dec65dea..5aabb8e670e945dc209fc72893700e1ab0941b06 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -8,7 +8,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -17,11 +17,10 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "lib/replace/replace.h"
+#include "../replace/replace.h"
 
 /* make sure we have included the correct config.h */
 #ifndef NO_CONFIG_H /* for some tests */
@@ -31,71 +30,48 @@
 #endif
 #endif /* NO_CONFIG_H */
 
-#include "local.h"
-
-#ifdef __GNUC__
-/** gcc attribute used on function parameters so that it does not emit
- * warnings about them being unused. **/
-#  define UNUSED(param) param __attribute__ ((unused))
-#else
-#  define UNUSED(param) param
-/** Feel free to add definitions for other compilers here. */
-#endif
-
-#ifndef _PUBLIC_
-#ifdef HAVE_VISIBILITY_ATTR
-#  define _PUBLIC_ __attribute__((visibility("default")))
-#else
-#  define _PUBLIC_
-#endif
-#endif
+#include "system/time.h"
+#include "system/wait.h"
+#include "system/locale.h"
 
-#ifndef PRINTF_ATTRIBUTE
-#if __GNUC__ >= 3
-/** Use gcc attribute to check printf fns.  a1 is the 1-based index of
- * the parameter containing the format, and a2 the index of the first
- * argument. Note that some gcc 2.x versions don't handle this
- * properly **/
-#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2)))
-#else
-#define PRINTF_ATTRIBUTE(a1, a2)
-#endif
-#endif
+/* only do the C++ reserved word check when we compile
+   to include --with-developer since too many systems
+   still have comflicts with their header files (e.g. IRIX 6.4) */
 
-#ifndef NORETURN_ATTRIBUTE
-#if (__GNUC__ >= 3)
-#define NORETURN_ATTRIBUTE __attribute__ ((noreturn))
-#else
-#define NORETURN_ATTRIBUTE
-#endif
+#if !defined(__cplusplus) && defined(DEVELOPER) && defined(__linux__)
+#define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define public #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define protected #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define template #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define this #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define new #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define delete #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define friend #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
 #endif
 
-/* mark smb_panic() as noreturn, so static analysers know that it is
-   used like abort */
-_PUBLIC_ void smb_panic(const char *why) NORETURN_ATTRIBUTE;
-
-#include "system/time.h"
-#include "system/wait.h"
-
+/* Lists, trees, caching, database... */
+#include <talloc.h>
+#ifndef _PRINTF_ATTRIBUTE
 #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
+#endif
+#include "../lib/util/xfile.h"
+#include "../lib/util/attr.h"
 
-/* Lists, trees, caching, database... */
-#include "talloc/talloc.h"
-#include "core.h"
-#include "charset/charset.h"
-#include "util/util.h"
-#include "param/param.h"
-#include "librpc/gen_ndr/misc.h"
+/* debug.h need to be included before samba_util.h for the macro SMB_ASSERT */
+#include "../lib/util/debug.h"
+#include "../lib/util/samba_util.h"
 
-struct smbcli_tree;
 #include "libcli/util/error.h"
 
 /* String routines */
-#include "util/safe_string.h"
+#include "../lib/util/safe_string.h"
 
-#if 0
-/* darn, we can't do this now that we don't link the ldb tools to all the smb libs */
-#define TALLOC_ABORT(reason) smb_panic(reason)
-#endif
+/* Thread functions. */
+#include "../lib/util/smb_threads.h"
+#include "../lib/util/smb_threads_internal.h"
+
+/* samba_setXXid functions. */
+#include "../lib/util/setid.h"
 
 #endif /* _INCLUDES_H */