[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4090-g50af6d6

[Kai Blin]

The branch, v3-devel has been updated
       via  50af6d609dcbbdadb9af44ede980d9c85ac834e3 (commit)
      from  84ed752d9f17b2279bd60f534ce7c02b267a40b2 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel


- Log -----------------------------------------------------------------
commit 50af6d609dcbbdadb9af44ede980d9c85ac834e3
Author: Kai Blin <kai at samba.org>
Date:   Wed Sep 10 12:05:18 2008 +0200

    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.

-----------------------------------------------------------------------

Summary of changes:
 source/utils/net.h     |    1 -
 source/utils/net_rpc.c |    4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/utils/net.h b/source/utils/net.h
index e7f9ce0..5dc2b11 100644
--- a/source/utils/net.h
+++ b/source/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/source/utils/net_rpc.c b/source/utils/net_rpc.c
index 9047290..7ebd749 100644
--- a/source/utils/net_rpc.c
+++ b/source/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);


-- 
Samba Shared Repository