[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Mon Dec 11 02:14:02 UTC 2023
The branch, master has been updated
via f642aff5544 buildtools: Remove ‘keep_underscore’ parameter
via 623645963ee buildtools: Remove useless ‘keep_underscore’ parameter
via e3ad675303d buildtools: Pass through parameter ‘keep_underscore’
via 45b7a0c13e2 s4:librpc: Fix code spelling
via 2e5d75141d7 buildtools: Fix code spelling
via cdff2b767ec buildtools: Remove unused parameter ‘env’
from f2f7ed419e0 s3:utils: Fix auth callback with smburl
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f642aff554464b833ec4575464cc481ee9a8d807
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Mon Nov 13 09:44:26 2023 +1300
buildtools: Remove ‘keep_underscore’ parameter
Nothing now passes this in.
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Mon Dec 11 02:13:39 UTC 2023 on atb-devel-224
commit 623645963eef05f6ae3141392a6c828f85679ba6
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Mon Nov 13 09:39:20 2023 +1300
buildtools: Remove useless ‘keep_underscore’ parameter
SAMBA_LIBARY()’s ‘keep_underscore’ parameter has an effect only if None
is passed in for ‘bundled_name’. However, SAMBA_PLUGIN() always passes
in a string for ‘bundled_name’. Therefore ‘keep_underscore’ will never
have any effect — remove it.
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit e3ad675303d21eded172cb692b9313e5dfbbbcca
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Sat Oct 21 12:08:23 2023 +1300
buildtools: Pass through parameter ‘keep_underscore’
This parameter has gone unused until now.
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 45b7a0c13e292da5898ca67c4814cf80bd7ae6a4
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Sat Nov 11 10:03:20 2023 +1300
s4:librpc: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 2e5d75141d79d1be5495fc423131eeafb9fb6175
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Sat Oct 21 15:14:04 2023 +1300
buildtools: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit cdff2b767ec243bc4c29e4637fc20e7812621bb3
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Sat Oct 21 14:13:27 2023 +1300
buildtools: Remove unused parameter ‘env’
This parameter goes unused, and nothing passes it in.
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/wafsamba.py | 15 +++++----------
nsswitch/wscript_build | 2 --
source4/librpc/wscript_build | 2 +-
3 files changed, 6 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 8c0aa23fe21..858458ae2af 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -109,7 +109,6 @@ def SAMBA_LIBRARY(bld, libname, source,
ldflags='',
external_library=False,
realname=None,
- keep_underscore=False,
autoproto=None,
autoproto_extra_source='',
group='main',
@@ -141,7 +140,7 @@ def SAMBA_LIBRARY(bld, libname, source,
'''define a Samba library'''
# We support:
- # - LIBRARY: this can be use to link via -llibname
+ # - LIBRARY: this can be used to link via -llibname
# - MODULE: this is module from SAMBA_MODULE()
# - PLUGIN: this is plugin for external consumers to be
# loaded via dlopen()
@@ -298,10 +297,7 @@ def SAMBA_LIBRARY(bld, libname, source,
if bundled_name is not None:
pass
elif target_type == 'PYTHON' or realname or not private_library:
- if keep_underscore:
- bundled_name = libname
- else:
- bundled_name = libname.replace('_', '-')
+ bundled_name = libname.replace('_', '-')
else:
assert (private_library is True and realname is None)
bundled_name = PRIVATE_NAME(bld, libname.replace('_', '-'))
@@ -654,7 +650,6 @@ def SAMBA_PLUGIN(bld, pluginname, source,
vars=None,
subdir=None,
realname=None,
- keep_underscore=False,
autoproto=None,
autoproto_extra_source='',
install_path=None,
@@ -1133,7 +1128,7 @@ def INSTALL_WILDCARD(bld, destdir, pattern, chmod=MODE_644, flat=False,
python_fixup=python_fixup, base_name=trim_path)
Build.BuildContext.INSTALL_WILDCARD = INSTALL_WILDCARD
-def INSTALL_DIR(bld, path, chmod=0o755, env=None):
+def INSTALL_DIR(bld, path, chmod=0o755):
"""Install a directory if it doesn't exist, always set permissions."""
if not path:
@@ -1154,12 +1149,12 @@ def INSTALL_DIR(bld, path, chmod=0o755, env=None):
raise Errors.WafError("Cannot create the folder '%s' (error: %s)" % (path, e))
Build.BuildContext.INSTALL_DIR = INSTALL_DIR
-def INSTALL_DIRS(bld, destdir, dirs, chmod=0o755, env=None):
+def INSTALL_DIRS(bld, destdir, dirs, chmod=0o755):
'''install a set of directories'''
destdir = bld.EXPAND_VARIABLES(destdir)
dirs = bld.EXPAND_VARIABLES(dirs)
for d in TO_LIST(dirs):
- INSTALL_DIR(bld, os.path.join(destdir, d), chmod, env)
+ INSTALL_DIR(bld, os.path.join(destdir, d), chmod)
Build.BuildContext.INSTALL_DIRS = INSTALL_DIRS
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 4e62bb4c946..4c5f708328b 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -36,7 +36,6 @@ bld.SAMBA_PLUGIN('nss_wrapper_winbind',
if (Utils.unversioned_sys_platform() == 'linux' or (host_os.rfind('gnu') > -1)):
bld.SAMBA_PLUGIN('nss_winbind',
- keep_underscore=True,
cflags='-D_PUBLIC_ON_LINUX_=_PUBLIC_',
source='winbind_nss_linux.c',
deps='wbclient',
@@ -45,7 +44,6 @@ if (Utils.unversioned_sys_platform() == 'linux' or (host_os.rfind('gnu') > -1)):
vnum='2')
bld.SAMBA3_PLUGIN('nss_wins',
- keep_underscore=True,
cflags='-D_PUBLIC_ON_LINUX_=_PUBLIC_',
source='wins.c',
deps='wbclient replace',
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 2f6d4304b71..dd1494974e2 100644
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -184,7 +184,7 @@ bld.SAMBA_LIBRARY('dcerpc',
# If we just put header_path = 'gen_ndr' then all the public_headers will go
# in 'gen_ndr' and for dcerpc.h (at least) it will cause a problem as
# we have already a dcerpc.h installed by librpc/wscript_build
- # and one will overright the other which is not what we expect.
+ # and one will overwrite the other which is not what we expect.
header_path=[ ('*gen_ndr*', 'gen_ndr') ],
vnum='0.0.1'
)
--
Samba Shared Repository
More information about the samba-cvs
mailing list