diff options
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_rpc_shell.c | 4 | ||||
| -rw-r--r-- | source3/utils/ntlm_auth.c | 8 | ||||
| -rw-r--r-- | source3/utils/pdbedit.c | 4 | ||||
| -rw-r--r-- | source3/utils/smbcontrol.c | 2 | ||||
| -rw-r--r-- | source3/utils/smbpasswd.c | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/source3/utils/net_rpc_shell.c b/source3/utils/net_rpc_shell.c index 0e17cd6843..3887fd9ae2 100644 --- a/source3/utils/net_rpc_shell.c +++ b/source3/utils/net_rpc_shell.c @@ -112,7 +112,7 @@ static BOOL net_sh_process(struct rpc_sh_ctx *ctx, if (strequal(argv[0], "..") && (this_ctx->parent != NULL)) { new_ctx = this_ctx->parent; - talloc_free(this_ctx); + TALLOC_FREE(this_ctx); this_ctx = new_ctx; return True; } @@ -250,7 +250,7 @@ int net_rpc_shell(int argc, const char **argv) cli_shutdown(ctx->cli); - talloc_free(ctx); + TALLOC_FREE(ctx); return 0; } diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c index c22f4b5e09..f99c9db35b 100644 --- a/source3/utils/ntlm_auth.c +++ b/source3/utils/ntlm_auth.c @@ -1481,7 +1481,7 @@ static void manage_ntlm_server_1_request(enum stdio_helper_mode stdio_helper_mod (const unsigned char *)lm_key, sizeof(lm_key)); x_fprintf(x_stdout, "LANMAN-Session-Key: %s\n", hex_lm_key); - talloc_free(hex_lm_key); + TALLOC_FREE(hex_lm_key); } if (ntlm_server_1_user_session_key @@ -1491,7 +1491,7 @@ static void manage_ntlm_server_1_request(enum stdio_helper_mode stdio_helper_mod (const unsigned char *)user_session_key, sizeof(user_session_key)); x_fprintf(x_stdout, "User-Session-Key: %s\n", hex_user_session_key); - talloc_free(hex_user_session_key); + TALLOC_FREE(hex_user_session_key); } } } @@ -1682,7 +1682,7 @@ static BOOL check_auth_crap(void) hex_lm_key = hex_encode(NULL, (const unsigned char *)lm_key, sizeof(lm_key)); x_fprintf(x_stdout, "LM_KEY: %s\n", hex_lm_key); - talloc_free(hex_lm_key); + TALLOC_FREE(hex_lm_key); } if (request_user_session_key && (memcmp(zeros, user_session_key, @@ -1690,7 +1690,7 @@ static BOOL check_auth_crap(void) hex_user_session_key = hex_encode(NULL, (const unsigned char *)user_session_key, sizeof(user_session_key)); x_fprintf(x_stdout, "NT_KEY: %s\n", hex_user_session_key); - talloc_free(hex_user_session_key); + TALLOC_FREE(hex_user_session_key); } return True; diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c index a098039cd0..2e7fbc1812 100644 --- a/source3/utils/pdbedit.c +++ b/source3/utils/pdbedit.c @@ -508,10 +508,10 @@ static int new_machine (struct pdb_methods *in, const char *machine_in) if ((pwd = getpwnam_alloc(NULL, machineaccount))) { if (!NT_STATUS_IS_OK(pdb_init_sam_pw( &sam_pwent, pwd))) { fprintf(stderr, "Could not init sam from pw\n"); - talloc_free(pwd); + TALLOC_FREE(pwd); return -1; } - talloc_free(&pwd); + TALLOC_FREE(pwd); } else { if (!NT_STATUS_IS_OK(pdb_init_sam (&sam_pwent))) { fprintf(stderr, "Could not init sam from pw\n"); diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c index 405e51cd25..7e18e09dad 100644 --- a/source3/utils/smbcontrol.c +++ b/source3/utils/smbcontrol.c @@ -151,7 +151,7 @@ static void pong_cb(int msg_type, struct process_id pid, void *buf, size_t len) { char *src_string = procid_str(NULL, &pid); printf("PONG from pid %s\n", src_string); - talloc_free(src_string); + TALLOC_FREE(src_string); num_replies++; } diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c index 9325c24881..a42361780e 100644 --- a/source3/utils/smbpasswd.c +++ b/source3/utils/smbpasswd.c @@ -331,7 +331,7 @@ static int process_root(int local_flags) if (!user_name[0] && (pwd = getpwuid_alloc(NULL, geteuid()))) { fstrcpy(user_name, pwd->pw_name); - talloc_free(pwd); + TALLOC_FREE(pwd); } if (!user_name[0]) { @@ -476,7 +476,7 @@ static int process_nonroot(int local_flags) pwd = getpwuid_alloc(NULL, getuid()); if (pwd) { fstrcpy(user_name,pwd->pw_name); - talloc_free(pwd); + TALLOC_FREE(pwd); } else { fprintf(stderr, "smbpasswd: cannot lookup user name for uid %u\n", (unsigned int)getuid()); exit(1); |