diff options
| author | Jeremy Allison <jra@samba.org> | 1998-11-17 20:50:07 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-11-17 20:50:07 +0000 |
| commit | 768761820e8d7481c586c4e0ab4ac7cb36d18c4b (patch) | |
| tree | 675f36b6854bfccca433842e68e0df4b86cda575 /source3/groupdb | |
| parent | bb5bea4e195eaf5776284c027d667812b7365b56 (diff) | |
| download | samba-768761820e8d7481c586c4e0ab4ac7cb36d18c4b.tar.gz samba-768761820e8d7481c586c4e0ab4ac7cb36d18c4b.tar.bz2 samba-768761820e8d7481c586c4e0ab4ac7cb36d18c4b.zip | |
Added the same open()/fopen()/creat()/mmap() -> sys_XXX calls.
Tidied up some of the mess (no other word for it). Still doesn't
compile cleanly. There are calls with incorrect parameters that
don't seem to be doing the right thing.
This code still needs surgery :-(.
Jeremy.
(This used to be commit 18ff93a9abbf68ee8c59c0af3e57c63e4a015dac)
Diffstat (limited to 'source3/groupdb')
| -rw-r--r-- | source3/groupdb/aliasdb.c | 8 | ||||
| -rw-r--r-- | source3/groupdb/aliasfile.c | 3 | ||||
| -rw-r--r-- | source3/groupdb/groupfile.c | 5 |
3 files changed, 7 insertions, 9 deletions
diff --git a/source3/groupdb/aliasdb.c b/source3/groupdb/aliasdb.c index e5e6ebfa53..03e0a6e11a 100644 --- a/source3/groupdb/aliasdb.c +++ b/source3/groupdb/aliasdb.c @@ -191,14 +191,14 @@ static BOOL user_is_member(char *user_name, LOCAL_GRP_MEMBER *mem, int num_mem) *************************************************************************/ BOOL iterate_getuseraliasnam(char *user_name, LOCAL_GRP **alss, int *num_alss) { - LOCAL_GRP *als; + LOCAL_GRP *als = NULL; LOCAL_GRP_MEMBER *mem = NULL; int num_mem = 0; void *fp = NULL; DEBUG(10, ("search for useralias by name: %s\n", user_name)); - if (user_name == NULL || als == NULL || num_alss == NULL) + if (user_name == NULL || alss == NULL || num_alss == NULL) { return False; } @@ -254,12 +254,12 @@ BOOL iterate_getuseraliasnam(char *user_name, LOCAL_GRP **alss, int *num_alss) *************************************************************************/ BOOL enumdomaliases(LOCAL_GRP **alss, int *num_alss) { - LOCAL_GRP *als; + LOCAL_GRP *als = NULL; void *fp = NULL; DEBUG(10, ("enum user aliases\n")); - if (als == NULL || num_alss == NULL) + if (alss == NULL || num_alss == NULL) { return False; } diff --git a/source3/groupdb/aliasfile.c b/source3/groupdb/aliasfile.c index fc87b47c47..01166bcc1f 100644 --- a/source3/groupdb/aliasfile.c +++ b/source3/groupdb/aliasfile.c @@ -176,14 +176,13 @@ static LOCAL_GRP *getalsfilepwent(void *vp, LOCAL_GRP_MEMBER **mem, int *num_mem pstring linebuf; char *p; - size_t linebuf_len; aldb_init_als(&al_buf); /* * Scan the file, a line at a time and check if the name matches. */ - while ((linebuf_len = getfileline(vp, linebuf, sizeof(linebuf))) > 0) + while (getfileline(vp, linebuf, sizeof(linebuf)) > 0) { /* get alias name */ diff --git a/source3/groupdb/groupfile.c b/source3/groupdb/groupfile.c index 8044071391..09939de71e 100644 --- a/source3/groupdb/groupfile.c +++ b/source3/groupdb/groupfile.c @@ -135,7 +135,7 @@ static char *get_group_members(char *p, int *num_mem, DOMAIN_GRP_MEMBER **member uint8 type; BOOL found = False; - if (isdigit(name)) + if (isdigit(name[0])) { uint32 rid = get_number(name); sid_copy(&sid, &global_sam_sid); @@ -180,14 +180,13 @@ static DOMAIN_GRP *getgrpfilepwent(void *vp, DOMAIN_GRP_MEMBER **mem, int *num_m pstring linebuf; char *p; - size_t linebuf_len; gpdb_init_grp(&gp_buf); /* * Scan the file, a line at a time and check if the name matches. */ - while ((linebuf_len = getfileline(vp, linebuf, sizeof(linebuf))) > 0) + while (getfileline(vp, linebuf, sizeof(linebuf)) > 0) { /* get group name */ |