[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4917-gb657020

[Derrell Lipman]

The branch, v3-3-test has been updated
       via  b657020d0a3d43099e55956d13a7a73324888bcb (commit)
      from  45d75ece3e35b5180e82dc0488b13fbd2a93c41e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit b657020d0a3d43099e55956d13a7a73324888bcb
Author: Derrell Lipman <derrell.lipman at unwireduniverse.com>
Date:   Sun Feb 8 22:07:25 2009 -0500

    eliminate compiler warnings

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

Summary of changes:
 source/libsmb/libsmb_xattr.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libsmb/libsmb_xattr.c b/source/libsmb/libsmb_xattr.c
index 4983018..21a3b01 100644
--- a/source/libsmb/libsmb_xattr.c
+++ b/source/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)
 {
@@ -1531,8 +1531,7 @@ cacl_set(TALLOC_CTX *ctx,
                         the_acl = p + 1;
                 }
                 
-                sd = sec_desc_parse(ctx, ipc_cli, pol, numeric,
-                                    CONST_DISCARD(char *, the_acl));
+                sd = sec_desc_parse(ctx, ipc_cli, pol, numeric, the_acl);
                 
                 if (!sd) {
 			errno = EINVAL;
@@ -2114,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);
                 }
@@ -2237,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