diff options
| author | Jeremy Allison <jra@samba.org> | 2011-05-04 11:38:26 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-05-04 12:12:15 -0700 |
| commit | 8380835fc6de38706d9af29dc7f0fa4cec4f9c90 (patch) | |
| tree | 5fdf238d5573c022a135e3f2e5590b656b0d64bf /source3/smbd | |
| parent | df023b8657cab232df88d3656aa5d87676bb7254 (diff) | |
| download | samba-8380835fc6de38706d9af29dc7f0fa4cec4f9c90.tar.gz samba-8380835fc6de38706d9af29dc7f0fa4cec4f9c90.tar.bz2 samba-8380835fc6de38706d9af29dc7f0fa4cec4f9c90.zip | |
Fix warning messages caused by addition of null check in fstrcpy macro.
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/password.c | 6 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/password.c b/source3/smbd/password.c index 54746c3f56..34384342af 100644 --- a/source3/smbd/password.c +++ b/source3/smbd/password.c @@ -644,7 +644,7 @@ bool authorise_login(struct smbd_server_connection *sconn, get_session_workgroup(sconn), user2,password)) { ok = True; - fstrcpy(user,user2); + strlcpy(user,user2,sizeof(user)); DEBUG(3,("authorise_login: ACCEPTED: session " "list username (%s) and given " "password ok\n", user)); @@ -695,7 +695,7 @@ bool authorise_login(struct smbd_server_connection *sconn, get_session_workgroup(sconn), user2,password)) { ok = True; - fstrcpy(user,user2); + strlcpy(user,user2,sizeof(user)); DEBUG(3,("authorise_login: ACCEPTED: " "user list username and " "given password ok (%s)\n", @@ -714,7 +714,7 @@ bool authorise_login(struct smbd_server_connection *sconn, fstrcpy(guestname,lp_guestaccount()); guest_pw = Get_Pwnam_alloc(talloc_tos(), guestname); if (guest_pw != NULL) { - fstrcpy(user,guestname); + strlcpy(user,guestname,sizeof(user)); ok = True; DEBUG(3,("authorise_login: ACCEPTED: guest account " "and guest ok (%s)\n", user)); diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 39e653afae..7c8b43c10c 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -388,7 +388,7 @@ static unsigned int fill_ea_buffer(TALLOC_CTX *mem_ctx, char *pdata, unsigned in SCVAL(p,0,ea_list->ea.flags); SCVAL(p,1,dos_namelen); SSVAL(p,2,ea_list->ea.value.length); - fstrcpy(p+4, dos_ea_name); + strlcpy(p+4, dos_ea_name, dos_namelen+1); memcpy( p + 4 + dos_namelen + 1, ea_list->ea.value.data, ea_list->ea.value.length); total_data_size -= 4 + dos_namelen + 1 + ea_list->ea.value.length; @@ -452,7 +452,7 @@ static NTSTATUS fill_ea_chained_buffer(TALLOC_CTX *mem_ctx, SCVAL(p, 0x04, ea_list->ea.flags); SCVAL(p, 0x05, dos_namelen); SSVAL(p, 0x06, ea_list->ea.value.length); - fstrcpy((char *)(p+0x08), dos_ea_name); + strlcpy((char *)(p+0x08), dos_ea_name, dos_namelen+1); memcpy(p + 0x08 + dos_namelen + 1, ea_list->ea.value.data, ea_list->ea.value.length); total_data_size -= this_size; |