The branch, master has been updated via 8108f0d s3: smbclient: asn1_extract_blob() stops further asn1 processing by setting has_error. via 8ca6fe6 docs:smbdotconf: fix the description of 'machine password timeout' from 0cae227 selftest: Add tests for ntlm-server-1 and --password mode in ntlm_auth
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 8108f0d320013c560339723d8d70ab601350d0c4 Author: Jeremy Allison <j...@samba.org> Date: Wed Jan 6 15:03:47 2016 -0800 s3: smbclient: asn1_extract_blob() stops further asn1 processing by setting has_error. Don't call asn1_has_error() after asn1_extract_blob() has been successful otherwise we get an "Failed to build negTokenInit at offset" message on success. Signed-off-by: Jeremy Allison <j...@samba.org> Reviewed-by: Volker Lendecke <v...@samba.org> Autobuild-User(master): Volker Lendecke <v...@samba.org> Autobuild-Date(master): Thu Jan 7 16:00:02 CET 2016 on sn-devel-144 commit 8ca6fe6d75f296f70a51513063466e48691028d9 Author: Michael Adam <ob...@samba.org> Date: Wed Jan 6 23:38:23 2016 +0100 docs:smbdotconf: fix the description of 'machine password timeout' This parameter also covers 'security = ads'. Signed-off-by: Michael Adam <ob...@samba.org> Reviewed-by: Volker Lendecke <v...@samba.org> ----------------------------------------------------------------------- Summary of changes: docs-xml/smbdotconf/domain/machinepasswordtimeout.xml | 11 +++++++---- source3/libsmb/clispnego.c | 15 ++++++++++----- 2 files changed, 17 insertions(+), 9 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/smbdotconf/domain/machinepasswordtimeout.xml b/docs-xml/smbdotconf/domain/machinepasswordtimeout.xml index e7d8d44..be4e0e9 100644 --- a/docs-xml/smbdotconf/domain/machinepasswordtimeout.xml +++ b/docs-xml/smbdotconf/domain/machinepasswordtimeout.xml @@ -5,16 +5,19 @@ <description> <para> - If a Samba server is a member of a Windows NT Domain (see the <smbconfoption - name="security">domain</smbconfoption> parameter) then periodically a running smbd process will try and change - the MACHINE ACCOUNT PASSWORD stored in the TDB called <filename moreinfo="none">private/secrets.tdb + If a Samba server is a member of a Windows NT or Active Directory Domain (see the <smbconfoption + name="security">domain</smbconfoption> and + <smbconfoption name="security">ads</smbconfoption> parameters), + then periodically a running winbindd process will try and change + the MACHINE ACCOUNT PASSWORD stored in the TDB called <filename moreinfo="none">secrets.tdb </filename>. This parameter specifies how often this password will be changed, in seconds. The default is one week (expressed in seconds), the same as a Windows NT Domain member server. </para> <para> See also <citerefentry><refentrytitle>smbpasswd</refentrytitle> <manvolnum>8</manvolnum></citerefentry>, - and the <smbconfoption name="security">domain</smbconfoption> parameter. + and the <smbconfoption name="security">domain</smbconfoption> + and <smbconfoption name="security">ads</smbconfoption> parameters. </para> </description> diff --git a/source3/libsmb/clispnego.c b/source3/libsmb/clispnego.c index 5cf476b..3300c85 100644 --- a/source3/libsmb/clispnego.c +++ b/source3/libsmb/clispnego.c @@ -83,14 +83,19 @@ DATA_BLOB spnego_gen_negTokenInit(TALLOC_CTX *ctx, goto err; } + asn1_free(data); + data = NULL; + err: - if (asn1_has_error(data)) { - DEBUG(1, ("Failed to build negTokenInit at offset %d\n", - (int)asn1_current_ofs(data))); - } + if (data != NULL) { + if (asn1_has_error(data)) { + DEBUG(1, ("Failed to build negTokenInit at offset %d\n", + (int)asn1_current_ofs(data))); + } - asn1_free(data); + asn1_free(data); + } return ret; } -- Samba Shared Repository