summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/password.c11
-rw-r--r--source3/smbd/share_access.c2
2 files changed, 6 insertions, 7 deletions
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 7101f7c8c4..6919e8bb3a 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -408,8 +408,7 @@ const char *get_session_workgroup(struct smbd_server_connection *sconn)
try lower case.
****************************************************************************/
-bool user_in_netgroup(struct smbd_server_connection *sconn,
- const char *user, const char *ngname)
+bool user_in_netgroup(const char *user, const char *ngname)
{
#ifdef HAVE_NETGROUP
static char *my_yp_domain = NULL;
@@ -489,7 +488,7 @@ bool user_in_list(struct smbd_server_connection *sconn,
* Old behaviour. Check netgroup list
* followed by UNIX list.
*/
- if(user_in_netgroup(sconn, user, *list +1))
+ if(user_in_netgroup(user, *list +1))
return True;
if(user_in_group(user, *list +1))
return True;
@@ -501,7 +500,7 @@ bool user_in_list(struct smbd_server_connection *sconn,
*/
if(user_in_group(user, *list +2))
return True;
- if(user_in_netgroup(sconn, user, *list +2))
+ if(user_in_netgroup(user, *list +2))
return True;
} else {
@@ -520,7 +519,7 @@ bool user_in_list(struct smbd_server_connection *sconn,
/*
* Search netgroup list followed by UNIX list.
*/
- if(user_in_netgroup(sconn, user, *list +2))
+ if(user_in_netgroup(user, *list +2))
return True;
if(user_in_group(user, *list +2))
return True;
@@ -528,7 +527,7 @@ bool user_in_list(struct smbd_server_connection *sconn,
/*
* Just search netgroup list.
*/
- if(user_in_netgroup(sconn, user, *list +1))
+ if(user_in_netgroup(user, *list +1))
return True;
}
}
diff --git a/source3/smbd/share_access.c b/source3/smbd/share_access.c
index 9800e4f01a..d41b05d1d8 100644
--- a/source3/smbd/share_access.c
+++ b/source3/smbd/share_access.c
@@ -131,7 +131,7 @@ static bool token_contains_name(TALLOC_CTX *mem_ctx,
}
if (*prefix == '&') {
if (username) {
- if (user_in_netgroup(sconn, username, name)) {
+ if (user_in_netgroup(username, name)) {
return True;
}
}