git.samba.org
/
metze
/
samba
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0dae6f5
)
s3 wbinfo: Use talloc_strdup instead of SMB_STRDUP
author
Kai Blin
<kai@samba.org>
Wed, 12 Aug 2009 15:25:14 +0000
(17:25 +0200)
committer
Kai Blin
<kai@samba.org>
Tue, 18 Aug 2009 17:53:40 +0000
(19:53 +0200)
nsswitch/wbinfo.c
patch
|
blob
|
history
diff --git
a/nsswitch/wbinfo.c
b/nsswitch/wbinfo.c
index 2cad3977fbe63d7fd77d554f18a01421a9dd339d..93de091679f16fb0b7f864e0572909a558f95f7f 100644
(file)
--- a/
nsswitch/wbinfo.c
+++ b/
nsswitch/wbinfo.c
@@
-1172,13
+1172,14
@@
static bool wbinfo_lookupname(const char *full_name)
return true;
}
return true;
}
-static char *wbinfo_prompt_pass(const char *prefix,
+static char *wbinfo_prompt_pass(TALLOC_CTX *mem_ctx,
+ const char *prefix,
const char *username)
{
char *prompt;
const char *ret = NULL;
const char *username)
{
char *prompt;
const char *ret = NULL;
- prompt = talloc_asprintf(
talloc_tos()
, "Enter %s's ", username);
+ prompt = talloc_asprintf(
mem_ctx
, "Enter %s's ", username);
if (!prompt) {
return NULL;
}
if (!prompt) {
return NULL;
}
@@
-1196,7
+1197,7
@@
static char *wbinfo_prompt_pass(const char *prefix,
ret = getpass(prompt);
TALLOC_FREE(prompt);
ret = getpass(prompt);
TALLOC_FREE(prompt);
- return
SMB_STRDUP(
ret);
+ return
talloc_strdup(mem_ctx,
ret);
}
/* Authenticate a user with a plaintext password */
}
/* Authenticate a user with a plaintext password */
@@
-1213,17
+1214,18
@@
static bool wbinfo_auth_krb5(char *username, const char *cctype, uint32_t flags)
struct wbcLogonUserInfo *info;
struct wbcAuthErrorInfo *error;
struct wbcUserPasswordPolicyInfo *policy;
struct wbcLogonUserInfo *info;
struct wbcAuthErrorInfo *error;
struct wbcUserPasswordPolicyInfo *policy;
+ TALLOC_CTX *frame = talloc_tos();
- if ((s =
SMB_STRDUP(
username)) == NULL) {
+ if ((s =
talloc_strdup(frame,
username)) == NULL) {
return false;
}
if ((p = strchr(s, '%')) != NULL) {
*p = 0;
p++;
return false;
}
if ((p = strchr(s, '%')) != NULL) {
*p = 0;
p++;
- password =
SMB_STRDUP(
p);
+ password =
talloc_strdup(frame,
p);
} else {
} else {
- password = wbinfo_prompt_pass(NULL, username);
+ password = wbinfo_prompt_pass(
frame,
NULL, username);
}
name = s;
}
name = s;
@@
-1307,8
+1309,7
@@
static bool wbinfo_auth_krb5(char *username, const char *cctype, uint32_t flags)
}
done:
}
done:
- SAFE_FREE(s);
- SAFE_FREE(password);
+ TALLOC_FREE(frame);
wbcFreeMemory(params.blobs);
return WBC_ERROR_IS_OK(wbc_status);
wbcFreeMemory(params.blobs);
return WBC_ERROR_IS_OK(wbc_status);
@@
-1323,17
+1324,18
@@
static bool wbinfo_auth(char *username)
char *p = NULL;
char *password = NULL;
char *name = NULL;
char *p = NULL;
char *password = NULL;
char *name = NULL;
+ TALLOC_CTX *frame = talloc_tos();
- if ((s =
SMB_STRDUP(
username)) == NULL) {
+ if ((s =
talloc_strdup(frame,
username)) == NULL) {
return false;
}
if ((p = strchr(s, '%')) != NULL) {
*p = 0;
p++;
return false;
}
if ((p = strchr(s, '%')) != NULL) {
*p = 0;
p++;
- password =
SMB_STRDUP(
p);
+ password =
talloc_strdup(frame,
p);
} else {
} else {
- password = wbinfo_prompt_pass(NULL, username);
+ password = wbinfo_prompt_pass(
frame,
NULL, username);
}
name = s;
}
name = s;
@@
-1352,8
+1354,7
@@
static bool wbinfo_auth(char *username)
response.data.auth.error_string);
#endif
response.data.auth.error_string);
#endif
- SAFE_FREE(s);
- SAFE_FREE(password);
+ TALLOC_FREE(frame);
return WBC_ERROR_IS_OK(wbc_status);
}
return WBC_ERROR_IS_OK(wbc_status);
}
@@
-1372,14
+1373,15
@@
static bool wbinfo_auth_crap(char *username, bool use_ntlmv2, bool use_lanman)
fstring name_domain;
char *pass;
char *p;
fstring name_domain;
char *pass;
char *p;
+ TALLOC_CTX *frame = talloc_tos();
p = strchr(username, '%');
if (p) {
*p = 0;
p = strchr(username, '%');
if (p) {
*p = 0;
- pass =
SMB_STRDUP(
p + 1);
+ pass =
talloc_strdup(frame,
p + 1);
} else {
} else {
- pass = wbinfo_prompt_pass(NULL, username);
+ pass = wbinfo_prompt_pass(
frame,
NULL, username);
}
parse_wbinfo_domain_user(username, name_domain, name_user);
}
parse_wbinfo_domain_user(username, name_domain, name_user);
@@
-1460,7
+1462,7
@@
static bool wbinfo_auth_crap(char *username, bool use_ntlmv2, bool use_lanman)
data_blob_free(&nt);
data_blob_free(&lm);
data_blob_free(&nt);
data_blob_free(&lm);
-
SAFE_FREE(pass
);
+
TALLOC_FREE(frame
);
return WBC_ERROR_IS_OK(wbc_status);
}
return WBC_ERROR_IS_OK(wbc_status);
}
@@
-1619,9
+1621,10
@@
static bool wbinfo_change_user_password(const char *username)
wbcErr wbc_status;
char *old_password = NULL;
char *new_password = NULL;
wbcErr wbc_status;
char *old_password = NULL;
char *new_password = NULL;
+ TALLOC_CTX *frame = talloc_tos();
- old_password = wbinfo_prompt_pass("old", username);
- new_password = wbinfo_prompt_pass("new", username);
+ old_password = wbinfo_prompt_pass(
frame,
"old", username);
+ new_password = wbinfo_prompt_pass(
frame,
"new", username);
wbc_status = wbcChangeUserPassword(username, old_password,new_password);
wbc_status = wbcChangeUserPassword(username, old_password,new_password);
@@
-1630,8
+1633,7
@@
static bool wbinfo_change_user_password(const char *username)
d_printf("Password change for user %s %s\n", username,
WBC_ERROR_IS_OK(wbc_status) ? "succeeded" : "failed");
d_printf("Password change for user %s %s\n", username,
WBC_ERROR_IS_OK(wbc_status) ? "succeeded" : "failed");
- SAFE_FREE(old_password);
- SAFE_FREE(new_password);
+ TALLOC_FREE(frame);
return WBC_ERROR_IS_OK(wbc_status);
}
return WBC_ERROR_IS_OK(wbc_status);
}
@@
-2166,7
+2168,7
@@
int main(int argc, char **argv, char **envp)
/* Exit code */
done:
/* Exit code */
done:
- talloc_
destroy
(frame);
+ talloc_
free
(frame);
poptFreeContext(pc);
return result;
poptFreeContext(pc);
return result;