r5953: more compiler cleanups; moved SID_LIST from smb.h to privileges.c to cleanup...

diff --git a/source/include/smb.h b/source/include/smb.h
index 91ec52df2375b7c7c3c52a1b67a4f1051852187a..5b557b59269d930457066fee4ab542aab96e4c83 100644 (file)
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -281,10 +281,6 @@ typedef struct sid_info
 
 } DOM_SID;
 
-typedef struct sid_list {
-       uint32 count;
-       DOM_SID *list;
-} SID_LIST;
 
 /*
  * The complete list of SIDS belonging to this user.

diff --git a/source/lib/privileges.c b/source/lib/privileges.c
index 8b5348e1f25026eaf69589258b83557865cc39c9..b60832c8d8bfa8122a49b28c9776682e49408bb0 100644 (file)
--- a/source/lib/privileges.c
+++ b/source/lib/privileges.c
@@ -95,7 +95,12 @@ PRIVS privs[] = {
        {SE_END,                        "",                                     ""}
 };
 
-typedef struct priv_sid_list {
+typedef struct {
+       int count;
+       DOM_SID *list;
+} SID_LIST;
+
+typedef struct {
        SE_PRIV privilege;
        SID_LIST sids;
 } PRIV_SID_LIST;

diff --git a/source/lib/util_str.c b/source/lib/util_str.c
index f99c2d1fb320a8150b8c2a0fadd607a45263c7dc..03e930680575afca1000529be2765f7bb6318a4e 100644 (file)
--- a/source/lib/util_str.c
+++ b/source/lib/util_str.c
@@ -1334,7 +1334,7 @@ char *strstr_m(const char *src, const char *findstr)
 
        /* for correctness */
        if (!findstr[0]) {
-               return src;
+               return (char*)src;
        }
 
        /* Samba does single character findstr calls a *lot*. */

diff --git a/source/libsmb/libsmbclient.c b/source/libsmb/libsmbclient.c
index 3761074e04fac2c5f91ff6fa58f265d593063bcc..44f77117de9195b380ae036e92b7ca87481d84ef 100644 (file)
--- a/source/libsmb/libsmbclient.c
+++ b/source/libsmb/libsmbclient.c
@@ -4368,7 +4368,7 @@ int smbc_getxattr_ctx(SMBCCTX *context,
                 /* Yup. */
                 ret = cacl_get(context, ctx, srv,
                                ipc_srv == NULL ? NULL : &ipc_srv->cli, 
-                               &pol, path, name, (const char *) value, size);
+                               &pol, path, name, (char *) value, size);
                 if (ret < 0 && errno == 0) {
                         errno = smbc_errno(context, &srv->cli);
                 }