[SCM] Samba Shared Repository - branch v4-1-test updated
Karolin Seeger
kseeger at samba.org
Wed Aug 14 04:56:04 MDT 2013
The branch, v4-1-test has been updated
via 2f03250 s3-winbind: Fix a segfault passing NULL to a fstring argument.
from 87c63fd docs: Add man vfs_syncops.8 to waf build.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-1-test
- Log -----------------------------------------------------------------
commit 2f03250931d409a92d7974e32d2386c4eac7643c
Author: Andreas Schneider <asn at samba.org>
Date: Mon Aug 12 20:22:04 2013 +0200
s3-winbind: Fix a segfault passing NULL to a fstring argument.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10082
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Tue Aug 13 13:58:26 CEST 2013 on sn-devel-104
Autobuild-User(v4-1-test): Karolin Seeger <kseeger at samba.org>
Autobuild-Date(v4-1-test): Wed Aug 14 12:55:05 CEST 2013 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/winbindd/winbindd_cm.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 50728a5..48322cb 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -1127,6 +1127,7 @@ static bool dcip_to_name(TALLOC_CTX *mem_ctx,
uint32_t nt_version = NETLOGON_NT_VERSION_1;
NTSTATUS status;
const char *dc_name;
+ fstring nbtname;
ip_list.ss = *pss;
ip_list.port = 0;
@@ -1210,9 +1211,17 @@ static bool dcip_to_name(TALLOC_CTX *mem_ctx,
/* try node status request */
- if (name_status_find(domain->name, 0x1c, 0x20, pss, *name) ) {
+ if (name_status_find(domain->name, 0x1c, 0x20, pss, nbtname) ) {
namecache_store(*name, 0x20, 1, &ip_list);
- return True;
+
+ if (name != NULL) {
+ *name = talloc_strdup(mem_ctx, nbtname);
+ if (*name == NULL) {
+ return false;
+ }
+ }
+
+ return true;
}
return False;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list