svn commit: samba r5953 - in branches/SAMBA_3_0/source: include lib libsmb sam

[jerry at samba.org]

Author: jerry
Date: 2005-03-22 15:39:24 +0000 (Tue, 22 Mar 2005)
New Revision: 5953

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5953

Log:
more compiler cleanups; moved SID_LIST from smb.h to privileges.c to cleanup the name space
Modified:
   branches/SAMBA_3_0/source/include/smb.h
   branches/SAMBA_3_0/source/lib/privileges.c
   branches/SAMBA_3_0/source/lib/util_str.c
   branches/SAMBA_3_0/source/libsmb/libsmbclient.c
   branches/SAMBA_3_0/source/sam/


Changeset:
Modified: branches/SAMBA_3_0/source/include/smb.h
===================================================================
--- branches/SAMBA_3_0/source/include/smb.h	2005-03-22 15:12:50 UTC (rev 5952)
+++ branches/SAMBA_3_0/source/include/smb.h	2005-03-22 15:39:24 UTC (rev 5953)
@@ -281,10 +281,6 @@
 
 } DOM_SID;
 
-typedef struct sid_list {
-	uint32 count;
-	DOM_SID *list;
-} SID_LIST;
 
 /*
  * The complete list of SIDS belonging to this user.

Modified: branches/SAMBA_3_0/source/lib/privileges.c
===================================================================
--- branches/SAMBA_3_0/source/lib/privileges.c	2005-03-22 15:12:50 UTC (rev 5952)
+++ branches/SAMBA_3_0/source/lib/privileges.c	2005-03-22 15:39:24 UTC (rev 5953)
@@ -95,7 +95,12 @@
 	{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;

Modified: branches/SAMBA_3_0/source/lib/util_str.c
===================================================================
--- branches/SAMBA_3_0/source/lib/util_str.c	2005-03-22 15:12:50 UTC (rev 5952)
+++ branches/SAMBA_3_0/source/lib/util_str.c	2005-03-22 15:39:24 UTC (rev 5953)
@@ -1334,7 +1334,7 @@
 
 	/* for correctness */
 	if (!findstr[0]) {
-		return src;
+		return (char*)src;
 	}
 
 	/* Samba does single character findstr calls a *lot*. */

Modified: branches/SAMBA_3_0/source/libsmb/libsmbclient.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/libsmbclient.c	2005-03-22 15:12:50 UTC (rev 5952)
+++ branches/SAMBA_3_0/source/libsmb/libsmbclient.c	2005-03-22 15:39:24 UTC (rev 5953)
@@ -4368,7 +4368,7 @@
                 /* 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);
                 }


Property changes on: branches/SAMBA_3_0/source/sam
___________________________________________________________________
Name: svn:ignore
   + *.po
*.po32