From 0d579953042b5c361ead51f57957accb3706e3f0 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Tue, 22 Mar 2005 15:39:24 +0000
Subject: r5953: more compiler cleanups; moved SID_LIST from smb.h to
 privileges.c to cleanup the name space (This used to be commit
 7dfafa712deb115e425c7367296400c54827a217)

---
 source3/lib/privileges.c | 7 ++++++-
 source3/lib/util_str.c   | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'source3/lib')

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*. */
-- 
cgit