From: Gerald Carter <jerry@samba.org>
Date: Tue, 22 Mar 2005 15:39:24 +0000 (+0000)
Subject: r5953: more compiler cleanups; moved SID_LIST from smb.h to privileges.c to cleanup... 
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~5075
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7dfafa712deb115e425c7367296400c54827a217;p=thirdparty%2Fsamba.git

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

diff --git a/source/include/smb.h b/source/include/smb.h
index 91ec52df237..5b557b59269 100644
--- 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 8b5348e1f25..b60832c8d8b 100644
--- 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 f99c2d1fb32..03e93068057 100644
--- 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 3761074e04f..44f77117de9 100644
--- 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);
                 }