The branch, v3-2-ctdb has been updated
via 60f25aaa650bf998fcf4f7a987700a6b5f633260 (commit)
via 6cf1eaf8bc7408f83719eea9d4dc7672b4e7509a (commit)
from 7f294edf618d0b36374f830085ceb768f2efa67e (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb
- Log -----------------------------------------------------------------
commit 60f25aaa650bf998fcf4f7a987700a6b5f633260
Author: Jeremy Allison <j...@samba.org>
Date: Fri Jun 19 11:00:41 2009 +0200
Bug 6488: acl_group_override() call in posix acls references an
uninitialized variable. (cherry picked from commit
f92195e3a1baaddda47a5d496f9488c8445b41ad)
commit 6cf1eaf8bc7408f83719eea9d4dc7672b4e7509a
Author: Christian Ambach <christian.amb...@de.ibm.com>
Date: Wed Dec 2 20:06:37 2009 +0100
streamline some log levels for invalid servicenames
I don't think we need to log the fact that a user gave a wrong sharename in
Explorer with the highest log level.
The level of this was not very consistent:
service.c: DEBUG(3,("find_service() failed to find service %s\n",
service));
service.c: DEBUG(0,("%s (%s) couldn't find service %s\n",
smb2_tcon.c: DEBUG(1,("smbd_smb2_tree_connect: couldn't find
service %s\n",
This changes the last two to 3 as the first one.
Signed-off-by: Christian Ambach <christian.amb...@de.ibm.com>
-----------------------------------------------------------------------
Summary of changes:
source/smbd/posix_acls.c | 22 ++++++++++------------
source/smbd/service.c | 2 +-
2 files changed, 11 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
index 90c2caf..3e88418 100644
--- a/source/smbd/posix_acls.c
+++ b/source/smbd/posix_acls.c
@@ -2368,24 +2368,22 @@ static bool current_user_in_group(gid_t gid)
****************************************************************************/
static bool acl_group_override(connection_struct *conn,
- gid_t prim_gid,
+ SMB_STRUCT_STAT *psbuf,
const char *fname)
{
- SMB_STRUCT_STAT sbuf;
-
if ((errno != EPERM) && (errno != EACCES)) {
return false;
}
/* file primary group == user primary or supplementary group */
if (lp_acl_group_control(SNUM(conn)) &&
- current_user_in_group(prim_gid)) {
+ current_user_in_group(psbuf->st_gid)) {
return true;
}
/* user has writeable permission */
if (lp_dos_filemode(SNUM(conn)) &&
- can_write_to_file(conn, fname, &sbuf)) {
+ can_write_to_file(conn, fname, psbuf)) {
return true;
}
@@ -2396,7 +2394,7 @@ static bool acl_group_override(connection_struct *conn,
Attempt to apply an ACL to a file or directory.
****************************************************************************/
-static bool set_canon_ace_list(files_struct *fsp, canon_ace *the_ace, bool
default_ace, gid_t prim_gid, bool *pacl_set_support)
+static bool set_canon_ace_list(files_struct *fsp, canon_ace *the_ace, bool
default_ace, SMB_STRUCT_STAT *psbuf, bool *pacl_set_support)
{
connection_struct *conn = fsp->conn;
bool ret = False;
@@ -2575,7 +2573,7 @@ static bool set_canon_ace_list(files_struct *fsp,
canon_ace *the_ace, bool defau
*pacl_set_support = False;
}
- if (acl_group_override(conn, prim_gid, fsp->fsp_name)) {
+ if (acl_group_override(conn, psbuf, fsp->fsp_name)) {
int sret;
DEBUG(5,("set_canon_ace_list: acl group control
on and current user in file %s primary group.\n",
@@ -2606,7 +2604,7 @@ static bool set_canon_ace_list(files_struct *fsp,
canon_ace *the_ace, bool defau
*pacl_set_support = False;
}
- if (acl_group_override(conn, prim_gid, fsp->fsp_name)) {
+ if (acl_group_override(conn, psbuf, fsp->fsp_name)) {
int sret;
DEBUG(5,("set_canon_ace_list: acl group control
on and current user in file %s primary group.\n",
@@ -3562,7 +3560,7 @@ NTSTATUS set_nt_acl(files_struct *fsp, uint32
security_info_sent, SEC_DESC *psd)
if (set_acl_as_root) {
become_root();
}
- ret = set_canon_ace_list(fsp, file_ace_list, False,
sbuf.st_gid, &acl_set_support);
+ ret = set_canon_ace_list(fsp, file_ace_list, False, &sbuf,
&acl_set_support);
if (set_acl_as_root) {
unbecome_root();
}
@@ -3579,7 +3577,7 @@ NTSTATUS set_nt_acl(files_struct *fsp, uint32
security_info_sent, SEC_DESC *psd)
if (set_acl_as_root) {
become_root();
}
- ret = set_canon_ace_list(fsp, dir_ace_list, True,
sbuf.st_gid, &acl_set_support);
+ ret = set_canon_ace_list(fsp, dir_ace_list, True,
&sbuf, &acl_set_support);
if (set_acl_as_root) {
unbecome_root();
}
@@ -3604,7 +3602,7 @@ NTSTATUS set_nt_acl(files_struct *fsp, uint32
security_info_sent, SEC_DESC *psd)
unbecome_root();
}
if (sret == -1) {
- if (acl_group_override(conn, sbuf.st_gid,
fsp->fsp_name)) {
+ if (acl_group_override(conn, &sbuf,
fsp->fsp_name)) {
DEBUG(5,("set_nt_acl: acl group control
on and "
"current user in file %s
primary group. Override delete_def_acl\n",
fsp->fsp_name ));
@@ -3664,7 +3662,7 @@ NTSTATUS set_nt_acl(files_struct *fsp, uint32
security_info_sent, SEC_DESC *psd)
unbecome_root();
}
if(sret == -1) {
- if (acl_group_override(conn, sbuf.st_gid,
fsp->fsp_name)) {
+ if (acl_group_override(conn, &sbuf,
fsp->fsp_name)) {
DEBUG(5,("set_nt_acl: acl group control
on and "
"current user in file %s
primary group. Override chmod\n",
fsp->fsp_name ));
diff --git a/source/smbd/service.c b/source/smbd/service.c
index ac49f25..ffd63ac 100644
--- a/source/smbd/service.c
+++ b/source/smbd/service.c
@@ -1293,7 +1293,7 @@ connection_struct *make_connection(const char
*service_in, DATA_BLOB password,
return NULL;
}
- DEBUG(0,("%s (%s) couldn't find service %s\n",
+ DEBUG(3,("%s (%s) couldn't find service %s\n",
get_remote_machine_name(),
client_addr(get_client_fd(),addr,sizeof(addr)),
service));
--
SAMBA-CTDB repository
