summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-04-23 00:56:06 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-04-23 00:56:06 +0000
commit63118136fa9539fde8aad3e4ba5c286484686075 (patch)
tree9721ccf620a95ed9bbf39254d209fcc013125918
parentcfe53bd06623eb3f718b5978b0b3c2a24461e8f4 (diff)
downloadsamba-63118136fa9539fde8aad3e4ba5c286484686075.tar.gz
samba-63118136fa9539fde8aad3e4ba5c286484686075.tar.bz2
samba-63118136fa9539fde8aad3e4ba5c286484686075.zip
Merge idra's fix for pdb_tdb segfaults from HEAD to 3.0 - sombody changed
unix_strlower semantics. Andrew Bartlett (This used to be commit 93bdd1a2925edb9dea3e85d8b025a65460896c05)
-rw-r--r--source3/passdb/pdb_tdb.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index 7e2f4b832f..3a1702a4e0 100644
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -585,8 +585,10 @@ static NTSTATUS tdbsam_getsampwnam (struct pdb_methods *my_methods, SAM_ACCOUNT
return nt_status;
}
+
/* Data is stored in all lower-case */
- unix_strlower(sname, -1, name, sizeof(name));
+ fstrcpy(name, sname);
+ strlower(name);
/* set search key */
slprintf(keystr, sizeof(keystr)-1, "%s%s", USERPREFIX, name);
@@ -692,7 +694,8 @@ static NTSTATUS tdbsam_delete_sam_account(struct pdb_methods *my_methods, SAM_AC
uint32 rid;
fstring name;
- unix_strlower(pdb_get_username(sam_pass), -1, name, sizeof(name));
+ fstrcpy(name, pdb_get_username(sam_pass));
+ strlower(name);
/* open the TDB */
if (!(pwd_tdb = tdb_open_log(tdb_state->tdbsam_location, 0, TDB_DEFAULT, O_RDWR, 0600))) {
@@ -826,7 +829,8 @@ static BOOL tdb_update_sam(struct pdb_methods *my_methods, SAM_ACCOUNT* newpwd,
}
data.dptr = buf;
- unix_strlower(pdb_get_username(newpwd), -1, name, sizeof(name));
+ fstrcpy(name, pdb_get_username(newpwd));
+ strlower(name);
DEBUG(5, ("Storing %saccount %s with RID %d\n", flag == TDB_INSERT ? "(new) " : "", name, user_rid));