diff options
| author | Jeremy Allison <jra@samba.org> | 2011-05-03 13:10:01 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-05-04 12:12:13 -0700 |
| commit | 017e0c8d95fe8212b006e1c14aef8d96fed30674 (patch) | |
| tree | 3bb209bc92d298d17255a69713981a7df18d0b8b /source3/winbindd | |
| parent | deba880986b1029fa059fcfba9b2a72abf598a9b (diff) | |
| download | samba-017e0c8d95fe8212b006e1c14aef8d96fed30674.tar.gz samba-017e0c8d95fe8212b006e1c14aef8d96fed30674.tar.bz2 samba-017e0c8d95fe8212b006e1c14aef8d96fed30674.zip | |
Fix simple uses of safe_strcpy -> strlcpy. Easy ones where we just remove -1.
Diffstat (limited to 'source3/winbindd')
| -rw-r--r-- | source3/winbindd/wb_fill_pwent.c | 2 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_group.c | 4 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_pam.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source3/winbindd/wb_fill_pwent.c b/source3/winbindd/wb_fill_pwent.c index 23057384c2..37d45357db 100644 --- a/source3/winbindd/wb_fill_pwent.c +++ b/source3/winbindd/wb_fill_pwent.c @@ -194,7 +194,7 @@ static bool fillup_pw_field(const char *lp_template, if (!templ) return False; - safe_strcpy(out, templ, sizeof(fstring) - 1); + strlcpy(out, templ, sizeof(fstring)); TALLOC_FREE(templ); return True; diff --git a/source3/winbindd/winbindd_group.c b/source3/winbindd/winbindd_group.c index a985fa254f..1e4ad5fa8a 100644 --- a/source3/winbindd/winbindd_group.c +++ b/source3/winbindd/winbindd_group.c @@ -60,8 +60,8 @@ bool fill_grent(TALLOC_CTX *mem_ctx, struct winbindd_gr *gr, /* Group name and password */ - safe_strcpy(gr->gr_name, full_group_name, sizeof(gr->gr_name) - 1); - safe_strcpy(gr->gr_passwd, "x", sizeof(gr->gr_passwd) - 1); + strlcpy(gr->gr_name, full_group_name, sizeof(gr->gr_name)); + strlcpy(gr->gr_passwd, "x", sizeof(gr->gr_passwd)); return True; } diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c index 412ec8370a..93c691b13b 100644 --- a/source3/winbindd/winbindd_pam.c +++ b/source3/winbindd/winbindd_pam.c @@ -1514,8 +1514,8 @@ enum winbindd_result winbindd_dual_pam_auth(struct winbindd_domain *domain, fstr_sprintf( domain_user, "%s%c%s", name_domain, *lp_winbind_separator(), name_user ); - safe_strcpy( state->request->data.auth.user, domain_user, - sizeof(state->request->data.auth.user)-1 ); + strlcpy( state->request->data.auth.user, domain_user, + sizeof(state->request->data.auth.user)); } if (!domain->online) { |