[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  db1d034 client: add missing newlines to error messages for invalid iosize parameter.
       via  cc82c16 ntdbtool.8.xml: Bump version up to 4.1.
       via  178023a ntdbrestore.8.xml: Bump version up to 4.1.
       via  20d22f0 ntdbdump.8.xml: Bump version up to 4.1.
       via  9bef5aa ntdbbackup.8.xml: Bump version up to 4.1.
       via  8d021b3 ntdb.3.xml: Bump version up to 4.1.
       via  122609a smbtree: use the correct count variable from NetShareEnum result.
      from  8d0392f Add documentation for the new internal command timeout to smbclient.

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


- Log -----------------------------------------------------------------
commit db1d0349c4d898141a39f515c690e21409448d56
Author: Michael Adam <obnox at samba.org>
Date:   Wed Aug 21 16:12:30 2013 +0200

    client: add missing newlines to error messages for invalid iosize parameter.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Aug 21 21:49:45 CEST 2013 on sn-devel-104

commit cc82c161bf09226696fdfb428f6ba93caa751de5
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Aug 21 10:12:45 2013 +0200

    ntdbtool.8.xml: Bump version up to 4.1.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 178023ad726d4328b1fd7efc52c05a165d5b1a08
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Aug 21 10:12:10 2013 +0200

    ntdbrestore.8.xml: Bump version up to 4.1.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 20d22f0b9ad5fd1b40a298182166a4f0abafa42f
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Aug 21 09:39:45 2013 +0200

    ntdbdump.8.xml: Bump version up to 4.1.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 9bef5aadac7720bfcf4c07872728ef15afafdef3
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Aug 21 09:38:33 2013 +0200

    ntdbbackup.8.xml: Bump version up to 4.1.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 8d021b34b460246dbb3df23798994915cbd8e6e4
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Aug 21 09:38:01 2013 +0200

    ntdb.3.xml: Bump version up to 4.1.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 122609affbde4b7ec0adcbc716440b3b4b4fae31
Author: Michael Adam <obnox at samba.org>
Date:   Wed Aug 21 15:29:44 2013 +0200

    smbtree: use the correct count variable from NetShareEnum result.
    
    Fixes potential segfault, as for rpcclient from bug #10100
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 lib/ntdb/man/ntdb.3.xml        |    2 +-
 lib/ntdb/man/ntdbbackup.8.xml  |    2 +-
 lib/ntdb/man/ntdbdump.8.xml    |    2 +-
 lib/ntdb/man/ntdbrestore.8.xml |    2 +-
 lib/ntdb/man/ntdbtool.8.xml    |    2 +-
 source3/client/client.c        |    4 ++--
 source3/utils/smbtree.c        |    2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/ntdb/man/ntdb.3.xml b/lib/ntdb/man/ntdb.3.xml
index 79f8937..3bac974 100644
--- a/lib/ntdb/man/ntdb.3.xml
+++ b/lib/ntdb/man/ntdb.3.xml
@@ -6,7 +6,7 @@
     <manvolnum>3</manvolnum>
     <refmiscinfo class="source">Samba</refmiscinfo>
     <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-    <refmiscinfo class="version">4.0</refmiscinfo>
+    <refmiscinfo class="version">4.1</refmiscinfo>
   </refmeta>
   <refnamediv>
     <refname>ntdb</refname>
diff --git a/lib/ntdb/man/ntdbbackup.8.xml b/lib/ntdb/man/ntdbbackup.8.xml
index 977c0f7..04ae85f 100644
--- a/lib/ntdb/man/ntdbbackup.8.xml
+++ b/lib/ntdb/man/ntdbbackup.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.0</refmiscinfo>
+	<refmiscinfo class="version">4.1</refmiscinfo>
 </refmeta>
 
 
diff --git a/lib/ntdb/man/ntdbdump.8.xml b/lib/ntdb/man/ntdbdump.8.xml
index ee1711a..45d1be1 100644
--- a/lib/ntdb/man/ntdbdump.8.xml
+++ b/lib/ntdb/man/ntdbdump.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.0</refmiscinfo>
+	<refmiscinfo class="version">4.1</refmiscinfo>
 </refmeta>
 
 
diff --git a/lib/ntdb/man/ntdbrestore.8.xml b/lib/ntdb/man/ntdbrestore.8.xml
index a1f0421..713aaba 100644
--- a/lib/ntdb/man/ntdbrestore.8.xml
+++ b/lib/ntdb/man/ntdbrestore.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.0</refmiscinfo>
+	<refmiscinfo class="version">4.1</refmiscinfo>
 </refmeta>
 
 
diff --git a/lib/ntdb/man/ntdbtool.8.xml b/lib/ntdb/man/ntdbtool.8.xml
index 6a69a05..a23a48e 100644
--- a/lib/ntdb/man/ntdbtool.8.xml
+++ b/lib/ntdb/man/ntdbtool.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.0</refmiscinfo>
+	<refmiscinfo class="version">4.1</refmiscinfo>
 </refmeta>
 
 
diff --git a/source3/client/client.c b/source3/client/client.c
index 581b9c6..bdf6c50 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -4551,11 +4551,11 @@ int cmd_iosize(void)
 		if (smb_encrypt && (iosize < 0 || iosize > 0xFC00)) {
 			d_printf("iosize out of range for encrypted "
 				"connection (min = 0 (default), "
-				"max = 130048 (0x1FC00)");
+				"max = 130048 (0x1FC00)\n");
 			return 1;
 		} else if (!smb_encrypt && (iosize < 0 || iosize > 0xFFFF00)) {
 			d_printf("iosize out of range (min = 0 (default), "
-				"max = 16776960 (0xFFFF00)");
+				"max = 16776960 (0xFFFF00)\n");
 			return 1;
 		}
 	}
diff --git a/source3/utils/smbtree.c b/source3/utils/smbtree.c
index 5c07b12..76ee648 100644
--- a/source3/utils/smbtree.c
+++ b/source3/utils/smbtree.c
@@ -209,7 +209,7 @@ static bool get_rpc_shares(struct cli_state *cli,
 		return False;
 	}
 
-	for (i=0; i<total_entries; i++) {
+	for (i=0; i < info_ctr.ctr.ctr1->count; i++) {
 		struct srvsvc_NetShareInfo1 info = info_ctr.ctr.ctr1->array[i];
 		fn(info.name, info.type, info.comment, state);
 	}


-- 
Samba Shared Repository