summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/auth/kerberos/wscript_build2
-rw-r--r--source4/dsdb/wscript_build2
-rw-r--r--source4/lib/ldb-samba/wscript_build2
-rw-r--r--source4/libcli/util/errormap.c157
-rw-r--r--source4/libcli/wscript_build9
5 files changed, 3 insertions, 169 deletions
diff --git a/source4/auth/kerberos/wscript_build b/source4/auth/kerberos/wscript_build
index 586366d422..90e8560573 100644
--- a/source4/auth/kerberos/wscript_build
+++ b/source4/auth/kerberos/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_LIBRARY('authkrb5',
source='kerberos.c kerberos_heimdal.c kerberos_pac.c gssapi_parse.c krb5_init_context.c keytab_copy.c',
autoproto='proto.h',
public_deps='krb5 ndr-krb5pac samba_socket LIBCLI_RESOLVE com_err asn1',
- deps='asn1util auth_sam_reply tevent LIBPACKET ndr ldb KRB5_WRAP',
+ deps='asn1util auth_sam_reply tevent LIBPACKET ndr ldb KRB5_WRAP errors',
private_library=True
)
diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build
index 9d56e4f150..fe00059c4b 100644
--- a/source4/dsdb/wscript_build
+++ b/source4/dsdb/wscript_build
@@ -8,7 +8,7 @@ bld.SAMBA_LIBRARY('samdb',
autoproto='samdb/samdb_proto.h',
public_deps='krb5',
vnum='0.0.1',
- deps='ndr NDR_DRSUAPI NDR_DRSBLOBS auth_system_session LIBCLI_AUTH ndr SAMDB_SCHEMA ldbsamba samdb-common LIBCLI_DRSUAPI cli-ldap-common samba-util com_err authkrb5 credentials ldbwrap',
+ deps='ndr NDR_DRSUAPI NDR_DRSBLOBS auth_system_session LIBCLI_AUTH ndr SAMDB_SCHEMA ldbsamba samdb-common LIBCLI_DRSUAPI cli-ldap-common samba-util com_err authkrb5 credentials ldbwrap errors',
)
diff --git a/source4/lib/ldb-samba/wscript_build b/source4/lib/ldb-samba/wscript_build
index a8d4df2ce0..e6a13f3933 100644
--- a/source4/lib/ldb-samba/wscript_build
+++ b/source4/lib/ldb-samba/wscript_build
@@ -8,7 +8,7 @@ bld.SAMBA_LIBRARY('ldbsamba',
source='ldif_handlers.c',
autoproto='ldif_handlers_proto.h',
public_deps='ldb',
- deps='security ndr NDR_DRSBLOBS NDR_DNSP ldbwrap samdb-common SAMDB_SCHEMA tdb pyldb-util',
+ deps='security ndr NDR_DRSBLOBS NDR_DNSP ldbwrap samdb-common SAMDB_SCHEMA tdb pyldb-util errors',
private_library=True
)
diff --git a/source4/libcli/util/errormap.c b/source4/libcli/util/errormap.c
deleted file mode 100644
index 75b1e8d2fe..0000000000
--- a/source4/libcli/util/errormap.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- * error mapping functions
- * Copyright (C) Andrew Tridgell 2001
- * Copyright (C) Andrew Bartlett 2001
- * Copyright (C) Tim Potter 2000
- *
- * 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"
-
-/* Mapping between Unix, and NT error numbers */
-
-static const struct {
- int unix_error;
- NTSTATUS nt_error;
-} unix_nt_errmap[] = {
- { EAGAIN, STATUS_MORE_ENTRIES },
- { EINTR, STATUS_MORE_ENTRIES },
- { ENOBUFS, STATUS_MORE_ENTRIES },
-#ifdef EWOULDBLOCK
- { EWOULDBLOCK, STATUS_MORE_ENTRIES },
-#endif
- { EINPROGRESS, NT_STATUS_MORE_PROCESSING_REQUIRED },
- { EPERM, NT_STATUS_ACCESS_DENIED },
- { EACCES, NT_STATUS_ACCESS_DENIED },
- { ENOENT, NT_STATUS_OBJECT_NAME_NOT_FOUND },
- { ENOTDIR, NT_STATUS_NOT_A_DIRECTORY },
- { EIO, NT_STATUS_IO_DEVICE_ERROR },
- { EBADF, NT_STATUS_INVALID_HANDLE },
- { EINVAL, NT_STATUS_INVALID_PARAMETER },
- { EEXIST, NT_STATUS_OBJECT_NAME_COLLISION},
- { ENFILE, NT_STATUS_TOO_MANY_OPENED_FILES },
- { EMFILE, NT_STATUS_TOO_MANY_OPENED_FILES },
- { ENOSPC, NT_STATUS_DISK_FULL },
- { ENOTSOCK, NT_STATUS_INVALID_HANDLE },
- { EFAULT, NT_STATUS_INVALID_PARAMETER },
- { EMSGSIZE, NT_STATUS_INVALID_BUFFER_SIZE },
- { ENOMEM, NT_STATUS_NO_MEMORY },
- { EISDIR, NT_STATUS_FILE_IS_A_DIRECTORY},
-#ifdef EPIPE
- { EPIPE, NT_STATUS_CONNECTION_DISCONNECTED },
-#endif
- { EBUSY, NT_STATUS_SHARING_VIOLATION },
- { ENOSYS, NT_STATUS_INVALID_SYSTEM_SERVICE },
-#ifdef EOPNOTSUPP
- { EOPNOTSUPP, NT_STATUS_NOT_SUPPORTED},
-#endif
- { EMLINK, NT_STATUS_TOO_MANY_LINKS },
- { ENOSYS, NT_STATUS_NOT_SUPPORTED },
-#ifdef ELOOP
- { ELOOP, NT_STATUS_OBJECT_PATH_NOT_FOUND },
-#endif
-#ifdef ENODATA
- { ENODATA, NT_STATUS_NOT_FOUND },
-#endif
-#ifdef EFTYPE
- { EFTYPE, NT_STATUS_OBJECT_PATH_NOT_FOUND },
-#endif
-#ifdef EDQUOT
- { EDQUOT, NT_STATUS_DISK_FULL }, /* Windows apps need this, not NT_STATUS_QUOTA_EXCEEDED */
-#endif
-#ifdef ENOTEMPTY
- { ENOTEMPTY, NT_STATUS_DIRECTORY_NOT_EMPTY },
-#endif
-#ifdef EXDEV
- { EXDEV, NT_STATUS_NOT_SAME_DEVICE },
-#endif
-#ifdef EROFS
- { EROFS, NT_STATUS_MEDIA_WRITE_PROTECTED },
-#endif
-#ifdef ENAMETOOLONG
- { ENAMETOOLONG, NT_STATUS_NAME_TOO_LONG },
-#endif
-#ifdef EFBIG
- { EFBIG, NT_STATUS_DISK_FULL },
-#endif
-#ifdef EADDRINUSE
- { EADDRINUSE, NT_STATUS_ADDRESS_ALREADY_ASSOCIATED},
-#endif
-#ifdef ENETUNREACH
- { ENETUNREACH, NT_STATUS_NETWORK_UNREACHABLE},
-#endif
-#ifdef EHOSTUNREACH
- { EHOSTUNREACH, NT_STATUS_HOST_UNREACHABLE},
-#endif
-#ifdef ECONNREFUSED
- { ECONNREFUSED, NT_STATUS_CONNECTION_REFUSED},
-#endif
-#ifdef EADDRNOTAVAIL
- { EADDRNOTAVAIL,NT_STATUS_ADDRESS_NOT_ASSOCIATED },
-#endif
-#ifdef ETIMEDOUT
- { ETIMEDOUT, NT_STATUS_IO_TIMEOUT},
-#endif
-#ifdef ESOCKTNOSUPPORT
- { ESOCKTNOSUPPORT,NT_STATUS_INVALID_PARAMETER_MIX },
-#endif
-#ifdef EAFNOSUPPORT
- { EAFNOSUPPORT, NT_STATUS_INVALID_PARAMETER_MIX },
-#endif
-#ifdef ECONNABORTED
- { ECONNABORTED, NT_STATUS_CONNECTION_ABORTED},
-#endif
-#ifdef ECONNRESET
- { ECONNRESET, NT_STATUS_CONNECTION_RESET},
-#endif
-#ifdef ENOPROTOOPT
- { ENOPROTOOPT, NT_STATUS_INVALID_PARAMETER_MIX },
-#endif
-#ifdef ENODEV
- { ENODEV, NT_STATUS_NO_SUCH_DEVICE },
-#endif
-#ifdef ENOATTR
- { ENOATTR, NT_STATUS_NOT_FOUND },
-#endif
-#ifdef ECANCELED
- { ECANCELED, NT_STATUS_CANCELLED},
-#endif
-#ifdef ENOTSUP
- { ENOTSUP, NT_STATUS_NOT_SUPPORTED},
-#endif
-
- { 0, NT_STATUS_UNSUCCESSFUL }
-};
-
-
-/*********************************************************************
- Map an NT error code from a Unix error code.
-*********************************************************************/
-NTSTATUS map_nt_error_from_unix(int unix_error)
-{
- int i;
-
- /* Look through list */
- for (i=0;i<ARRAY_SIZE(unix_nt_errmap);i++) {
- if (unix_nt_errmap[i].unix_error == unix_error) {
- return unix_nt_errmap[i].nt_error;
- }
- }
-
- /* Default return */
- return NT_STATUS_UNSUCCESSFUL;
-}
-
diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index 02bb3b8d36..1799bcabad 100644
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -3,15 +3,6 @@
bld.RECURSE('ldap')
bld.RECURSE('wbclient')
-bld.SAMBA_LIBRARY('errors',
- source='util/errormap.c',
- public_headers='../../libcli/util/error.h ../../libcli/util/ntstatus.h ../../libcli/util/doserr.h ../../libcli/util/werror.h',
- header_path='core',
- deps='talloc LIBCLI_ERRORS',
- private_library=True
- )
-
-
bld.SAMBA_SUBSYSTEM('LIBSAMBA_TSOCKET',
source='../../libcli/util/tstream.c',
public_deps='LIBTSOCKET UTIL_TEVENT'
generated by cgit (git 2.34.1) at 2024-11-22 23:53:43 +0000