]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
libsmb: Reformat calls to cli_ntcreate()
authorVolker Lendecke <vl@samba.org>
Tue, 26 May 2020 06:07:41 +0000 (08:07 +0200)
committerJeremy Allison <jra@samba.org>
Thu, 28 May 2020 19:11:39 +0000 (19:11 +0000)
The next patch will change one of the arguments

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/libsmb/libsmb_xattr.c

index 059233b4f091c9d7c917d83bf91fb457a30a3bb6..c62ad6173114086d4a5759c72cbb995001c29f77 100644 (file)
@@ -876,10 +876,19 @@ cacl_get(SMBCCTX *context,
                }
 
                 /* ... then obtain any NT attributes which were requested */
-               status = cli_ntcreate(targetcli, targetpath, 0,
-                                     CREATE_ACCESS_READ, 0,
-                                     FILE_SHARE_READ|FILE_SHARE_WRITE,
-                                     FILE_OPEN, 0x0, 0x0, &fnum, NULL);
+               status = cli_ntcreate(
+                       targetcli,              /* cli */
+                       targetpath,             /* fname */
+                       0,                      /* CreatFlags */
+                       CREATE_ACCESS_READ,     /* DesiredAccess */
+                       0,                      /* FileAttributes */
+                       FILE_SHARE_READ|
+                       FILE_SHARE_WRITE,       /* ShareAccess */
+                       FILE_OPEN,              /* CreateDisposition */
+                       0x0,                    /* CreateOptions */
+                       0x0,                    /* SecurityFlags */
+                       &fnum,                  /* pfid */
+                       NULL);                  /* cr */
                if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(5, ("cacl_get failed to open %s: %s\n",
                                  targetpath, nt_errstr(status)));
@@ -1542,9 +1551,19 @@ cacl_set(SMBCCTX *context,
        /* The desired access below is the only one I could find that works
           with NT4, W2KP and Samba */
 
-       status = cli_ntcreate(targetcli, targetpath, 0, CREATE_ACCESS_READ, 0,
-                             FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN,
-                             0x0, 0x0, &fnum, NULL);
+       status = cli_ntcreate(
+               targetcli,              /* cli */
+               targetpath,             /* fname */
+               0,                      /* CreatFlags */
+               CREATE_ACCESS_READ,     /* DesiredAccess */
+               0,                      /* FileAttributes */
+               FILE_SHARE_READ|
+               FILE_SHARE_WRITE,       /* ShareAccess */
+               FILE_OPEN,              /* CreateDisposition */
+               0x0,                    /* CreateOptions */
+               0x0,                    /* SecurityFlags */
+               &fnum,                  /* pfid */
+               NULL);                  /* cr */
        if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(5, ("cacl_set failed to open %s: %s\n",
                           targetpath, nt_errstr(status)));