summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/util/util_pw.c19
-rw-r--r--lib/util/util_pw.h3
-rw-r--r--source3/lib/sock_exec.c2
-rw-r--r--source3/smbd/ntquotas.c6
4 files changed, 4 insertions, 26 deletions
diff --git a/lib/util/util_pw.c b/lib/util/util_pw.c
index c6e4680ec3..43ac0b3467 100644
--- a/lib/util/util_pw.c
+++ b/lib/util/util_pw.c
@@ -29,25 +29,6 @@
#include "lib/util/util_pw.h"
/**************************************************************************
- Wrappers for setpwent(), getpwent() and endpwent()
-****************************************************************************/
-
-void sys_setpwent(void)
-{
- setpwent();
-}
-
-struct passwd *sys_getpwent(void)
-{
- return getpwent();
-}
-
-void sys_endpwent(void)
-{
- endpwent();
-}
-
-/**************************************************************************
Wrappers for getpwnam(), getpwuid(), getgrnam(), getgrgid()
****************************************************************************/
diff --git a/lib/util/util_pw.h b/lib/util/util_pw.h
index 2967963459..b572502fc5 100644
--- a/lib/util/util_pw.h
+++ b/lib/util/util_pw.h
@@ -24,9 +24,6 @@
#ifndef __LIB_UTIL_UTIL_PW_H__
#define __LIB_UTIL_UTIL_PW_H__
-void sys_setpwent(void);
-struct passwd *sys_getpwent(void);
-void sys_endpwent(void);
struct passwd *sys_getpwnam(const char *name);
struct passwd *sys_getpwuid(uid_t uid);
struct group *sys_getgrnam(const char *name);
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;
}