[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3969-g89a2558

[Kai Blin]

The branch, v3-3-test has been updated
       via  89a2558d7ac2d3f596534e4add98eb0e9302d940 (commit)
      from  58792ba5ca73a9086c7f59505523d1c871f27c81 (commit)

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


- Log -----------------------------------------------------------------
commit 89a2558d7ac2d3f596534e4add98eb0e9302d940
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 6db5bc7..a17c610 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
  *
@@ -2925,7 +2927,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