diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-24 16:26:23 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-24 16:26:23 +1000 |
| commit | 6da26870e0ae5acd6ff49a30ec2f6886b44d095e (patch) | |
| tree | 850c71039563c16a5d563c47e7ba2ab645baf198 /libgpo/gpext/gpext.c | |
| parent | 6925a799d04c6fa59dd2ddef1f5510f9bb7d17d1 (diff) | |
| parent | 2610c05b5b95cc7036b3d6dfb894c6cfbdb68483 (diff) | |
| download | samba-6da26870e0ae5acd6ff49a30ec2f6886b44d095e.tar.gz samba-6da26870e0ae5acd6ff49a30ec2f6886b44d095e.tar.bz2 samba-6da26870e0ae5acd6ff49a30ec2f6886b44d095e.zip | |
Merge 2610c05b5b95cc7036b3d6dfb894c6cfbdb68483 as Samba-4.0alpha16
Diffstat (limited to 'libgpo/gpext/gpext.c')
| -rw-r--r-- | libgpo/gpext/gpext.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libgpo/gpext/gpext.c b/libgpo/gpext/gpext.c index 080bf07452..42ab622331 100644 --- a/libgpo/gpext/gpext.c +++ b/libgpo/gpext/gpext.c @@ -351,7 +351,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); @@ -442,7 +442,7 @@ static WERROR gp_extension_store_reg_entry(TALLOC_CTX *mem_ctx, subkeyname = GUID_string2(mem_ctx, &entry->guid); W_ERROR_HAVE_NO_MEMORY(subkeyname); - strupper_m(CONST_DISCARD(char *,subkeyname)); + strupper_m(discard_const_p(char, subkeyname)); werr = gp_store_reg_subkey(mem_ctx, subkeyname, @@ -492,9 +492,10 @@ static NTSTATUS gp_glob_ext_list(TALLOC_CTX *mem_ctx, SMB_STRUCT_DIR *dir = NULL; SMB_STRUCT_DIRENT *dirent = NULL; - dir = sys_opendir(modules_path(SAMBA_SUBSYSTEM_GPEXT)); + 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))) { |