Commit 49f95e6d authored by Jeremy Allison's avatar Jeremy Allison Committed by Gerald (Jerry) Carter
Browse files

r762: Fix for #1319 when security > share. 

Jeremy.
(This used to be commit 9fe2240d6b68a2f8a495df585d69ae20c9825d77)
parent 8b9a044b

source3/smbd/uid.c

+8 −2
Original line number Diff line number Diff line
@@ -189,20 +189,26 @@ BOOL change_to_user(connection_struct *conn, uint16 vuid) 


	snum = SNUM(conn);



	if ((vuser) && !check_user_ok(conn, vuser, snum)) {

		DEBUG(2,("change_to_user: SMB user %s (unix user %s, vuid %d) not permitted access to share %s.\n",

			vuser->user.smb_name, vuser->user.unix_name, vuid, lp_servicename(snum)));

		return False;

	}



	if (conn->force_user) /* security = share sets this too */ {

		uid = conn->uid;

		gid = conn->gid;

		current_user.groups = conn->groups;

		current_user.ngroups = conn->ngroups;

		token = conn->nt_user_token;

	} else if ((vuser) && check_user_ok(conn, vuser, snum)) {

	} else if (vuser) {

		uid = conn->admin_user ? 0 : vuser->uid;

		gid = vuser->gid;

		current_user.ngroups = vuser->n_groups;

		current_user.groups  = vuser->groups;

		token = vuser->nt_user_token;

	} else {

		DEBUG(2,("change_to_user: Invalid vuid used %d or vuid not permitted access to share.\n",vuid));

		DEBUG(2,("change_to_user: Invalid vuid used %d in accessing share %s.\n",vuid, lp_servicename(snum) ));

		return False;

	}