Fix clang 9 missing-field-initializer warnings

[amitay/samba.git] / source3 / smbd / pysmbd.c

diff --git a/source3/smbd/pysmbd.c b/source3/smbd/pysmbd.c
index 859855399849555c6699fede2f8784109f2e34f1..9f5663e2e43e1ff9e0373a5d58626488346628ab 100644 (file)
--- a/source3/smbd/pysmbd.c
+++ b/source3/smbd/pysmbd.c
@@ -194,12 +194,12 @@ static NTSTATUS init_files_struct(TALLOC_CTX *mem_ctx,
        fsp->vuid = UID_FIELD_INVALID;
        fsp->file_pid = 0;
        fsp->fsp_flags.can_lock = true;
-       fsp->can_read = True;
-       fsp->can_write = True;
+       fsp->fsp_flags.can_read = true;
+       fsp->fsp_flags.can_write = true;
        fsp->print_file = NULL;
-       fsp->modified = False;
+       fsp->fsp_flags.modified = false;
        fsp->sent_oplock_break = NO_BREAK_SENT;
-       fsp->is_directory = S_ISDIR(smb_fname->st.st_ex_mode);
+       fsp->fsp_flags.is_directory = S_ISDIR(smb_fname->st.st_ex_mode);
 
        *_fsp = fsp;
 
@@ -262,6 +262,7 @@ static NTSTATUS get_nt_acl_conn(TALLOC_CTX *mem_ctx,
                                        fname,
                                        NULL,
                                        NULL,
+                                       0,
                                        lp_posix_pathnames() ?
                                                SMB_FILENAME_POSIX_PATH : 0);
 
@@ -270,13 +271,15 @@ static NTSTATUS get_nt_acl_conn(TALLOC_CTX *mem_ctx,
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = SMB_VFS_GET_NT_ACL(conn,
+       status = SMB_VFS_GET_NT_ACL_AT(conn,
+                               conn->cwd_fsp,
                                smb_fname,
                                security_info_wanted,
                                mem_ctx,
                                sd);
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0,("get_nt_acl_conn: get_nt_acl returned %s.\n", nt_errstr(status)));
+               DBG_ERR("get_nt_acl_at returned %s.\n",
+                       nt_errstr(status));
        }
 
        TALLOC_FREE(frame);
@@ -1022,6 +1025,7 @@ static PyObject *py_smbd_mkdir(PyObject *self, PyObject *args, PyObject *kwargs)
                                        fname,
                                        NULL,
                                        NULL,
+                                       0,
                                        lp_posix_pathnames() ?
                                        SMB_FILENAME_POSIX_PATH : 0);
 
@@ -1160,7 +1164,7 @@ static PyMethodDef py_smbd_methods[] = {
                PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_create_file),
                METH_VARARGS|METH_KEYWORDS,
                NULL },
-       { NULL }
+       {0}
 };
 
 void initsmbd(void);