i'm getting rather sick of this

**********************************************************
**** PLEASE TEST YOUR CHANGES BEFORE CHECKING THEM IN ****
**********************************************************

Jelmer, your change did not fix the -b option, it just make it not
segfault on debian. It did however add a warning and make it not
compile on some systems. It also gave the io_bufsize the value of a
pointer, not the value the user specified.

(this doesn't apply just to Jelmer, I'm just seeing rather too many
checkins from everyone lately where the code could never have possibly
worked, so was obviously checked in without testing)
(This used to be commit 21931ad7a0584c14fd0278adc74eab9cacf14a3d)

diff --git a/source3/client/client.c b/source3/client/client.c
index 37daaa736d88a958c5dc428f7df3f54661c031c2..bfa587d11a14312a6a44d9c0ecfe139a9808ce31 100644 (file)
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -2747,7 +2747,7 @@ static void remember_query_host(const char *arg,
                { "tar", 'T', POPT_ARG_STRING, NULL, 'T', "Command line tar", "<c|x>IXFqgbNan" },
                { "directory", 'D', POPT_ARG_STRING, NULL, 'D', "Start from directory", "DIR" },
                { "command", 'c', POPT_ARG_STRING, &cmdstr, 'c', "Execute semicolon separated commands" }, 
-               { "send-buffer", 'b', POPT_ARG_INT, NULL, 'b', "Changes the transmit/send buffer", "BYTES" },
+               { "send-buffer", 'b', POPT_ARG_INT, &io_bufsize, 'b', "Changes the transmit/send buffer", "BYTES" },
                { "port", 'p', POPT_ARG_INT, &port, 'p', "Port to connect to", "PORT" },
                POPT_COMMON_SAMBA
                POPT_COMMON_CONNECTION
@@ -2821,9 +2821,6 @@ static void remember_query_host(const char *arg,
                case 'D':
                        fstrcpy(base_directory,poptGetOptArg(pc));
                        break;
-               case 'b':
-                       io_bufsize = MAX(1, poptGetOptArg(pc));
-                       break;
                }
        }