[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-660-g76f4cc3

Derrell Lipman derrell at samba.org
Mon Feb 9 14:54:46 GMT 2009


The branch, master has been updated
       via  76f4cc3c70524f1f2c1c227fd19082d5ab05da0f (commit)
      from  487f5e7b4768cfe9e511b0ba56f16c411e21f702 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 76f4cc3c70524f1f2c1c227fd19082d5ab05da0f
Author: Derrell Lipman <derrell.lipman at unwireduniverse.com>
Date:   Mon Feb 9 09:53:44 2009 -0500

    eliminate compiler warnings

-----------------------------------------------------------------------

Summary of changes:
 source3/libsmb/libsmb_xattr.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c
index d71a318..4c5a758 100644
--- a/source3/libsmb/libsmb_xattr.c
+++ b/source3/libsmb/libsmb_xattr.c
@@ -1501,7 +1501,7 @@ cacl_set(TALLOC_CTX *ctx,
          struct cli_state *ipc_cli,
          POLICY_HND *pol,
          const char *filename,
-         const char *the_acl,
+         char *the_acl,
          int mode,
          int flags)
 {
@@ -2113,11 +2113,13 @@ SMBC_getxattr_ctx(SMBCCTX *context,
             StrCaseCmp(name, "system.dos_attr.inode") == 0) {
                 
                 /* Yup. */
+                char *filename = (char *) name;
                 ret = cacl_get(context, talloc_tos(), srv,
                                ipc_srv == NULL ? NULL : ipc_srv->cli, 
                                &ipc_srv->pol, path,
-                               CONST_DISCARD(char *, name),
-                               CONST_DISCARD(char *, value), size);
+                               filename,
+                               CONST_DISCARD(char *, value),
+                               size);
                 if (ret < 0 && errno == 0) {
                         errno = SMBC_errno(context, srv->cli);
                 }
@@ -2236,7 +2238,8 @@ SMBC_removexattr_ctx(SMBCCTX *context,
                 /* Yup. */
                 ret = cacl_set(talloc_tos(), srv->cli,
                                ipc_srv->cli, &ipc_srv->pol, path,
-                               name + 19, SMBC_XATTR_MODE_REMOVE, 0);
+                               CONST_DISCARD(char *, name) + 19,
+                               SMBC_XATTR_MODE_REMOVE, 0);
 		TALLOC_FREE(frame);
                 return ret;
         }


-- 
Samba Shared Repository


More information about the samba-cvs mailing list