sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

s3: Make "smbpasswd <user>" work with pdb_ads

Browse Source 
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Sat Feb 12 15:17:39 CET 2011 on sn-devel-104
This commit is contained in:
Volker Lendecke 2011-02-12 14:28:40 +01:00 committed by Volker Lendecke
parent 13e820cd10
commit d38ab83bab
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
source3/passdb/pdb_ads.c
View File

@ -296,6 +296,7 @@ static bool pdb_ads_init_ads_from_sam(struct pdb_ads_state *state,
{
bool ret = true;
DATA_BLOB blob;
const char *pw;
/* TODO: All fields :-) */
@ -303,16 +304,39 @@ static bool pdb_ads_init_ads_from_sam(struct pdb_ads_state *state,
existing, mem_ctx, pnum_mods, pmods, "displayName",
"%s", pdb_get_fullname(sam));
blob = data_blob_const(pdb_get_nt_passwd(sam), NT_HASH_LEN);
if (blob.data != NULL) {
pw = pdb_get_plaintext_passwd(sam);
/*
* If we have the plain text pw, this is probably about to be
* set. Is this true always?
*/
if (pw != NULL) {
char *pw_quote;
uint8_t *pw_utf16;
size_t pw_utf16_len;
pw_quote = talloc_asprintf(talloc_tos(), "\"%s\"", pw);
if (pw_quote == NULL) {
ret = false;
goto fail;
}
ret &= convert_string_talloc(talloc_tos(),
CH_UNIX, CH_UTF16LE,
pw_quote, strlen(pw_quote),
&pw_utf16, &pw_utf16_len, false);
if (!ret) {
goto fail;
}
blob = data_blob_const(pw_utf16, pw_utf16_len);
ret &= tldap_add_mod_blobs(mem_ctx, pmods, TLDAP_MOD_REPLACE,
"unicodePwd", 1, &blob);
}
blob = data_blob_const(pdb_get_lanman_passwd(sam), NT_HASH_LEN);
if (blob.data != NULL) {
ret &= tldap_add_mod_blobs(mem_ctx, pmods, TLDAP_MOD_REPLACE,
"dBCSPwd", 1, &blob);
if (ret) {
*pnum_mods = talloc_array_length(*pmods);
}
TALLOC_FREE(pw_utf16);
TALLOC_FREE(pw_quote);
}
ret &= tldap_make_mod_fmt(
@ -335,6 +359,7 @@ static bool pdb_ads_init_ads_from_sam(struct pdb_ads_state *state,
existing, mem_ctx, pnum_mods, pmods, "profilePath",
"%s", pdb_get_profile_path(sam));
fail:
return ret;
}