summaryrefslogtreecommitdiff
path: root/libgpo
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-06-20 14:55:32 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-06-20 08:12:03 +0200
commita1f04e8abc761ef1ba211420ff1dbda50fcf527d (patch)
tree77f452c87c7e859341728e2835bd7493b6d8c9c7 /libgpo
parent018f4a5889743f742a59e9ad72056b2ea09adfe9 (diff)
downloadsamba-a1f04e8abc761ef1ba211420ff1dbda50fcf527d.tar.gz
libcli/util Rename common map_nt_error_from_unix to avoid duplicate symbol
The two error tables need to be combined, but for now seperate the names. (As the common parts of the tree now use the _common function, errmap_unix.c must be included in the s3 autoconf build). Andrew Bartlett Autobuild-User: Andrew Bartlett <abartlet@samba.org> Autobuild-Date: Mon Jun 20 08:12:03 CEST 2011 on sn-devel-104
Diffstat (limited to 'libgpo')
-rw-r--r--libgpo/gpext/gpext.c2
-rw-r--r--libgpo/gpo_ini.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libgpo/gpext/gpext.c b/libgpo/gpext/gpext.c
index 640aae6aaf..42ab622331 100644
--- a/libgpo/gpext/gpext.c
+++ b/libgpo/gpext/gpext.c
@@ -495,7 +495,7 @@ static NTSTATUS gp_glob_ext_list(TALLOC_CTX *mem_ctx,
dir = sys_opendir(modules_path(talloc_tos(),
SAMBA_SUBSYSTEM_GPEXT));
if (!dir) {
- return map_nt_error_from_unix(errno);
+ return map_nt_error_from_unix_common(errno);
}
while ((dirent = sys_readdir(dir))) {
diff --git a/libgpo/gpo_ini.c b/libgpo/gpo_ini.c
index a4bff0e86b..494162466d 100644
--- a/libgpo/gpo_ini.c
+++ b/libgpo/gpo_ini.c
@@ -108,7 +108,7 @@ static NTSTATUS convert_file_from_ucs2(TALLOC_CTX *mem_ctx,
}
if (write(tmp_fd, data_out, converted_size) != converted_size) {
- status = map_nt_error_from_unix(errno);
+ status = map_nt_error_from_unix_common(errno);
goto out;
}