[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1637-g88876ac

[Jelmer Vernooij]

The branch, master has been updated
       via  88876ac57156891e8107034e5d7f40076e032e58 (commit)
      from  cd421ff2fc455750af5494db7745430723834407 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 88876ac57156891e8107034e5d7f40076e032e58
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri May 15 16:02:33 2009 +0200

    errormap: Remove wbc -> NTSTATUS error map for now. It is not used.
    
    This was breaking the Samba 4 installation since it added dependencies
    on header files we weren't installing.
    
    Confirmed with Kai.

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

Summary of changes:
 libcli/util/error.h            |    6 ------
 source4/libcli/util/errormap.c |   37 -------------------------------------
 2 files changed, 0 insertions(+), 43 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/util/error.h b/libcli/util/error.h
index 03e76a2..5a7cc1b 100644
--- a/libcli/util/error.h
+++ b/libcli/util/error.h
@@ -22,7 +22,6 @@
 #include "libcli/util/werror.h"
 #include "libcli/util/doserr.h"
 #include "libcli/util/ntstatus.h"
-#include "nsswitch/libwbclient/wbclient.h"
 
 /** NT error on DOS connection! (NT_STATUS_OK) */
 bool ntstatus_dos_equal(NTSTATUS status1, NTSTATUS status2);
@@ -47,9 +46,4 @@ WERROR ntstatus_to_werror(NTSTATUS error);
 *********************************************************************/
 NTSTATUS map_nt_error_from_unix(int unix_error);
 
-/*******************************************************************************
- Map between wbcErr and NT status.
-*******************************************************************************/
-NTSTATUS map_nt_error_from_wbcErr(wbcErr wbc_err);
-
 #endif /* _SAMBA_ERROR_H */
diff --git a/source4/libcli/util/errormap.c b/source4/libcli/util/errormap.c
index 22bf612..930e45b 100644
--- a/source4/libcli/util/errormap.c
+++ b/source4/libcli/util/errormap.c
@@ -21,7 +21,6 @@
 
 #include "includes.h"
 #include "librpc/ndr/libndr.h"
-#include "nsswitch/libwbclient/wbclient.h"
 
 /* This map was extracted by the ERRMAPEXTRACT smbtorture command. 
    The setup was a Samba HEAD (2002-01-03) PDC and an Win2k member 
@@ -1407,39 +1406,3 @@ NTSTATUS ndr_map_error2ntstatus(enum ndr_err_code ndr_err)
 	/* we should map all error codes to different status codes */
 	return NT_STATUS_INVALID_PARAMETER;
 }
-
-static const struct {
-	wbcErr wbc_err;
-	NTSTATUS nt_status;
-} wbcErr_ntstatus_map[] = {
-	{ WBC_ERR_SUCCESS,		 NT_STATUS_OK },
-	{ WBC_ERR_NOT_IMPLEMENTED,	 NT_STATUS_NOT_IMPLEMENTED },
-	{ WBC_ERR_UNKNOWN_FAILURE,	 NT_STATUS_UNSUCCESSFUL },
-	{ WBC_ERR_NO_MEMORY,		 NT_STATUS_NO_MEMORY },
-	{ WBC_ERR_INVALID_SID,		 NT_STATUS_INVALID_SID },
-	{ WBC_ERR_INVALID_PARAM,	 NT_STATUS_INVALID_PARAMETER },
-	{ WBC_ERR_WINBIND_NOT_AVAILABLE, NT_STATUS_SERVER_DISABLED },
-	{ WBC_ERR_DOMAIN_NOT_FOUND,	 NT_STATUS_NO_SUCH_DOMAIN },
-	{ WBC_ERR_INVALID_RESPONSE,	 NT_STATUS_INVALID_NETWORK_RESPONSE },
-	{ WBC_ERR_NSS_ERROR,		 NT_STATUS_INTERNAL_ERROR },
-	{ WBC_ERR_AUTH_ERROR,		 NT_STATUS_LOGON_FAILURE },
-	{ WBC_ERR_UNKNOWN_USER,		 NT_STATUS_NO_SUCH_USER },
-	{ WBC_ERR_UNKNOWN_GROUP,	 NT_STATUS_NO_SUCH_GROUP },
-	{ WBC_ERR_PWD_CHANGE_FAILED,	 NT_STATUS_PASSWORD_RESTRICTION }
-};
-
-NTSTATUS map_nt_error_from_wbcErr(wbcErr wbc_err)
-{
-	int i;
-
-	/* Look through list */
-	for (i=0;i<ARRAY_SIZE(wbcErr_ntstatus_map);i++) {
-		if (wbcErr_ntstatus_map[i].wbc_err == wbc_err) {
-			return wbcErr_ntstatus_map[i].nt_status;
-		}
-	}
-
-	/* Default return */
-	return NT_STATUS_UNSUCCESSFUL;
-}
-


-- 
Samba Shared Repository