summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2003-04-17 14:25:52 +0000
committerSimo Sorce <idra@samba.org>2003-04-17 14:25:52 +0000
commit491aa2bfde1010709e61807a62d5a77b54a6179f (patch)
treebdc53bb5a3c8fd41a714d1748063ef144958e716 /source3
parent800f68d2fbba2cc1727329c5c026e5a8165b9fd0 (diff)
downloadsamba-491aa2bfde1010709e61807a62d5a77b54a6179f.tar.gz
samba-491aa2bfde1010709e61807a62d5a77b54a6179f.tar.bz2
samba-491aa2bfde1010709e61807a62d5a77b54a6179f.zip
seem that someone changed the semanthic of unix_strlower without fixing all
places where it was used, this caused me segfaults in the last week :( add more debugging in idmap to chase down a problem (This used to be commit 6393105bda12fb3f6211e4f0128aabf588431b49)
Diffstat (limited to 'source3')
-rw-r--r--source3/passdb/pdb_tdb.c10
-rw-r--r--source3/sam/gumm_tdb.c9
-rw-r--r--source3/sam/idmap_tdb.c4
3 files changed, 15 insertions, 8 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));
diff --git a/source3/sam/gumm_tdb.c b/source3/sam/gumm_tdb.c
index 5e390490cf..5da2407faa 100644
--- a/source3/sam/gumm_tdb.c
+++ b/source3/sam/gumm_tdb.c
@@ -264,7 +264,8 @@ static NTSTATUS get_object_by_name(TALLOC_CTX *mem_ctx, struct tdbsam2_object *o
return ret;
}
- unix_strlower(name, -1, objname, sizeof(objname));
+ fstrcpy(objname, name);
+ strlower(objname);
slprintf(keystr, sizeof(keystr)-1, "%s%s", NAMEPREFIX, objname);
key.dptr = keystr;
@@ -603,7 +604,8 @@ static NTSTATUS tdbsam2_get_domain_sid(DOM_SID *sid, const char* name)
goto done;
}
- unix_strlower(name, -1, domname, sizeof(domname));
+ fstrcpy(domname, name);
+ strlower(domname);
ret = get_object_by_name(mem_ctx, &obj, domname);
@@ -650,7 +652,8 @@ static NTSTATUS tdbsam2_set_domain_sid (const DOM_SID *sid, const char *name)
}
}
- unix_strlower(name, -1, domname, sizeof(domname));
+ fstrcpy(domname, name);
+ strlower(domname);
/* TODO: we need to lock this entry until updated! */
diff --git a/source3/sam/idmap_tdb.c b/source3/sam/idmap_tdb.c
index 7080ac56e6..c494cf595f 100644
--- a/source3/sam/idmap_tdb.c
+++ b/source3/sam/idmap_tdb.c
@@ -236,11 +236,11 @@ static NTSTATUS db_set_mapping(DOM_SID *sid, unid_t id, int id_type)
kid.dsize = strlen(kidstr) + 1;
if (tdb_store(idmap_tdb, ksid, kid, TDB_INSERT) == -1) {
- DEBUG(0, ("idb_set_mapping: tdb_store 1 error: %s", tdb_errorstr(idmap_tdb)));
+ DEBUG(0, ("idb_set_mapping: tdb_store 1 error: %s\n", tdb_errorstr(idmap_tdb)));
return NT_STATUS_UNSUCCESSFUL;
}
if (tdb_store(idmap_tdb, kid, ksid, TDB_INSERT) == -1) {
- DEBUG(0, ("idb_set_mapping: tdb_store 2 error: %s", tdb_errorstr(idmap_tdb)));
+ DEBUG(0, ("idb_set_mapping: tdb_store 2 error: %s\n", tdb_errorstr(idmap_tdb)));
return NT_STATUS_UNSUCCESSFUL;
}
return NT_STATUS_OK;