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 /source3/smbd/dmapi.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 'source3/smbd/dmapi.c')
| -rw-r--r-- | source3/smbd/dmapi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/dmapi.c b/source3/smbd/dmapi.c index 2869b6d781..8e80a588c5 100644 --- a/source3/smbd/dmapi.c +++ b/source3/smbd/dmapi.c @@ -96,7 +96,7 @@ static int dmapi_init_session(struct smbd_dmapi_context *ctx) do { dm_sessid_t *new_sessions; nsessions *= 2; - new_sessions = TALLOC_REALLOC_ARRAY(tmp_ctx, sessions, + new_sessions = talloc_realloc(tmp_ctx, sessions, dm_sessid_t, nsessions); if (new_sessions == NULL) { talloc_free(tmp_ctx); @@ -289,7 +289,7 @@ uint32 dmapi_file_flags(const char * const path) become_root(); #endif - err = dm_path_to_handle(CONST_DISCARD(char *, path), + err = dm_path_to_handle(discard_const_p(char, path), &dm_handle, &dm_handle_len); if (err < 0) { DEBUG(DMAPI_TRACE, ("dm_path_to_handle(%s): %s\n", @@ -308,7 +308,7 @@ uint32 dmapi_file_flags(const char * const path) set_effective_capability(DMAPI_ACCESS_CAPABILITY); - err = dm_path_to_handle(CONST_DISCARD(char *, path), + err = dm_path_to_handle(discard_const_p(char, path), &dm_handle, &dm_handle_len); if (err < 0) { DEBUG(DMAPI_TRACE, |