The branch, master has been updated via 278c6f8 errormap: Add unix_to_werror() function from 67e578a Allow "security = share" with SMB2. We already handle this in smb2/smb2_server.c
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 278c6f8fc538ad8ee069f0682229fad34abb3513 Author: Kai Blin <k...@samba.org> Date: Wed Jan 26 22:17:43 2011 +0100 errormap: Add unix_to_werror() function While this function technically is closest to the map_nt_status_from_unix() function, I think it is better to keep the new function in line with our usual fooerror_to_barerror() naming scheme. Signed-off-by: Kai Blin <k...@samba.org> Autobuild-User: Kai Blin <k...@samba.org> Autobuild-Date: Wed Jan 26 23:07:24 CET 2011 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: libcli/util/error.h | 5 +++++ source3/lib/errmap_unix.c | 6 ++++++ source4/libcli/util/errormap.c | 6 ++++++ 3 files changed, 17 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/libcli/util/error.h b/libcli/util/error.h index 5a7cc1b..77a2f5a 100644 --- a/libcli/util/error.h +++ b/libcli/util/error.h @@ -46,4 +46,9 @@ WERROR ntstatus_to_werror(NTSTATUS error); *********************************************************************/ NTSTATUS map_nt_error_from_unix(int unix_error); +/********************************************************************* +convert a Unix error code to a WERROR +*********************************************************************/ +WERROR unix_to_werror(int unix_error); + #endif /* _SAMBA_ERROR_H */ diff --git a/source3/lib/errmap_unix.c b/source3/lib/errmap_unix.c index 91a620e..b4a98f9 100644 --- a/source3/lib/errmap_unix.c +++ b/source3/lib/errmap_unix.c @@ -141,6 +141,12 @@ NTSTATUS map_nt_error_from_unix(int unix_error) return NT_STATUS_ACCESS_DENIED; } +/* Convert a Unix error code to a WERROR. */ +WERROR unix_to_werror(int unix_error) +{ + return ntstatus_to_werror(map_nt_error_from_unix(unix_error)); +} + /* Return a UNIX errno from a NT status code */ static const struct { NTSTATUS status; diff --git a/source4/libcli/util/errormap.c b/source4/libcli/util/errormap.c index 8fcf60b..29f2331 100644 --- a/source4/libcli/util/errormap.c +++ b/source4/libcli/util/errormap.c @@ -1383,6 +1383,12 @@ NTSTATUS map_nt_error_from_unix(int unix_error) return NT_STATUS_UNSUCCESSFUL; } +/* Convert a Unix error code to WERROR */ +WERROR unix_to_werror(int unix_error) +{ + return ntstatus_to_werror(map_nt_error_from_unix(unix_error)); +} + NTSTATUS ndr_map_error2ntstatus(enum ndr_err_code ndr_err) { switch (ndr_err) { -- Samba Shared Repository