[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  6659a0f... s3-net: fix crash in rap_share_add().
       via  d3bd9de... s4-smbtorture: remove unused variable from smbcli_rap_netprintdestgetinfo().
       via  e90c874... rap: add IDL for rap_NetShareAdd (undocumented in MS-RAP).
      from  10469d6... s3-build: don't rebuild/link on every make run

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6659a0fe92ce67ff5edab1618d8809e745ab6354
Author: Günther Deschner <gd at samba.org>
Date:   Wed May 5 17:17:12 2010 +0200

    s3-net: fix crash in rap_share_add().
    
    Guenther

commit d3bd9de0878f532f1ed3448d1632605264229f82
Author: Günther Deschner <gd at samba.org>
Date:   Wed May 5 16:58:46 2010 +0200

    s4-smbtorture: remove unused variable from smbcli_rap_netprintdestgetinfo().
    
    Guenther

commit e90c874b256e9a0b3f2ae7063b499622dd49f721
Author: Günther Deschner <gd at samba.org>
Date:   Wed May 5 16:56:52 2010 +0200

    rap: add IDL for rap_NetShareAdd (undocumented in MS-RAP).
    
    Guenther

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

Summary of changes:
 librpc/idl/rap.idl        |    9 +++++++++
 source3/utils/net_rap.c   |    2 +-
 source4/torture/rap/rap.c |    1 -
 3 files changed, 10 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/idl/rap.idl b/librpc/idl/rap.idl
index 5920496..604ed64 100644
--- a/librpc/idl/rap.idl
+++ b/librpc/idl/rap.idl
@@ -352,6 +352,15 @@ interface rap
 		[out,switch_is(level)] rap_share_info *info
 	);
 
+	/* not documented in MS-RAP */
+	[public] void rap_NetShareAdd(
+		[in] uint16 level,
+		[in] uint16 bufsize,
+		[in,switch_is(level)] rap_share_info info,
+		[out] rap_status status,
+		[out] uint16 convert
+	);
+
 	typedef struct {
 		uint8 name[16];
 	} rap_server_info_0;
diff --git a/source3/utils/net_rap.c b/source3/utils/net_rap.c
index 6050437..8d5a3db 100644
--- a/source3/utils/net_rap.c
+++ b/source3/utils/net_rap.c
@@ -249,7 +249,7 @@ static int rap_share_add(struct net_context *c, int argc, const char **argv)
 	strlcpy((char *)sinfo.share_name, sharename, sizeof(sinfo.share_name));
 	sinfo.reserved1 = '\0';
 	sinfo.share_type = 0;
-	sinfo.comment = smb_xstrdup(c->opt_comment);
+	sinfo.comment = c->opt_comment ? smb_xstrdup(c->opt_comment) : "";
 	sinfo.perms = 0;
 	sinfo.maximum_users = c->opt_maxusers;
 	sinfo.active_users = 0;
diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 3e93b08..39a4432 100644
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -1520,7 +1520,6 @@ NTSTATUS smbcli_rap_netprintdestgetinfo(struct smbcli_tree *tree,
 {
 	struct rap_call *call;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-	int i;
 
 	if (!(call = new_rap_cli_call(mem_ctx, iconv_convenience, RAP_WPrintDestGetInfo))) {
 		return NT_STATUS_NO_MEMORY;


-- 
Samba Shared Repository