Merge from 2.2.

Jeremy.

diff --git a/source/smbd/oplock.c b/source/smbd/oplock.c
index 9469c05ec66cea2a6a7bd0d2b2ba07c23b4b15c6..7022b76c102e59d7e9d2efc20877114ecdaf0064 100644 (file)
--- a/source/smbd/oplock.c
+++ b/source/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/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
index 9ab904b47dfc8aadf74684cb5ed57b64bfefc06c..fd52c07e86940cad1092930f19062a8ef70d5ec3 100644 (file)
--- a/source/smbd/posix_acls.c
+++ b/source/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;
 }