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

(This used to be commit 7dfafa712deb115e425c7367296400c54827a217)

4 files changed, 8 insertions, 7 deletions

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 91ec52df23..5b557b5926 100644
--- a/source3/include/smb.h
+++ b/source3/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/source3/lib/privileges.c b/source3/lib/privileges.c
index 8b5348e1f2..b60832c8d8 100644
--- a/source3/lib/privileges.c
+++ b/source3/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/source3/lib/util_str.c b/source3/lib/util_str.c
index f99c2d1fb3..03e9306805 100644
--- a/source3/lib/util_str.c
+++ b/source3/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/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c
index 3761074e04..44f77117de 100644
--- a/source3/libsmb/libsmbclient.c
+++ b/source3/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);
                 }