diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-09-26 18:16:38 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:38:59 -0500 |
| commit | 7f7a2d133dc2191e0a08f6f99f3bda914a29ac44 (patch) | |
| tree | ba20030594fe9bc580dffc9513b04097104f308b /source4/lib/samba3/group.c | |
| parent | 01319b8462aa8ebf3b5be4598e7317aa08f40350 (diff) | |
| download | samba-7f7a2d133dc2191e0a08f6f99f3bda914a29ac44.tar.gz samba-7f7a2d133dc2191e0a08f6f99f3bda914a29ac44.tar.bz2 samba-7f7a2d133dc2191e0a08f6f99f3bda914a29ac44.zip | |
r10517: Get rid of use of next_token() in lib/samba3/
(This used to be commit 811a6e28cca1ba09a95a89c344f4640b3d1dd74e)
Diffstat (limited to 'source4/lib/samba3/group.c')
| -rw-r--r-- | source4/lib/samba3/group.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/lib/samba3/group.c b/source4/lib/samba3/group.c index 220f206e99..78a04b3ff8 100644 --- a/source4/lib/samba3/group.c +++ b/source4/lib/samba3/group.c @@ -24,7 +24,6 @@ #include "lib/samba3/samba3.h" #include "lib/tdb/include/tdbutil.h" #include "system/filesys.h" -#include "pstring.h" #define DATABASE_VERSION_V1 1 /* native byte format. */ #define DATABASE_VERSION_V2 2 /* le format. */ @@ -108,8 +107,8 @@ NTSTATUS samba3_read_grouptdb(const char *file, TALLOC_CTX *ctx, struct samba3_g } else if (strncmp(kbuf.dptr, MEMBEROF_PREFIX, strlen(MEMBEROF_PREFIX)) == 0) { struct samba3_alias alias; - pstring alias_string; - const char *p; + char **member_strlist; + int i; dbuf = tdb_fetch(tdb, kbuf); if (!dbuf.dptr) @@ -119,15 +118,16 @@ NTSTATUS samba3_read_grouptdb(const char *file, TALLOC_CTX *ctx, struct samba3_g alias.member_count = 0; alias.members = NULL; - p = dbuf.dptr; - while (next_token(&p, alias_string, " ", sizeof(alias_string))) { + member_strlist = str_list_make_shell(ctx, dbuf.dptr, " "); + for (i = 0; member_strlist[i]; i++) { alias.members = talloc_realloc(ctx, alias.members, struct dom_sid *, alias.member_count+1); - alias.members[alias.member_count] = dom_sid_parse_talloc(ctx, alias_string); + alias.members[alias.member_count] = dom_sid_parse_talloc(ctx, member_strlist[i]); alias.member_count++; - } + talloc_free(member_strlist); + db->aliases = talloc_realloc(ctx, db->aliases, struct samba3_alias, db->alias_count+1); db->aliases[db->alias_count] = alias; db->alias_count++; |