summaryrefslogtreecommitdiff
path: root/source3/utils
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-06-16 18:50:01 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:17:32 -0500
commit0a5b892aeefdddb11bb64a7e221cafbdbae519d8 (patch)
tree5f7806681009c62e9b940506791b3cdaeafb5348 /source3/utils
parent4b6fef6b6a016aa35637f9f7ebfb6e60f0f24643 (diff)
downloadsamba-0a5b892aeefdddb11bb64a7e221cafbdbae519d8.tar.gz
samba-0a5b892aeefdddb11bb64a7e221cafbdbae519d8.tar.bz2
samba-0a5b892aeefdddb11bb64a7e221cafbdbae519d8.zip
r16298: On request of jiri sasek - Sun Microsystems - Prague Czech Republic <Jiri.Sasek@Sun.COM>
change priv_op and priv_info to names that don't conflict with the solaris namespace. Jeremy. (This used to be commit db5b4e3f13bceeb2f078f412bdd4666516eedc5c)
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/net_usershare.c12
1 files changed, 6 insertions, 6 deletions
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, "*");