svn commit: samba r21974 - in branches/SAMBA_3_0/source/groupdb: .
metze at samba.org
metze at samba.org
Tue Mar 27 09:17:31 GMT 2007
Author: metze
Date: 2007-03-27 09:17:31 +0000 (Tue, 27 Mar 2007)
New Revision: 21974
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21974
Log:
make use of tdb_*_bystring() and string_term_tdb_data() in groupdb/
to avoid creating the TDB_DATA struct from strings "by hand"
metze
Modified:
branches/SAMBA_3_0/source/groupdb/mapping_tdb.c
Changeset:
Modified: branches/SAMBA_3_0/source/groupdb/mapping_tdb.c
===================================================================
--- branches/SAMBA_3_0/source/groupdb/mapping_tdb.c 2007-03-27 09:12:47 UTC (rev 21973)
+++ branches/SAMBA_3_0/source/groupdb/mapping_tdb.c 2007-03-27 09:17:31 UTC (rev 21974)
@@ -87,7 +87,7 @@
****************************************************************************/
BOOL add_mapping_entry(GROUP_MAP *map, int flag)
{
- TDB_DATA kbuf, dbuf;
+ TDB_DATA dbuf;
pstring key, buf;
fstring string_sid="";
int len;
@@ -107,11 +107,9 @@
slprintf(key, sizeof(key), "%s%s", GROUP_PREFIX, string_sid);
- kbuf.dsize = strlen(key)+1;
- kbuf.dptr = key;
dbuf.dsize = len;
dbuf.dptr = buf;
- if (tdb_store(tdb, kbuf, dbuf, flag) != 0) return False;
+ if (tdb_store_bystring(tdb, key, dbuf, flag) != 0) return False;
return True;
}
@@ -123,7 +121,7 @@
BOOL get_group_map_from_sid(DOM_SID sid, GROUP_MAP *map)
{
- TDB_DATA kbuf, dbuf;
+ TDB_DATA dbuf;
pstring key;
fstring string_sid;
int ret = 0;
@@ -138,10 +136,7 @@
sid_to_string(string_sid, &sid);
slprintf(key, sizeof(key), "%s%s", GROUP_PREFIX, string_sid);
- kbuf.dptr = key;
- kbuf.dsize = strlen(key)+1;
-
- dbuf = tdb_fetch(tdb, kbuf);
+ dbuf = tdb_fetch_bystring(tdb, key);
if (!dbuf.dptr)
return False;
@@ -266,7 +261,7 @@
BOOL group_map_remove(const DOM_SID *sid)
{
- TDB_DATA kbuf, dbuf;
+ TDB_DATA dbuf;
pstring key;
fstring string_sid;
@@ -280,16 +275,13 @@
sid_to_string(string_sid, sid);
slprintf(key, sizeof(key), "%s%s", GROUP_PREFIX, string_sid);
- kbuf.dptr = key;
- kbuf.dsize = strlen(key)+1;
-
- dbuf = tdb_fetch(tdb, kbuf);
+ dbuf = tdb_fetch_bystring(tdb, key);
if (!dbuf.dptr)
return False;
SAFE_FREE(dbuf.dptr);
- if(tdb_delete(tdb, kbuf) != TDB_SUCCESS)
+ if(tdb_delete_bystring(tdb, key) != TDB_SUCCESS)
return False;
return True;
@@ -400,7 +392,7 @@
DOM_SID **sids, size_t *num)
{
fstring key, string_sid;
- TDB_DATA kbuf, dbuf;
+ TDB_DATA dbuf;
const char *p;
if (!init_group_mapping()) {
@@ -411,11 +403,8 @@
sid_to_string(string_sid, member);
slprintf(key, sizeof(key), "%s%s", MEMBEROF_PREFIX, string_sid);
- kbuf.dsize = strlen(key)+1;
- kbuf.dptr = key;
+ dbuf = tdb_fetch_bystring(tdb, key);
- dbuf = tdb_fetch(tdb, kbuf);
-
if (dbuf.dptr == NULL) {
return NT_STATUS_OK;
}
@@ -478,7 +467,7 @@
NTSTATUS add_aliasmem(const DOM_SID *alias, const DOM_SID *member)
{
GROUP_MAP map;
- TDB_DATA kbuf, dbuf;
+ TDB_DATA dbuf;
pstring key;
fstring string_sid;
char *new_memberstring;
@@ -502,11 +491,8 @@
sid_to_string(string_sid, member);
slprintf(key, sizeof(key), "%s%s", MEMBEROF_PREFIX, string_sid);
- kbuf.dsize = strlen(key)+1;
- kbuf.dptr = key;
+ dbuf = tdb_fetch_bystring(tdb, key);
- dbuf = tdb_fetch(tdb, kbuf);
-
sid_to_string(string_sid, alias);
if (dbuf.dptr != NULL) {
@@ -520,10 +506,9 @@
return NT_STATUS_NO_MEMORY;
SAFE_FREE(dbuf.dptr);
- dbuf.dsize = strlen(new_memberstring)+1;
- dbuf.dptr = new_memberstring;
+ dbuf = string_term_tdb_data(new_memberstring);
- result = tdb_store(tdb, kbuf, dbuf, 0);
+ result = tdb_store_bystring(tdb, key, dbuf, 0);
SAFE_FREE(new_memberstring);
@@ -620,7 +605,7 @@
size_t i, num;
BOOL found = False;
char *member_string;
- TDB_DATA kbuf, dbuf;
+ TDB_DATA dbuf;
pstring key;
fstring sid_string;
@@ -649,11 +634,8 @@
sid_to_string(sid_string, member);
slprintf(key, sizeof(key), "%s%s", MEMBEROF_PREFIX, sid_string);
- kbuf.dsize = strlen(key)+1;
- kbuf.dptr = key;
-
if (num == 0)
- return tdb_delete(tdb, kbuf) == 0 ?
+ return tdb_delete_bystring(tdb, key) == 0 ?
NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
member_string = SMB_STRDUP("");
@@ -676,10 +658,9 @@
}
}
- dbuf.dsize = strlen(member_string)+1;
- dbuf.dptr = member_string;
+ dbuf = string_term_tdb_data(member_string);
- result = tdb_store(tdb, kbuf, dbuf, 0) == 0 ?
+ result = tdb_store_bystring(tdb, key, dbuf, 0) == 0 ?
NT_STATUS_OK : NT_STATUS_ACCESS_DENIED;
SAFE_FREE(sids);
More information about the samba-cvs
mailing list