[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-436-g1897cef

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  1897cef508c8bea817c510bd9023d794cb983864 (commit)
       via  d5c61f470d7aa6dd0e5a22e8718d53a69cbbc239 (commit)
      from  3862f3132549332e0a44fad65d7c49a27e1dbd4a (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 1897cef508c8bea817c510bd9023d794cb983864
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Sep 3 22:29:53 2008 +0200

    Avoid using version call for version string.

commit d5c61f470d7aa6dd0e5a22e8718d53a69cbbc239
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Sep 3 22:26:02 2008 +0200

    Allow overriding shared library policy using environment variable.

-----------------------------------------------------------------------

Summary of changes:
 source/build/smb_build/main.pl |    6 ++++--
 source/dynconfig/config.mk     |    3 +--
 source/dynconfig/version.c     |   27 ---------------------------
 source/scripting/python/misc.i |    7 +++----
 4 files changed, 8 insertions(+), 35 deletions(-)
 delete mode 100644 source/dynconfig/version.c


Changeset truncated at 500 lines:

diff --git a/source/build/smb_build/main.pl b/source/build/smb_build/main.pl
index f8a0cb0..3c84a91 100644
--- a/source/build/smb_build/main.pl
+++ b/source/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/source/dynconfig/config.mk b/source/dynconfig/config.mk
index 4956fda..b100183 100644
--- a/source/dynconfig/config.mk
+++ b/source/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/source/dynconfig/version.c b/source/dynconfig/version.c
deleted file mode 100644
index e81f463..0000000
--- a/source/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/source/scripting/python/misc.i b/source/scripting/python/misc.i
index 1d33121..437f02a 100644
--- a/source/scripting/python/misc.i
+++ b/source/scripting/python/misc.i
@@ -77,10 +77,9 @@ 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.";
+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.";


-- 
Samba Shared Repository