summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2001-01-23 22:13:41 +0000
committerGerald Carter <jerry@samba.org>2001-01-23 22:13:41 +0000
commit42571a656f458d9a60850d08202b8daebdcb0bc1 (patch)
treebd50b9075e396a768f8f13d31473ebe313af0d57
parenteee29958f5cacc753f3fa324327e0d8b14ac3006 (diff)
downloadsamba-42571a656f458d9a60850d08202b8daebdcb0bc1.tar.gz
samba-42571a656f458d9a60850d08202b8daebdcb0bc1.tar.bz2
samba-42571a656f458d9a60850d08202b8daebdcb0bc1.zip
only add the service name and client machine name to list of users names
for a session when in share mode security --jerry (This used to be commit 22d6c2c163dd578365bff85ef95abfa59fe356ea)
-rw-r--r--source3/smbd/reply.c7
-rw-r--r--source3/smbd/service.c7
2 files changed, 11 insertions, 3 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 624dc59084..dc604cf49b 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -115,7 +115,12 @@ int reply_special(char *inbuf,char *outbuf)
break;
}
- add_session_user(remote_machine);
+ /* only add the client's machine name to the list
+ of possibly valid usernames if we are operating
+ in share mode security */
+ if (lp_security() == SEC_SHARE) {
+ add_session_user(remote_machine);
+ }
reload_services(True);
reopen_logs();
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index a6e66965c3..96f00eef12 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -301,8 +301,11 @@ connection_struct *make_connection(char *service,char *user,char *password, int
/* lowercase the user name */
strlower(user);
- /* add it as a possible user name */
- add_session_user(service);
+ /* add it as a possible user name if we
+ are in share mode security */
+ if (lp_security() == SEC_SHARE) {
+ add_session_user(service);
+ }
/* shall we let them in? */
if (!authorise_login(snum,user,password,pwlen,&guest,&force,vuid)) {