summaryrefslogtreecommitdiff
path: root/source3/utils
diff options
context:
space:
mode:
authorKai Blin <kai@samba.org>2008-09-10 12:05:18 +0200
committerKai Blin <kai@samba.org>2008-09-10 12:05:18 +0200
commit5b54781e1c63be1f63b601f74cf8d4cc5eb788d1 (patch)
tree2509eebbdb6ad1fae0a7578d8d5281bcbf1ba24a /source3/utils
parent40b93006c1ea1d6527d669a285a118ce86432d58 (diff)
downloadsamba-5b54781e1c63be1f63b601f74cf8d4cc5eb788d1.tar.gz
samba-5b54781e1c63be1f63b601f74cf8d4cc5eb788d1.tar.bz2
samba-5b54781e1c63be1f63b601f74cf8d4cc5eb788d1.zip
net: share_type is defined in net_rap.c, net_rpc.c needs to use that.
This fixes a crash in net rpc share that Günther Deschner found. (This used to be commit 50af6d609dcbbdadb9af44ede980d9c85ac834e3)
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/net.h1
-rw-r--r--source3/utils/net_rpc.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/source3/utils/net.h b/source3/utils/net.h
index e7f9ce03be..5dc2b11d4e 100644
--- a/source3/utils/net.h
+++ b/source3/utils/net.h
@@ -68,7 +68,6 @@ struct net_context {
bool display_usage;
void *private_data;
- const char *share_type[];
};
#define NET_TRANSPORT_LOCAL 0x01
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 904729073d..7ebd749899 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -26,6 +26,8 @@
static int net_mode_share;
static bool sync_files(struct copy_clistate *cp_clistate, const char *mask);
+extern const char *share_type[];
+
/**
* @file net_rpc.c
*
@@ -2874,7 +2876,7 @@ static void display_share_info_1(struct net_context *c,
if (c->opt_long_list_entries) {
d_printf("%-12s %-8.8s %-50s\n",
r->name,
- c->share_type[r->type & ~(STYPE_TEMPORARY|STYPE_HIDDEN)],
+ share_type[r->type & ~(STYPE_TEMPORARY|STYPE_HIDDEN)],
r->comment);
} else {
d_printf("%s\n", r->name);