From efe67458c17ffa52b48f979505caf11c2ac52c4e Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 13 Dec 2005 19:38:12 +0000 Subject: r12216: Couple of small fixes: reduce include/includes.h a bit, simplify headers in build/smb_build/, remove unused pstring macros (This used to be commit 432296207400636dd81d0929ec7b1b4cebbcaa62) --- source4/build/smb_build/TODO | 3 +++ source4/build/smb_build/config_mk.pm | 14 +++++++------- source4/build/smb_build/env.pm | 1 - source4/build/smb_build/input.pm | 14 ++++++-------- source4/build/smb_build/main.pl | 14 ++++++-------- source4/build/smb_build/makefile.pm | 14 ++++++-------- source4/build/smb_build/output.pm | 14 ++++++-------- source4/build/smb_build/smb_build_h.pm | 12 +++++------- source4/include/includes.h | 5 ----- source4/include/safe_string.h | 9 --------- source4/include/structs.h | 4 ++++ source4/lib/com/dcom/dcom.h | 2 ++ source4/lib/com/tables.c | 1 + source4/lib/replace/README | 4 ++++ source4/lib/replace/replace.h | 4 ++++ source4/lib/util_str.c | 1 - source4/libcli/config.mk | 4 ++-- source4/script/tests/test_rpc_quick.sh | 0 18 files changed, 56 insertions(+), 64 deletions(-) mode change 100644 => 100755 source4/script/tests/test_rpc_quick.sh diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO index d3fcbd1370..8fe11bfc85 100644 --- a/source4/build/smb_build/TODO +++ b/source4/build/smb_build/TODO @@ -1,5 +1,8 @@ - split up proto.h into headers with public or private prototypes. Public prototypes can be marked with _PUBLIC_ in the source + - get rid of include/structs.h +- install Samba-specific headers in $INCLUDEDIR/samba-4.0. talloc.h, tdb.h and + ldb.h belong in $INCLUDEDIR - never install -rpath binaries / libraries, always relink before install - keep files without -rpath in bin/install - init functions may be called more then once as different libraries diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index d7408a5f8f..3d55718541 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/build/smb_build/config_mk.pm @@ -1,10 +1,10 @@ -########################################################### -### SMB Build System ### -### - config.mk parsing functions ### -### ### -### Copyright (C) Stefan (metze) Metzmacher 2004 ### -### Released under the GNU GPL ### -########################################################### +# Samba Build System +# - config.mk parsing functions +# +# Copyright (C) Stefan (metze) Metzmacher 2004 +# Copyright (C) Jelmer Vernooij 2005 +# Released under the GNU GPL +# package smb_build::config_mk; use smb_build::input; diff --git a/source4/build/smb_build/env.pm b/source4/build/smb_build/env.pm index 8acd7dd932..1ad8e23d36 100644 --- a/source4/build/smb_build/env.pm +++ b/source4/build/smb_build/env.pm @@ -1,4 +1,3 @@ -# # Environment class # # Samba Build Environment diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index 5dcbb8c904..ebc91a9107 100644 --- a/source4/build/smb_build/input.pm +++ b/source4/build/smb_build/input.pm @@ -1,11 +1,9 @@ -########################################################### -### SMB Build System ### -### - the input checking functions ### -### ### -### Copyright (C) Stefan (metze) Metzmacher 2004 ### -### Copyright (C) Jelmer Vernooij 2004 ### -### Released under the GNU GPL ### -########################################################### +# Samba Build System +# - the input checking functions +# +# Copyright (C) Stefan (metze) Metzmacher 2004 +# Copyright (C) Jelmer Vernooij 2004 +# Released under the GNU GPL use strict; package smb_build::input; diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index 4c42c7a7c1..0c027facc3 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -1,11 +1,9 @@ -########################################################### -### SMB Build System ### -### - the main program ### -### ### -### Copyright (C) Stefan (metze) Metzmacher 2004 ### -### Copyright (C) Jelmer Vernooij 2005 -### Released under the GNU GPL ### -########################################################### +# Samba Build System +# - the main program +# +# Copyright (C) Stefan (metze) Metzmacher 2004 +# Copyright (C) Jelmer Vernooij 2005 +# Released under the GNU GPL use smb_build::makefile; use smb_build::smb_build_h; diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index a84d336716..0543037fef 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -1,11 +1,9 @@ -########################################################### -### SMB Build System ### -### - create output for Makefile ### -### ### -### Copyright (C) Stefan (metze) Metzmacher 2004 ### -### Copyright (C) Jelmer Vernooij 2005 ### -### Released under the GNU GPL ### -########################################################### +# Samba Build System +# - create output for Makefile +# +# Copyright (C) Stefan (metze) Metzmacher 2004 +# Copyright (C) Jelmer Vernooij 2005 +# Released under the GNU GPL package smb_build::makefile; use smb_build::env; diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index d7618766f6..92b2f05c62 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -1,11 +1,9 @@ -########################################################### -### SMB Build System ### -### - the output generating functions ### -### ### -### Copyright (C) Stefan (metze) Metzmacher 2004 ### -### Copyright (C) Jelmer Vernooij 2004 ### -### Released under the GNU GPL ### -########################################################### +# SMB Build System +# - the output generating functions +# +# Copyright (C) Stefan (metze) Metzmacher 2004 +# Copyright (C) Jelmer Vernooij 2004 +# Released under the GNU GPL package output; use strict; diff --git a/source4/build/smb_build/smb_build_h.pm b/source4/build/smb_build/smb_build_h.pm index b31cf8b9d9..e06e965ac7 100644 --- a/source4/build/smb_build/smb_build_h.pm +++ b/source4/build/smb_build/smb_build_h.pm @@ -1,10 +1,8 @@ -########################################################### -### SMB Build System ### -### - create output for smb_build.h ### -### ### -### Copyright (C) Stefan (metze) Metzmacher 2004 ### -### Released under the GNU GPL ### -########################################################### +# SMB Build System +# - create output for smb_build.h +# +# Copyright (C) Stefan (metze) Metzmacher 2004 +# Released under the GNU GPL package smb_build_h; use strict; diff --git a/source4/include/includes.h b/source4/include/includes.h index f2da31eed6..18fc38031c 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -112,7 +112,6 @@ struct ipv4_addr { #include "smb_interfaces.h" #include "ntvfs/ntvfs.h" #include "cli_context.h" -#include "lib/com/com.h" #include "auth/credentials/credentials.h" /***** automatically generated prototypes *****/ @@ -161,8 +160,4 @@ extern int DEBUGLEVEL; #define discard_const(ptr) ((void *)((intptr_t)(ptr))) #define discard_const_p(type, ptr) ((type *)discard_const(ptr)) -#ifndef UINT16_MAX -#define UINT16_MAX 65535 -#endif - #endif /* _INCLUDES_H */ diff --git a/source4/include/safe_string.h b/source4/include/safe_string.h index 7c2b93270c..57c5d21429 100644 --- a/source4/include/safe_string.h +++ b/source4/include/safe_string.h @@ -57,13 +57,4 @@ #define strlower(s) strlower_m(s) #define strupper(s) strupper_m(s) -/* the addition of the DEVELOPER checks in safe_strcpy means we must - * update a lot of code. To make this a little easier here are some - * functions that provide the lengths with less pain */ -#define pstrcpy_base(dest, src, pstring_base) \ - safe_strcpy(dest, src, sizeof(pstring)-PTR_DIFF(dest,pstring_base)-1) - -#define push_pstring_base(dest, src, pstring_base) \ - push_ascii(dest, src, sizeof(pstring)-PTR_DIFF(dest,pstring_base)-1, STR_TERMINATE) - #endif diff --git a/source4/include/structs.h b/source4/include/structs.h index 89b8bf9dcf..b6ccd0ce19 100644 --- a/source4/include/structs.h +++ b/source4/include/structs.h @@ -365,3 +365,7 @@ struct smb2_find; struct smb2_ioctl; struct smb2_flush; struct smb2_handle; + +struct com_context; +struct IUnknown; +struct IUnknown_vtable; diff --git a/source4/lib/com/dcom/dcom.h b/source4/lib/com/dcom/dcom.h index 1e15daf830..41b155248e 100644 --- a/source4/lib/com/dcom/dcom.h +++ b/source4/lib/com/dcom/dcom.h @@ -21,6 +21,8 @@ #ifndef _DCOM_H /* _DCOM_H */ #define _DCOM_H +#include "lib/com/com.h" + struct dcom_client_context { struct cli_credentials *credentials; struct dcom_object_exporter { diff --git a/source4/lib/com/tables.c b/source4/lib/com/tables.c index 39bd6a6bd7..661f5d0b37 100644 --- a/source4/lib/com/tables.c +++ b/source4/lib/com/tables.c @@ -20,6 +20,7 @@ #include "includes.h" #include "dlinklist.h" +#include "lib/com/com.h" /* Specific implementation of one or more interfaces */ struct com_class diff --git a/source4/lib/replace/README b/source4/lib/replace/README index 45c8bccf13..1e804d50e1 100644 --- a/source4/lib/replace/README +++ b/source4/lib/replace/README @@ -56,6 +56,10 @@ uint_t uint{8,16,32,64}_t int{8,16,32,64}_t +Constants: +PATH_NAME_MAX +UINT16_MAX + Prerequisites: memset (for bzero) syslog (for vsyslog) diff --git a/source4/lib/replace/replace.h b/source4/lib/replace/replace.h index e3eef56eeb..fda494a444 100644 --- a/source4/lib/replace/replace.h +++ b/source4/lib/replace/replace.h @@ -166,4 +166,8 @@ int rep_mkstemp(char *temp); #define HOST_NAME_MAX 64 #endif +#ifndef UINT16_MAX +#define UINT16_MAX 65535 +#endif + #endif diff --git a/source4/lib/util_str.c b/source4/lib/util_str.c index e1fa19aa0b..56a1345e38 100644 --- a/source4/lib/util_str.c +++ b/source4/lib/util_str.c @@ -1110,4 +1110,3 @@ char *attrib_string(TALLOC_CTX *mem_ctx, uint32_t attrib) return ret; } - diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk index 47b07a353b..cbbc2f4235 100644 --- a/source4/libcli/config.mk +++ b/source4/libcli/config.mk @@ -58,8 +58,8 @@ REQUIRED_SUBSYSTEMS = LIBCLI_NBT MAJOR_VERSION = 0 MINOR_VERSION = 0 RELEASE_VERSION = 1 -ADD_OBJ_FILES = \ - cldap/cldap.o +ADD_OBJ_FILES = cldap/cldap.o +PUBLIC_HEADERS = cldap/cldap.h NOPROTO=YES REQUIRED_SUBSYSTEMS = LIBCLI_LDAP diff --git a/source4/script/tests/test_rpc_quick.sh b/source4/script/tests/test_rpc_quick.sh old mode 100644 new mode 100755 -- cgit