diff options
| author | Gerald Carter <jerry@samba.org> | 2004-02-02 01:46:30 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2004-02-02 01:46:30 +0000 |
| commit | a870ff546ce9128e3bf8bb3ddc88f5eeb98d2eda (patch) | |
| tree | 9e2f27eb92aa97692268818a5d3ae4a921f53c13 /source3/nsswitch/winbindd_group.c | |
| parent | 152e2282164069d63dde7b15f96d637db5a25245 (diff) | |
| download | samba-a870ff546ce9128e3bf8bb3ddc88f5eeb98d2eda.tar.gz samba-a870ff546ce9128e3bf8bb3ddc88f5eeb98d2eda.tar.bz2 samba-a870ff546ce9128e3bf8bb3ddc88f5eeb98d2eda.zip | |
janitor duty (merges from 3.0) and cleanup compiler warning on SuSE 9 in the end mapper code
(This used to be commit 902d4a647a88d1def09d5b1eacb06ab1561f3dec)
Diffstat (limited to 'source3/nsswitch/winbindd_group.c')
| -rw-r--r-- | source3/nsswitch/winbindd_group.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/nsswitch/winbindd_group.c b/source3/nsswitch/winbindd_group.c index b31dc92b38..4805e628dd 100644 --- a/source3/nsswitch/winbindd_group.c +++ b/source3/nsswitch/winbindd_group.c @@ -1098,7 +1098,7 @@ enum winbindd_result winbindd_getusersids(struct winbindd_cli_state *state) enum winbindd_result result = WINBINDD_ERROR; unsigned int i; TALLOC_CTX *mem_ctx; - char *ret; + char *ret = NULL; uint32 num_groups; unsigned ofs, ret_size = 0; @@ -1144,7 +1144,7 @@ enum winbindd_result winbindd_getusersids(struct winbindd_cli_state *state) ofs = 0; for (i = 0; i < num_groups; i++) { const char *s = sid_string_static(user_grpsids[i]); - safe_strcpy(ret + ofs, s, ret_size - ofs); + safe_strcpy(ret + ofs, s, ret_size - ofs - 1); ofs += strlen(ret+ofs) + 1; } |