build: Remove SMB_STRUCT_DIRENT define

[garming/samba-autobuild/.git] / libgpo / gpext / gpext.c

diff --git a/libgpo/gpext/gpext.c b/libgpo/gpext/gpext.c
index ac6c181e34c671fce96fe9cbb871c7ea78690ac4..ae16d06a94ecfec25b66d4deef8740d505b2673b 100644 (file)
--- a/libgpo/gpext/gpext.c
+++ b/libgpo/gpext/gpext.c
@@ -23,11 +23,9 @@
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "lib/util/dlinklist.h"
 #include "../libcli/registry/util_reg.h"
-#if _SAMBA_BUILD_ == 3
 #include "libgpo/gpo_proto.h"
 #include "registry.h"
 #include "registry/reg_api.h"
-#endif
 
 static struct gp_extension *extensions = NULL;
 
@@ -351,7 +349,7 @@ NTSTATUS gp_ext_info_add_entry(TALLOC_CTX *mem_ctx,
        NTSTATUS status;
        struct gp_extension_reg_info_entry *entry = NULL;
 
-       entry = TALLOC_ZERO_P(mem_ctx, struct gp_extension_reg_info_entry);
+       entry = talloc_zero(mem_ctx, struct gp_extension_reg_info_entry);
        NT_STATUS_HAVE_NO_MEMORY(entry);
 
        status = GUID_from_string(ext_guid, &entry->guid);
@@ -490,15 +488,15 @@ static NTSTATUS gp_glob_ext_list(TALLOC_CTX *mem_ctx,
                                 size_t *ext_list_len)
 {
        SMB_STRUCT_DIR *dir = NULL;
-       SMB_STRUCT_DIRENT *dirent = NULL;
+       struct dirent *dirent = NULL;
 
-       dir = sys_opendir(modules_path(talloc_tos(), 
+       dir = 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))) {
+       while ((dirent = readdir(dir))) {
 
                fstring name; /* forgive me... */
                char *p;
@@ -510,7 +508,7 @@ static NTSTATUS gp_glob_ext_list(TALLOC_CTX *mem_ctx,
 
                p = strrchr(dirent->d_name, '.');
                if (!p) {
-                       sys_closedir(dir);
+                       closedir(dir);
                        return NT_STATUS_NO_MEMORY;
                }
 
@@ -525,12 +523,12 @@ static NTSTATUS gp_glob_ext_list(TALLOC_CTX *mem_ctx,
 
                if (!add_string_to_array(mem_ctx, name, ext_list,
                                         (int *)ext_list_len)) {
-                       sys_closedir(dir);
+                       closedir(dir);
                        return NT_STATUS_NO_MEMORY;
                }
        }
 
-       sys_closedir(dir);
+       closedir(dir);
 
        return NT_STATUS_OK;
 }