diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/sock_exec.c | 2 | ||||
| -rw-r--r-- | source3/smbd/ntquotas.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/lib/sock_exec.c b/source3/lib/sock_exec.c index 419d60d05c..403b38b188 100644 --- a/source3/lib/sock_exec.c +++ b/source3/lib/sock_exec.c @@ -70,7 +70,7 @@ static int socketpair_tcp(int fd[2]) close(listener); if (connect_done == 0) { - if (connect(fd[1], (struct sockaddr *)&sock, salen) != 0 + if (connect(fd[1], (struct sockaddr *)&sock, socklen) != 0 && errno != EISCONN) goto failed; } diff --git a/source3/smbd/ntquotas.c b/source3/smbd/ntquotas.c index 147f95adf3..15fd35b92e 100644 --- a/source3/smbd/ntquotas.c +++ b/source3/smbd/ntquotas.c @@ -176,8 +176,8 @@ int vfs_get_user_ntquota_list(files_struct *fsp, SMB_NTQUOTA_LIST **qt_list) return (-1); } - sys_setpwent(); - while ((usr = sys_getpwent()) != NULL) { + setpwent(); + while ((usr = getpwent()) != NULL) { SMB_NTQUOTA_STRUCT tmp_qt; SMB_NTQUOTA_LIST *tmp_list_ent; struct dom_sid sid; @@ -222,7 +222,7 @@ int vfs_get_user_ntquota_list(files_struct *fsp, SMB_NTQUOTA_LIST **qt_list) DLIST_ADD((*qt_list),tmp_list_ent); } - sys_endpwent(); + endpwent(); return 0; } |