From 0a5b892aeefdddb11bb64a7e221cafbdbae519d8 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 16 Jun 2006 18:50:01 +0000 Subject: r16298: On request of jiri sasek - Sun Microsystems - Prague Czech Republic change priv_op and priv_info to names that don't conflict with the solaris namespace. Jeremy. (This used to be commit db5b4e3f13bceeb2f078f412bdd4666516eedc5c) --- source3/utils/net_usershare.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source3/utils/net_usershare.c') diff --git a/source3/utils/net_usershare.c b/source3/utils/net_usershare.c index ca9ca4e6e2..253416c5cb 100644 --- a/source3/utils/net_usershare.c +++ b/source3/utils/net_usershare.c @@ -259,11 +259,11 @@ static int get_share_list(TALLOC_CTX *ctx, const char *wcard, BOOL only_ours) 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 @@ static int info_fn(struct file_list *fl, void *priv) { 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 @@ static int net_usershare_info(int argc, const char **argv) 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 @@ static int net_usershare_list(int argc, const char **argv) fstring wcard; BOOL only_ours = True; int ret = -1; - struct priv_info pi; + struct us_priv_info pi; TALLOC_CTX *ctx; fstrcpy(wcard, "*"); -- cgit