summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2010-05-31 10:45:24 -0400
committerAndreas Schneider <asn@samba.org>2010-05-31 18:21:29 +0200
commit94bf9ce48a0ef8b77f22f3be6244881ca1a41e49 (patch)
tree81c0c21c6b35ab8a381dfbc68e4692aee8a38a75 /source3
parent7747dd82f79bc503efe6a2d3139413afb8dda864 (diff)
downloadsamba-94bf9ce48a0ef8b77f22f3be6244881ca1a41e49.tar.gz
samba-94bf9ce48a0ef8b77f22f3be6244881ca1a41e49.tar.bz2
samba-94bf9ce48a0ef8b77f22f3be6244881ca1a41e49.zip
s3:smbd user_in_list() doesn't need sconn anymore
Signed-off-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/include/proto.h3
-rw-r--r--source3/smbd/map_username.c2
-rw-r--r--source3/smbd/password.c9
3 files changed, 6 insertions, 8 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index d52ce69e72..e28bfd3aae 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5972,8 +5972,7 @@ void add_session_workgroup(struct smbd_server_connection *sconn,
const char *workgroup);
const char *get_session_workgroup(struct smbd_server_connection *sconn);
bool user_in_netgroup(const char *user, const char *ngname);
-bool user_in_list(struct smbd_server_connection *sconn,
- const char *user,const char **list);
+bool user_in_list(const char *user,const char **list);
bool authorise_login(struct smbd_server_connection *sconn,
int snum, fstring user, DATA_BLOB password,
bool *guest);
diff --git a/source3/smbd/map_username.c b/source3/smbd/map_username.c
index dc5d48efaa..4d2a9db307 100644
--- a/source3/smbd/map_username.c
+++ b/source3/smbd/map_username.c
@@ -239,7 +239,7 @@ bool map_username(struct smbd_server_connection *sconn, fstring user)
}
if (strchr_m(dosname,'*') ||
- user_in_list(sconn, user, (const char **)dosuserlist)) {
+ user_in_list(user, (const char **)dosuserlist)) {
DEBUG(3,("Mapped user %s to %s\n",user,unixname));
mapped_user = True;
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 6919e8bb3a..95191af1be 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -459,8 +459,7 @@ bool user_in_netgroup(const char *user, const char *ngname)
and netgroup lists.
****************************************************************************/
-bool user_in_list(struct smbd_server_connection *sconn,
- const char *user,const char **list)
+bool user_in_list(const char *user,const char **list)
{
if (!list || !*list)
return False;
@@ -558,7 +557,7 @@ static bool user_ok(struct smbd_server_connection *sconn,
* around to pass to str_list_sub_basic() */
if ( invalid && str_list_sub_basic(invalid, "", "") ) {
- ret = !user_in_list(sconn, user,
+ ret = !user_in_list(user,
(const char **)invalid);
}
}
@@ -575,7 +574,7 @@ static bool user_ok(struct smbd_server_connection *sconn,
* around to pass to str_list_sub_basic() */
if ( valid && str_list_sub_basic(valid, "", "") ) {
- ret = user_in_list(sconn, user,
+ ret = user_in_list(user,
(const char **)valid);
}
}
@@ -588,7 +587,7 @@ static bool user_ok(struct smbd_server_connection *sconn,
if (user_list &&
str_list_substitute(user_list, "%S",
lp_servicename(snum))) {
- ret = user_in_list(sconn, user,
+ ret = user_in_list(user,
(const char **)user_list);
}
TALLOC_FREE(user_list);