Renamed formal parameter fd to fnum because we're talking about SMB file

handles, not unix ones.
(This used to be commit 974790e45e6774a0e8ca3f8bb73ea941457e0866)

diff --git a/source3/libsmb/clisecdesc.c b/source3/libsmb/clisecdesc.c
index 69c7d5f73fda2cfc1899f21943db9a9d97dc17ae..e0d6ae809f9814b43db753a6068ca455a7134658 100644 (file)
--- a/source3/libsmb/clisecdesc.c
+++ b/source3/libsmb/clisecdesc.c
@@ -19,16 +19,13 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#define NO_SYSLOG
-
 #include "includes.h"
 
-
-
 /****************************************************************************
   query the security descriptor for a open file
-  ****************************************************************************/
-SEC_DESC *cli_query_secdesc(struct cli_state *cli,int fd, TALLOC_CTX *mem_ctx)
+ ****************************************************************************/
+SEC_DESC *cli_query_secdesc(struct cli_state *cli, int fnum, 
+                           TALLOC_CTX *mem_ctx)
 {
        char param[8];
        char *rparam=NULL, *rdata=NULL;
@@ -36,7 +33,7 @@ SEC_DESC *cli_query_secdesc(struct cli_state *cli,int fd, TALLOC_CTX *mem_ctx)
        prs_struct pd;
        SEC_DESC *psd = NULL;
 
-       SIVAL(param, 0, fd);
+       SIVAL(param, 0, fnum);
        SSVAL(param, 4, 0x7);
 
        if (!cli_send_nt_trans(cli, 
@@ -77,8 +74,8 @@ SEC_DESC *cli_query_secdesc(struct cli_state *cli,int fd, TALLOC_CTX *mem_ctx)
 
 /****************************************************************************
   set the security descriptor for a open file
-  ****************************************************************************/
-BOOL cli_set_secdesc(struct cli_state *cli,int fd, SEC_DESC *sd)
+ ****************************************************************************/
+BOOL cli_set_secdesc(struct cli_state *cli, int fnum, SEC_DESC *sd)
 {
        char param[8];
        char *rparam=NULL, *rdata=NULL;
@@ -100,7 +97,7 @@ BOOL cli_set_secdesc(struct cli_state *cli,int fd, SEC_DESC *sd)
                goto cleanup;
        }
 
-       SIVAL(param, 0, fd);
+       SIVAL(param, 0, fnum);
        SSVAL(param, 4, 0x7);
 
        if (!cli_send_nt_trans(cli,