diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-03 22:29:53 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-03 22:29:53 +0200 |
| commit | 24a9181f25a64937ec0c81ed40e9744de0f164e9 (patch) | |
| tree | deeda715acb70fdacde3ae5703ae0a18c9313473 | |
| parent | 1a1c30405198d82746851f5244be901cf5d1ae6b (diff) | |
| download | samba-24a9181f25a64937ec0c81ed40e9744de0f164e9.tar.gz samba-24a9181f25a64937ec0c81ed40e9744de0f164e9.tar.bz2 samba-24a9181f25a64937ec0c81ed40e9744de0f164e9.zip | |
Avoid using version call for version string.
(This used to be commit 1897cef508c8bea817c510bd9023d794cb983864)
| -rw-r--r-- | source4/dynconfig/config.mk | 3 | ||||
| -rw-r--r-- | source4/dynconfig/version.c | 27 | ||||
| -rw-r--r-- | source4/scripting/python/misc.i | 7 |
3 files changed, 4 insertions, 33 deletions
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/scripting/python/misc.i b/source4/scripting/python/misc.i index 1d331215b5..437f02a1ee 100644 --- a/source4/scripting/python/misc.i +++ b/source4/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."; |