The branch, master has been updated
via c7b9dbe s3-libsmb remove ldap_err2string() as common nterrs[] has
the constants
via 6552561 s3-build Don't allow undefined symbols in pam_smbpass.so
via c004a93 libcli/util Remove ntstatus_check_dos_mapping
from 4ac4ad2 s3-utils: fix another -Wunused-but-set-variable build
warning.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c7b9dbea109f8cdc6d74b17f724653bf3534dcc2
Author: Andrew Bartlett <[email protected]>
Date: Tue May 31 14:33:23 2011 +1000
s3-libsmb remove ldap_err2string() as common nterrs[] has the constants
Autobuild-User: Andrew Bartlett <[email protected]>
Autobuild-Date: Tue May 31 08:58:00 CEST 2011 on sn-devel-104
commit 6552561b87ff5537d17ca82a85f7eb7943231241
Author: Andrew Bartlett <[email protected]>
Date: Tue May 31 13:26:57 2011 +1000
s3-build Don't allow undefined symbols in pam_smbpass.so
commit c004a932c45a4b343814eb2e3f2d611a2dfe7311
Author: Andrew Bartlett <[email protected]>
Date: Sat May 14 21:53:05 2011 +0200
libcli/util Remove ntstatus_check_dos_mapping
This has been set to true since the global loadparm was removed in
2008, and removes an #ifdef SAMBA_BUILD == 4
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
libcli/util/ntstatus.h | 9 ---------
source3/libsmb/nterr.c | 6 ------
source3/pam_smbpass/wscript_build | 1 +
source4/libcli/util/errormap.c | 35 -----------------------------------
source4/param/loadparm.c | 2 --
5 files changed, 1 insertions(+), 52 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/util/ntstatus.h b/libcli/util/ntstatus.h
index 2217b4c..13ce733 100644
--- a/libcli/util/ntstatus.h
+++ b/libcli/util/ntstatus.h
@@ -648,9 +648,6 @@ const char *get_nt_error_c_code(void *mem_ctx, NTSTATUS
nt_code);
*****************************************************************************/
NTSTATUS nt_status_string_to_code(const char *nt_status_str);
-/** Used by ntstatus_dos_equal: */
-extern bool ntstatus_check_dos_mapping;
-
/* we need these here for openchange */
#ifndef likely
#define likely(x) (x)
@@ -661,13 +658,7 @@ extern bool ntstatus_check_dos_mapping;
#define NT_STATUS_IS_OK(x) (likely(NT_STATUS_V(x) == 0))
#define NT_STATUS_IS_ERR(x) (unlikely((NT_STATUS_V(x) & 0xc0000000) ==
0xc0000000))
-/* checking for DOS error mapping here is ugly, but unfortunately the
- alternative is a very intrusive rewrite of the torture code */
-#if _SAMBA_BUILD_ == 4
-#define NT_STATUS_EQUAL(x,y)
(NT_STATUS_IS_DOS(x)||NT_STATUS_IS_DOS(y)?ntstatus_dos_equal(x,y):NT_STATUS_V(x)
== NT_STATUS_V(y))
-#else
#define NT_STATUS_EQUAL(x,y) (NT_STATUS_V(x) == NT_STATUS_V(y))
-#endif
#define NT_STATUS_HAVE_NO_MEMORY(x) do { \
if (unlikely(!(x))) { \
diff --git a/source3/libsmb/nterr.c b/source3/libsmb/nterr.c
index 1302326..7d0b3d0 100644
--- a/source3/libsmb/nterr.c
+++ b/source3/libsmb/nterr.c
@@ -36,12 +36,6 @@ const char *nt_errstr(NTSTATUS nt_code)
int idx = 0;
char *result;
-#ifdef HAVE_LDAP
- if (NT_STATUS_IS_LDAP(nt_code)) {
- return ldap_err2string(NT_STATUS_LDAP_CODE(nt_code));
- }
-#endif
-
if (NT_STATUS_IS_DOS(nt_code)) {
return smb_dos_err_name(NT_STATUS_DOS_CLASS(nt_code),
NT_STATUS_DOS_CODE(nt_code));
diff --git a/source3/pam_smbpass/wscript_build
b/source3/pam_smbpass/wscript_build
index 0d200c6..8c15d71 100644
--- a/source3/pam_smbpass/wscript_build
+++ b/source3/pam_smbpass/wscript_build
@@ -10,4 +10,5 @@ if bld.CONFIG_SET('WITH_PAM_MODULES'):
LIBNTLMSSP LIBTSOCKET''',
cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
realname='pam_smbpass.so',
+ allow_undefined_symbols=False
)
diff --git a/source4/libcli/util/errormap.c b/source4/libcli/util/errormap.c
index 6392a62..23432ca 100644
--- a/source4/libcli/util/errormap.c
+++ b/source4/libcli/util/errormap.c
@@ -570,41 +570,6 @@ static const struct {
{ WERR_OK, NT_STATUS_OK }
};
-bool ntstatus_check_dos_mapping = true;
-
-/*
- check if a DOS encoded NTSTATUS code maps to the given NTSTATUS code
-*/
-bool ntstatus_dos_equal(NTSTATUS status1, NTSTATUS status2)
-{
- /* when we negotiate nt status support, we don't want to consider
- the mapping of dos codes, as we want to catch the cases where
- a forced dos code is needed
- */
- if (ntstatus_check_dos_mapping) {
- return NT_STATUS_V(status1) == NT_STATUS_V(status2);
- }
-
- /* otherwise check if the mapping comes out right. Note that it is
important
- that we do the mapping only from ntstatus -> dos and not from dos ->
ntstatus,
- as that is the mapping that servers must do */
- if (!NT_STATUS_IS_DOS(status1) && NT_STATUS_IS_DOS(status2)) {
- uint8_t eclass;
- uint32_t ecode;
- ntstatus_to_dos(status1, &eclass, &ecode);
- return eclass == NT_STATUS_DOS_CLASS(status2) &&
- ecode == NT_STATUS_DOS_CODE(status2);
- }
- if (NT_STATUS_IS_DOS(status1) && !NT_STATUS_IS_DOS(status2)) {
- uint8_t eclass;
- uint32_t ecode;
- ntstatus_to_dos(status2, &eclass, &ecode);
- return eclass == NT_STATUS_DOS_CLASS(status1) &&
- ecode == NT_STATUS_DOS_CODE(status1);
- }
- return NT_STATUS_V(status1) == NT_STATUS_V(status2);
-}
-
/* Mapping between Unix, and NT error numbers */
static const struct {
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index b101054..8cfa43d 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -2622,8 +2622,6 @@ static bool lpcfg_update(struct loadparm_context *lp_ctx)
settings.timestamp_logs = true;
debug_set_settings(&settings);
- /* FIXME: ntstatus_check_dos_mapping = lpcfg_nt_status_support(lp_ctx);
*/
-
/* FIXME: This is a bit of a hack, but we can't use a global, since
* not everything that uses lp also uses the socket library */
if (lpcfg_parm_bool(lp_ctx, NULL, "socket", "testnonblock", false)) {
--
Samba Shared Repository
