summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2010-05-31 10:47:01 -0400
committerAndreas Schneider <asn@samba.org>2010-05-31 18:21:29 +0200
commit6a25668e55929a8111ac0fc5e34b5a83ae936349 (patch)
treec21725779c2b8d91451faa33bc5729d205147753
parent94bf9ce48a0ef8b77f22f3be6244881ca1a41e49 (diff)
downloadsamba-6a25668e55929a8111ac0fc5e34b5a83ae936349.tar.gz
samba-6a25668e55929a8111ac0fc5e34b5a83ae936349.tar.bz2
samba-6a25668e55929a8111ac0fc5e34b5a83ae936349.zip
s3:smbd user_ok doesn't need sconn anymore
Signed-off-by: Andreas Schneider <asn@samba.org>
-rw-r--r--source3/smbd/password.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 95191af1be..640e634da9 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -540,8 +540,7 @@ bool user_in_list(const char *user,const char **list)
Check if a username is valid.
****************************************************************************/
-static bool user_ok(struct smbd_server_connection *sconn,
- const char *user, int snum)
+static bool user_ok(const char *user, int snum)
{
bool ret;
@@ -611,7 +610,7 @@ static char *validate_group(struct smbd_server_connection *sconn,
setnetgrent(group);
while (getnetgrent(&host, &user, &domain)) {
if (user) {
- if (user_ok(sconn, user, snum) &&
+ if (user_ok(user, snum) &&
password_ok(actx, enc,
get_session_workgroup(sconn),
user,password)) {
@@ -677,7 +676,7 @@ static char *validate_group(struct smbd_server_connection *sconn,
member = member_list;
while (*member) {
- if (user_ok(sconn, member,snum) &&
+ if (user_ok(member,snum) &&
password_ok(actx, enc,
get_session_workgroup(sconn),
member,password)) {
@@ -756,7 +755,7 @@ bool authorise_login(struct smbd_server_connection *sconn,
auser = strtok_r(NULL, LIST_SEP, &saveptr)) {
fstring user2;
fstrcpy(user2,auser);
- if (!user_ok(sconn,user2,snum))
+ if (!user_ok(user2,snum))
continue;
if (password_ok(actx, enc,
@@ -809,7 +808,7 @@ bool authorise_login(struct smbd_server_connection *sconn,
} else {
fstring user2;
fstrcpy(user2,auser);
- if (user_ok(sconn,user2,snum) &&
+ if (user_ok(user2,snum) &&
password_ok(actx, enc,
get_session_workgroup(sconn),
user2,password)) {
@@ -845,7 +844,7 @@ bool authorise_login(struct smbd_server_connection *sconn,
*guest = True;
}
- if (ok && !user_ok(sconn, user, snum)) {
+ if (ok && !user_ok(user, snum)) {
DEBUG(0,("authorise_login: rejected invalid user %s\n",user));
ok = False;
}