summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2001-07-21 02:23:19 +0000
committerAndrew Bartlett <abartlet@samba.org>2001-07-21 02:23:19 +0000
commit9cbe6e8166b3397add8c124c867e7848963c4b80 (patch)
tree72adebe1607b88ff751b935be136bc2d78763b74 /source3
parentd0e0578c59afd7faf0fe024e4f45963350ed9d4b (diff)
downloadsamba-9cbe6e8166b3397add8c124c867e7848963c4b80.tar.gz
samba-9cbe6e8166b3397add8c124c867e7848963c4b80.tar.bz2
samba-9cbe6e8166b3397add8c124c867e7848963c4b80.zip
This patch fixes up a few issues where we would do lookups in the local system
on username we already know are perfectly valid, and in their final form. In particular we don't want to do a lookup for DOMAIN\nobody, it just does not make sense, nor should we do map_username and the like if the username is as specified in the vuid - we have done it already. Andrew Bartlett (This used to be commit 7cb517329b0fa2dec427a890a985c75cd467a3b0)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/reply.c80
1 files changed, 42 insertions, 38 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 20f5e0fbe2..e32ea3e8e1 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -215,20 +215,21 @@ int reply_tcon(connection_struct *conn,
if (*user == '\0' && (lp_security() != SEC_SHARE) && validated_username(vuid)) {
pstrcpy(user,validated_username(vuid));
+ } else {
+
+ /*
+ * Pass the user through the NT -> unix user mapping
+ * function.
+ */
+
+ (void)map_username(user);
+
+ /*
+ * Do any UNIX username case mangling.
+ */
+ (void)Get_Pwnam( user, True);
}
- /*
- * Pass the user through the NT -> unix user mapping
- * function.
- */
-
- (void)map_username(user);
-
- /*
- * Do any UNIX username case mangling.
- */
- (void)Get_Pwnam( user, True);
-
conn = make_connection(service,user,password,pwlen,dev,vuid,&ecode);
if (!conn) {
@@ -309,20 +310,22 @@ int reply_tcon_and_X(connection_struct *conn, char *inbuf,char *outbuf,int lengt
if (*user == '\0' && (lp_security() != SEC_SHARE) && validated_username(vuid)) {
pstrcpy(user,validated_username(vuid));
+ } else {
+
+ /*
+ * Pass the user through the NT -> unix user mapping
+ * function.
+ */
+
+ (void)map_username(user);
+
+ /*
+ * Do any UNIX username case mangling.
+ */
+ (void)Get_Pwnam(user, True);
+
}
- /*
- * Pass the user through the NT -> unix user mapping
- * function.
- */
-
- (void)map_username(user);
-
- /*
- * Do any UNIX username case mangling.
- */
- (void)Get_Pwnam(user, True);
-
conn = make_connection(service,user,password,passlen,devicename,vuid,&ecode);
if (!conn) {
@@ -892,9 +895,10 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,int
/*
* Always try the "DOMAIN\user" lookup first, as this is the most
* specific case. If this fails then try the simple "user" lookup.
+ * But don't do this for guests, as this is always a local user.
*/
- {
+ if (!guest) {
pstring dom_user;
/* Work out who's who */
@@ -906,20 +910,20 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,int
pstrcpy(user, dom_user);
DEBUG(3,("Using unix username %s\n", dom_user));
}
- }
-
- /*
- * Pass the user through the NT -> unix user mapping
- * function.
- */
-
- (void)map_username(user);
-
- /*
- * Do any UNIX username case mangling.
- */
- smb_getpwnam(user, True);
+ /*
+ * Pass the user through the NT -> unix user mapping
+ * function.
+ */
+
+ (void)map_username(user);
+
+ /*
+ * Do any UNIX username case mangling.
+ */
+ smb_getpwnam(user, True);
+ }
+
add_session_user(user);
/*