The branch, master has been updated
via 2d260b2 s4:scripting: Fix ntstatus_gen.h generation on 32bit
from 7abe56c s3: smbclient: Test we can rename with a name containing.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2d260b28f50ea6ee704d9fab2aaf26f760fa110f
Author: Andreas Schneider <[email protected]>
Date: Wed Oct 25 17:37:24 2017 +0200
s4:scripting: Fix ntstatus_gen.h generation on 32bit
The hex() function results in different output on 32bit systems. It adds
a L for long for some numbers. Thus we have a different header file.
This patch makes sure we have a consistent file generation on different
paltforms.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13099
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: David Disseldorp <[email protected]>
Autobuild-User(master): David Disseldorp <[email protected]>
Autobuild-Date(master): Wed Oct 25 22:28:39 CEST 2017 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
source4/scripting/bin/gen_ntstatus.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/source4/scripting/bin/gen_ntstatus.py
b/source4/scripting/bin/gen_ntstatus.py
index 9e92f49..cace4c0 100755
--- a/source4/scripting/bin/gen_ntstatus.py
+++ b/source4/scripting/bin/gen_ntstatus.py
@@ -32,7 +32,7 @@ def generateHeaderFile(out_file, errors):
out_file.write("#ifndef _NTSTATUS_GEN_H\n")
out_file.write("#define _NTSTATUS_GEN_H\n")
for err in errors:
- line = "#define %s NT_STATUS(%s)\n" % (err.err_define,
hex(err.err_code))
+ line = "#define %s NT_STATUS(%#x)\n" % (err.err_define, err.err_code)
out_file.write(line)
out_file.write("\n#endif /* _NTSTATUS_GEN_H */\n")
--
Samba Shared Repository
