diff options
| author | Gerald Carter <jerry@samba.org> | 2004-01-15 19:08:45 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2004-01-15 19:08:45 +0000 |
| commit | 341699b0053c18bfaf5b8c1aec63e3e16f965876 (patch) | |
| tree | 776e3fbc0d86780e2b118d5b90a92c8dcef8121a | |
| parent | fbe657a40848d8a5a1a794d752c8115835322e01 (diff) | |
| download | samba-341699b0053c18bfaf5b8c1aec63e3e16f965876.tar.gz samba-341699b0053c18bfaf5b8c1aec63e3e16f965876.tar.bz2 samba-341699b0053c18bfaf5b8c1aec63e3e16f965876.zip | |
* BUG 446
- setup_logging() in smbclient to be interactive (remove the timestamps)
- Fix bad return value in pull_ucs2( needs more testing to make sure this
didn't break something else) that caused clistr_pull() to always read
the same string from the buffer (pull_usc2() could return -1 if the original
source length was given as -1)
- increment some debugging messages to avoid printing them out so often
(This used to be commit f452585073fbeeae3e3a0db644e381f94cb918f3)
| -rw-r--r-- | source3/client/client.c | 3 | ||||
| -rw-r--r-- | source3/lib/charcnv.c | 4 | ||||
| -rw-r--r-- | source3/libsmb/cliconnect.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index 5ee6913374..6c43a974f2 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -2816,7 +2816,8 @@ static void remember_query_host(const char *arg, set_global_myworkgroup( "" ); /* set default debug level to 0 regardless of what smb.conf sets */ - DEBUGLEVEL_CLASS[DBGC_ALL] = 0; + setup_logging( "smbclient", True ); + DEBUGLEVEL_CLASS[DBGC_ALL] = 1; dbf = x_stderr; x_setbuf( x_stderr, NULL ); diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c index 1c6058a43e..5f9392b620 100644 --- a/source3/lib/charcnv.c +++ b/source3/lib/charcnv.c @@ -940,6 +940,10 @@ size_t pull_ucs2(const void *base_ptr, char *dest, const void *src, size_t dest_ src_len &= ~1; ret = convert_string(CH_UCS2, CH_UNIX, src, src_len, dest, dest_len); + + if (src_len == (size_t)-1) + src_len = ret*2; + if (dest_len) dest[MIN(ret, dest_len-1)] = 0; else diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index 707a33881d..84159e5d62 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -673,7 +673,7 @@ ADS_STATUS cli_session_setup_spnego(struct cli_state *cli, const char *user, BOOL got_kerberos_mechanism = False; DATA_BLOB blob; - DEBUG(2,("Doing spnego session setup (blob length=%lu)\n", (unsigned long)cli->secblob.length)); + DEBUG(3,("Doing spnego session setup (blob length=%lu)\n", (unsigned long)cli->secblob.length)); /* the server might not even do spnego */ if (cli->secblob.length <= 16) { |