svn commit: samba r16297 - in trunk/source/utils: .

[jra at samba.org]

Author: jra
Date: 2006-06-16 18:49:40 +0000 (Fri, 16 Jun 2006)
New Revision: 16297

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

Log:
On request of jiri sasek - Sun Microsystems - Prague Czech Republic <Jiri.Sasek at Sun.COM>
change priv_op and priv_info to names that don't
conflict with the solaris namespace.
Jeremy.

Modified:
   trunk/source/utils/net_usershare.c


Changeset:
Modified: trunk/source/utils/net_usershare.c
===================================================================
--- trunk/source/utils/net_usershare.c	2006-06-16 18:42:42 UTC (rev 16296)
+++ trunk/source/utils/net_usershare.c	2006-06-16 18:49:40 UTC (rev 16297)
@@ -259,11 +259,11 @@
 	return 0;
 }
 
-enum priv_op { US_LIST_OP, US_INFO_OP};
+enum us_priv_op { US_LIST_OP, US_INFO_OP};
 
-struct priv_info {
+struct us_priv_info {
 	TALLOC_CTX *ctx;
-	enum priv_op op;
+	enum us_priv_op op;
 };
 
 /***************************************************************************
@@ -290,7 +290,7 @@
 {
 	SMB_STRUCT_STAT sbuf;
 	char **lines = NULL;
-	struct priv_info *pi = (struct priv_info *)priv;
+	struct us_priv_info *pi = (struct us_priv_info *)priv;
 	TALLOC_CTX *ctx = pi->ctx;
 	int fd = -1;
 	int numlines = 0;
@@ -422,7 +422,7 @@
 	fstring wcard;
 	BOOL only_ours = True;
 	int ret = -1;
-	struct priv_info pi;
+	struct us_priv_info pi;
 	TALLOC_CTX *ctx;
 
 	fstrcpy(wcard, "*");
@@ -785,7 +785,7 @@
 	fstring wcard;
 	BOOL only_ours = True;
 	int ret = -1;
-	struct priv_info pi;
+	struct us_priv_info pi;
 	TALLOC_CTX *ctx;
 
 	fstrcpy(wcard, "*");