summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-05-20 19:21:06 +0000
committerJeremy Allison <jra@samba.org>2002-05-20 19:21:06 +0000
commit27c194163d4e681ca2288ce34fe2955e09b2fdda (patch)
tree98d34eab65e1ca9779d9883fd209b8f367685c09 /source3
parent34278af77abe570f4046dba16a2cb8aec8ed00d4 (diff)
downloadsamba-27c194163d4e681ca2288ce34fe2955e09b2fdda.tar.gz
samba-27c194163d4e681ca2288ce34fe2955e09b2fdda.tar.bz2
samba-27c194163d4e681ca2288ce34fe2955e09b2fdda.zip
Merge from 2.2.
Jeremy. (This used to be commit 174df5d914b149e52bf260e6502f2436c2720958)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/oplock.c2
-rw-r--r--source3/smbd/posix_acls.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 9469c05ec6..7022b76c10 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -75,7 +75,7 @@ BOOL oplock_message_waiting(fd_set *fds)
BOOL receive_local_message(fd_set *fds, char *buffer, int buffer_len, int timeout)
{
struct sockaddr_in from;
- int fromlen = sizeof(from);
+ socklen_t fromlen = sizeof(from);
int32 msg_len = 0;
smb_read_error = 0;
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 9ab904b47d..fd52c07e86 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -2387,6 +2387,7 @@ BOOL directory_has_default_acl(connection_struct *conn, const char *fname)
if (dir_acl != NULL && (conn->vfs_ops.sys_acl_get_entry(conn, dir_acl, SMB_ACL_FIRST_ENTRY, &entry) == 1))
has_acl = True;
- conn->vfs_ops.sys_acl_free_acl(conn, dir_acl);
+ if (dir_acl)
+ conn->vfs_ops.sys_acl_free_acl(conn, dir_acl);
return has_acl;
}