[SCM] Samba Shared Repository - branch v3-2-stable updated -
release-3-2-0pre2-436-gb493a13
Karolin Seeger
kseeger at samba.org
Mon Apr 7 08:32:26 GMT 2008
The branch, v3-2-stable has been updated
via b493a13c16b7f1c3211f3bb277759683c3f9363d (commit)
via bb8142cfe45c87393d4af65afad4c204d1a4adfd (commit)
from a548e730771b1a9c1b320e2a1739c05dbafc54a2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -----------------------------------------------------------------
commit b493a13c16b7f1c3211f3bb277759683c3f9363d
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 7 10:19:25 2008 +0200
Fix bug 5375
Thanks to Moskvin for testing
(cherry picked from commit d3c31aa36c451f0a19496cd33c0b055b466e6b09)
commit bb8142cfe45c87393d4af65afad4c204d1a4adfd
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 7 10:18:36 2008 +0200
Fix a misleading debug message
(cherry picked from commit 494b32197f0872b115f0cd1a35421d00a89360a6)
-----------------------------------------------------------------------
Summary of changes:
source/lib/util_str.c | 7 ++++---
source/libsmb/cliconnect.c | 5 +++--
2 files changed, 7 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/util_str.c b/source/lib/util_str.c
index cb8a100..6310e24 100644
--- a/source/lib/util_str.c
+++ b/source/lib/util_str.c
@@ -1972,25 +1972,26 @@ int str_list_count( const char **list )
}
/******************************************************************************
- version of standard_sub_basic() for string lists; uses alloc_sub_basic()
+ version of standard_sub_basic() for string lists; uses talloc_sub_basic()
for the work
*****************************************************************************/
bool str_list_sub_basic( char **list, const char *smb_name,
const char *domain_name )
{
+ TALLOC_CTX *ctx = list;
char *s, *tmpstr;
while ( *list ) {
s = *list;
- tmpstr = alloc_sub_basic(smb_name, domain_name, s);
+ tmpstr = talloc_sub_basic(ctx, smb_name, domain_name, s);
if ( !tmpstr ) {
DEBUG(0,("str_list_sub_basic: "
"alloc_sub_basic() return NULL!\n"));
return false;
}
- SAFE_FREE(*list);
+ TALLOC_FREE(*list);
*list = tmpstr;
list++;
diff --git a/source/libsmb/cliconnect.c b/source/libsmb/cliconnect.c
index 912b841..30d6ace 100644
--- a/source/libsmb/cliconnect.c
+++ b/source/libsmb/cliconnect.c
@@ -1087,8 +1087,9 @@ bool cli_send_tconX(struct cli_state *cli,
if ((cli->sec_mode & NEGOTIATE_SECURITY_CHALLENGE_RESPONSE) &&
*pass && passlen != 24) {
if (!lp_client_lanman_auth()) {
- DEBUG(1, ("Server requested LANMAN password (share-level security) but 'client use lanman auth'"
- " is disabled\n"));
+ DEBUG(1, ("Server requested LANMAN password "
+ "(share-level security) but "
+ "'client lanman auth' is disabled\n"));
return False;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list