diff options
| -rw-r--r-- | source4/Makefile | 1 | ||||
| -rw-r--r-- | source4/build/m4/public.m4 | 12 | ||||
| -rw-r--r-- | source4/build/smb_build/main.pl | 6 | ||||
| -rw-r--r-- | source4/dynconfig/config.mk | 3 | ||||
| -rw-r--r-- | source4/dynconfig/version.c | 27 | ||||
| -rw-r--r-- | source4/lib/zlib.mk | 27 | ||||
| -rw-r--r-- | source4/scripting/python/misc.i | 14 | ||||
| -rw-r--r-- | source4/scripting/python/misc.py | 2 | ||||
| -rw-r--r-- | source4/scripting/python/misc_wrap.c | 33 |
9 files changed, 62 insertions, 63 deletions
diff --git a/source4/Makefile b/source4/Makefile index b0aa009edd..d91d08a252 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -49,6 +49,7 @@ endif include $(srcdir)/build/make/rules.mk include $(srcdir)/build/make/python.mk +zlibsrcdir := lib/zlib dynconfigsrcdir := dynconfig heimdalsrcdir := heimdal dsdbsrcdir := dsdb diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4 index d932f09a69..d61e00b22e 100644 --- a/source4/build/m4/public.m4 +++ b/source4/build/m4/public.m4 @@ -155,16 +155,22 @@ SMB_INFO_ENABLES="$SMB_INFO_ENABLES \$enabled{$1} = \"$2\";" ]) -dnl SMB_WRITE_MAKEVARS(path) +dnl SMB_WRITE_MAKEVARS(path, skip_vars) AC_DEFUN([SMB_WRITE_MAKEVARS], [ echo "configure: creating $1" cat >$1<<CEOF # $1 - Autogenerated by configure, DO NOT EDIT! -AC_FOREACH([AC_Var], m4_defn([_AC_SUBST_VARS]), [ -AC_Var = $AC_Var]) $MAKE_SETTINGS CEOF +skip_vars=" $2 " +for ac_var in $ac_subst_vars +do + eval ac_val=\$$ac_var + if echo "$skip_vars" | grep -v " $ac_var " >/dev/null 2>/dev/null; then + echo "$ac_var = $ac_val" >> $1 + fi +done ]) dnl SMB_WRITE_PERLVARS(path) diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index f8a0cb004f..3c84a91a59 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -31,7 +31,9 @@ my $mkfile = smb_build::config_mk::run_config_mk($INPUT, $config::config{srcdir} my $subsys_output_type = ["MERGED_OBJ"]; my $library_output_type; -if ($config::config{USESHARED} eq "true") { +my $useshared = (defined($ENV{USESHARED})?$ENV{USESHARED}:$config::config{USESHARED}); + +if ($useshared eq "true") { $library_output_type = ["SHARED_LIBRARY", "MERGED_OBJ"]; } else { $library_output_type = ["MERGED_OBJ"]; @@ -40,7 +42,7 @@ if ($config::config{USESHARED} eq "true") { } my $module_output_type; -if ($config::config{USESHARED} eq "true") { +if ($useshared eq "true") { $module_output_type = ["SHARED_LIBRARY"]; } else { $module_output_type = ["MERGED_OBJ"]; diff --git a/source4/dynconfig/config.mk b/source4/dynconfig/config.mk index 4956fda519..b10018384f 100644 --- a/source4/dynconfig/config.mk +++ b/source4/dynconfig/config.mk @@ -1,7 +1,6 @@ [SUBSYSTEM::DYNCONFIG] -DYNCONFIG_OBJ_FILES = $(dynconfigsrcdir)/dynconfig.o \ - $(dynconfigsrcdir)/version.o +DYNCONFIG_OBJ_FILES = $(dynconfigsrcdir)/dynconfig.o # set these to where to find various files # These can be overridden by command line switches (see smbd(8)) diff --git a/source4/dynconfig/version.c b/source4/dynconfig/version.c deleted file mode 100644 index e81f463586..0000000000 --- a/source4/dynconfig/version.c +++ /dev/null @@ -1,27 +0,0 @@ -/* - Unix SMB/CIFS implementation. - Samba Version functions - - Copyright (C) Stefan Metzmacher 2003 - - 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 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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, see <http://www.gnu.org/licenses/>. -*/ - -#include "includes.h" -#include "version.h" - -const char *samba_version_string(void) -{ - return SAMBA_VERSION_STRING; -} diff --git a/source4/lib/zlib.mk b/source4/lib/zlib.mk index 095f129feb..5c5e6e69ba 100644 --- a/source4/lib/zlib.mk +++ b/source4/lib/zlib.mk @@ -1,17 +1,16 @@ [SUBSYSTEM::ZLIB] -CFLAGS = -Ilib/zlib +CFLAGS = -I$(zlibsrcdir) -libzlibsrcdir := lib/zlib ZLIB_OBJ_FILES = \ - $(libzlibsrcdir)/adler32.o \ - $(libzlibsrcdir)/compress.o \ - $(libzlibsrcdir)/crc32.o \ - $(libzlibsrcdir)/gzio.o \ - $(libzlibsrcdir)/uncompr.o \ - $(libzlibsrcdir)/deflate.o \ - $(libzlibsrcdir)/trees.o \ - $(libzlibsrcdir)/zutil.o \ - $(libzlibsrcdir)/inflate.o \ - $(libzlibsrcdir)/infback.o \ - $(libzlibsrcdir)/inftrees.o \ - $(libzlibsrcdir)/inffast.o + $(zlibsrcdir)/adler32.o \ + $(zlibsrcdir)/compress.o \ + $(zlibsrcdir)/crc32.o \ + $(zlibsrcdir)/gzio.o \ + $(zlibsrcdir)/uncompr.o \ + $(zlibsrcdir)/deflate.o \ + $(zlibsrcdir)/trees.o \ + $(zlibsrcdir)/zutil.o \ + $(zlibsrcdir)/inflate.o \ + $(zlibsrcdir)/infback.o \ + $(zlibsrcdir)/inftrees.o \ + $(zlibsrcdir)/inffast.o diff --git a/source4/scripting/python/misc.i b/source4/scripting/python/misc.i index 1d331215b5..19318cdb17 100644 --- a/source4/scripting/python/misc.i +++ b/source4/scripting/python/misc.i @@ -26,6 +26,7 @@ #include "dsdb/samdb/samdb.h" #include "lib/ldb-samba/ldif_handlers.h" #include "librpc/ndr/libndr.h" +#include "version.h" %} %import "stdint.i" @@ -77,10 +78,15 @@ bool samdb_set_domain_sid(struct ldb_context *ldb, WERROR dsdb_attach_schema_from_ldif_file(struct ldb_context *ldb, const char *pf, const char *df); -%feature("docstring") samba_version_string "version()\n" - "Obtain the Samba version."; -%rename(version) samba_version_string; -const char *samba_version_string(void); +%feature("docstring") version "version()\n" + "Obtain the Samba version."; + +%inline { +const char *version(void) +{ + return SAMBA_VERSION_STRING; +} +} int dsdb_set_global_schema(struct ldb_context *ldb); %feature("docstring") ldb_register_samba_handlers "register_samba_handlers()\n" "Register Samba-specific LDB modules and schemas."; diff --git a/source4/scripting/python/misc.py b/source4/scripting/python/misc.py index 0c14944001..933ceef35f 100644 --- a/source4/scripting/python/misc.py +++ b/source4/scripting/python/misc.py @@ -1,5 +1,5 @@ # This file was automatically generated by SWIG (http://www.swig.org). -# Version 1.3.35 +# Version 1.3.36 # # Don't modify this file, modify the SWIG interface instead. diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c index 888918ef53..c7cdb86c35 100644 --- a/source4/scripting/python/misc_wrap.c +++ b/source4/scripting/python/misc_wrap.c @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 1.3.35 + * Version 1.3.36 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -52,6 +52,12 @@ # endif #endif +#ifndef SWIG_MSC_UNSUPPRESS_4505 +# if defined(_MSC_VER) +# pragma warning(disable : 4505) /* unreferenced local function has been removed */ +# endif +#endif + #ifndef SWIGUNUSEDPARM # ifdef __cplusplus # define SWIGUNUSEDPARM(p) @@ -2537,7 +2543,7 @@ static swig_module_info swig_module = {swig_types, 27, 0, 0, 0, 0}; #define SWIG_name "_misc" -#define SWIGVERSION 0x010335 +#define SWIGVERSION 0x010336 #define SWIG_VERSION SWIGVERSION @@ -2552,6 +2558,7 @@ static swig_module_info swig_module = {swig_types, 27, 0, 0, 0, 0}; #include "dsdb/samdb/samdb.h" #include "lib/ldb-samba/ldif_handlers.h" #include "librpc/ndr/libndr.h" +#include "version.h" #include "libcli/util/pyerrors.h" @@ -2807,6 +2814,12 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc) +const char *version(void) +{ + return SAMBA_VERSION_STRING; +} + + #define SWIG_From_long PyInt_FromLong @@ -2833,13 +2846,13 @@ SWIGINTERN PyObject *_wrap_random_password(PyObject *SWIGUNUSEDPARM(self), PyObj PyObject *resultobj = 0; TALLOC_CTX *arg1 = (TALLOC_CTX *) 0 ; size_t arg2 ; - char *result = 0 ; size_t val2 ; int ecode2 = 0 ; PyObject * obj0 = 0 ; char * kwnames[] = { (char *) "len", NULL }; + char *result = 0 ; arg1 = NULL; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:random_password",kwnames,&obj0)) SWIG_fail; @@ -2974,7 +2987,6 @@ SWIGINTERN PyObject *_wrap_samdb_set_domain_sid(PyObject *SWIGUNUSEDPARM(self), PyObject *resultobj = 0; struct ldb_context *arg1 = (struct ldb_context *) 0 ; struct dom_sid *arg2 = (struct dom_sid *) 0 ; - bool result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; @@ -2984,6 +2996,7 @@ SWIGINTERN PyObject *_wrap_samdb_set_domain_sid(PyObject *SWIGUNUSEDPARM(self), char * kwnames[] = { (char *) "ldb",(char *) "dom_sid_in", NULL }; + bool result; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:samdb_set_domain_sid",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 | 0 ); @@ -3012,7 +3025,6 @@ SWIGINTERN PyObject *_wrap_dsdb_attach_schema_from_ldif_file(PyObject *SWIGUNUSE struct ldb_context *arg1 = (struct ldb_context *) 0 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; - WERROR result; void *argp1 = 0 ; int res1 = 0 ; int res2 ; @@ -3027,6 +3039,7 @@ SWIGINTERN PyObject *_wrap_dsdb_attach_schema_from_ldif_file(PyObject *SWIGUNUSE char * kwnames[] = { (char *) "ldb",(char *) "pf",(char *) "df", NULL }; + WERROR result; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:dsdb_attach_schema_from_ldif_file",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 | 0 ); @@ -3069,7 +3082,7 @@ SWIGINTERN PyObject *_wrap_version(PyObject *SWIGUNUSEDPARM(self), PyObject *arg char *result = 0 ; if (!SWIG_Python_UnpackTuple(args,"version",0,0,0)) SWIG_fail; - result = (char *)samba_version_string(); + result = (char *)version(); resultobj = SWIG_FromCharPtr((const char *)result); return resultobj; fail: @@ -3080,13 +3093,13 @@ fail: SWIGINTERN PyObject *_wrap_dsdb_set_global_schema(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; struct ldb_context *arg1 = (struct ldb_context *) 0 ; - int result; void *argp1 = 0 ; int res1 = 0 ; PyObject * obj0 = 0 ; char * kwnames[] = { (char *) "ldb", NULL }; + int result; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:dsdb_set_global_schema",kwnames,&obj0)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 | 0 ); @@ -3108,13 +3121,13 @@ fail: SWIGINTERN PyObject *_wrap_ldb_register_samba_handlers(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; struct ldb_context *arg1 = (struct ldb_context *) 0 ; - int result; void *argp1 = 0 ; int res1 = 0 ; PyObject * obj0 = 0 ; char * kwnames[] = { (char *) "ldb", NULL }; + int result; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ldb_register_samba_handlers",kwnames,&obj0)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 | 0 ); @@ -3137,7 +3150,6 @@ SWIGINTERN PyObject *_wrap_dsdb_set_ntds_invocation_id(PyObject *SWIGUNUSEDPARM( PyObject *resultobj = 0; struct ldb_context *arg1 = (struct ldb_context *) 0 ; char *arg2 = (char *) 0 ; - bool result; void *argp1 = 0 ; int res1 = 0 ; int res2 ; @@ -3148,6 +3160,7 @@ SWIGINTERN PyObject *_wrap_dsdb_set_ntds_invocation_id(PyObject *SWIGUNUSEDPARM( char * kwnames[] = { (char *) "ldb",(char *) "guid", NULL }; + bool result; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:dsdb_set_ntds_invocation_id",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 | 0 ); @@ -3178,7 +3191,6 @@ SWIGINTERN PyObject *_wrap_private_path(PyObject *SWIGUNUSEDPARM(self), PyObject TALLOC_CTX *arg1 = (TALLOC_CTX *) 0 ; struct loadparm_context *arg2 = (struct loadparm_context *) 0 ; char *arg3 = (char *) 0 ; - char *result = 0 ; void *argp2 = 0 ; int res2 = 0 ; int res3 ; @@ -3189,6 +3201,7 @@ SWIGINTERN PyObject *_wrap_private_path(PyObject *SWIGUNUSEDPARM(self), PyObject char * kwnames[] = { (char *) "lp_ctx",(char *) "name", NULL }; + char *result = 0 ; arg2 = loadparm_init(NULL); arg1 = NULL; |