svn commit: samba r16194 - in branches/SAMBA_3_0_RELEASE: .
packaging/RHEL/setup packaging/RedHat-9 source source/libads
source/nsswitch
jerry at samba.org
jerry at samba.org
Tue Jun 13 15:56:09 GMT 2006
Author: jerry
Date: 2006-06-13 15:56:08 +0000 (Tue, 13 Jun 2006)
New Revision: 16194
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16194
Log:
* Starting release notes for 3.0.23rc3 (later on).
* Pulling changes from SAMBA_3_0 r16193
Modified:
branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
branches/SAMBA_3_0_RELEASE/packaging/RHEL/setup/filter-requires-samba.sh
branches/SAMBA_3_0_RELEASE/packaging/RedHat-9/filter-requires-samba_rh8.sh
branches/SAMBA_3_0_RELEASE/packaging/RedHat-9/filter-requires-samba_rh9.sh
branches/SAMBA_3_0_RELEASE/source/VERSION
branches/SAMBA_3_0_RELEASE/source/libads/ldap.c
branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_ads.c
branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_nss.h
Changeset:
Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
===================================================================
--- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2006-06-13 15:49:22 UTC (rev 16193)
+++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2006-06-13 15:56:08 UTC (rev 16194)
@@ -1,22 +1,50 @@
=================================
Release Notes for Samba 3.0.23rc2
- Jun 9, 2006
+ Jun XX, 2006
=================================
-This is the second release candidate of the 3.0.23 code base and is
+This is the third release candidate of the 3.0.23 code base and is
provided for testing purposes only. While close to the final stable
release, this snapshot is *not* intended for production servers.
Your testing and feedback is greatly appreciated.
+Common issues addressed in 3.0.23rc3 include:
+
+ o
+
+######################################################################
+Changes
+#######
+
+Changes since 3.0.23rc2
+-----------------------
+
+commits
+-------
+
+o Guenther Deschner <gd at samba.org>
+ * Fix memleaks in winbindd ads searches.
+ * Fix timestamp bug in pam_winbindd which forced users to change
+ passwords prematurelty.
+
+
+Release Notes for older release follow:
+
+ --------------------------------------------------
+ =================================
+ Release Notes for Samba 3.0.23rc2
+ Jun 9, 2006
+ =================================
+
Thanks very much to those people who spent time testing the RC1
release and reported their findings. We would like to especially
thank Thomas Bork <tombork at web.de> for his numerous reports.
We believe that RC2 is in much better shape in a large part due
to his efforts.
-We would also like to thank the developers of Klokwork for their
+We would also like to thank the developers of Klocwork for their
analysis of the Samba source tree. This release candidate includes
-multiple fixes based on reports from the Klokwork code analyzer.
+multiple fixes based on reports from the Klocwork code analyzer.
Common issues addressed in 3.0.23rc2 include:
@@ -121,7 +149,7 @@
'add machine script'.
* Correct parsing error in parse_net.c for user's with no group
membership.
- * Fix off by one error in client SPNEGO code and other klokwork
+ * Fix off by one error in client SPNEGO code and other klocwork
bug fixes.
Modified: branches/SAMBA_3_0_RELEASE/packaging/RHEL/setup/filter-requires-samba.sh
===================================================================
--- branches/SAMBA_3_0_RELEASE/packaging/RHEL/setup/filter-requires-samba.sh 2006-06-13 15:49:22 UTC (rev 16193)
+++ branches/SAMBA_3_0_RELEASE/packaging/RHEL/setup/filter-requires-samba.sh 2006-06-13 15:56:08 UTC (rev 16194)
@@ -1,4 +1,4 @@
#!/bin/sh
-/usr/lib/rpm/perl.req $* | grep -E -v '(Net::LDAP|Crypt::SmbHash|CGI)'
+/usr/lib/rpm/perl.req $* | grep -E -v '(Net::LDAP|Crypt::SmbHash|CGI|Unicode::MapUTF8)'
Modified: branches/SAMBA_3_0_RELEASE/packaging/RedHat-9/filter-requires-samba_rh8.sh
===================================================================
--- branches/SAMBA_3_0_RELEASE/packaging/RedHat-9/filter-requires-samba_rh8.sh 2006-06-13 15:49:22 UTC (rev 16193)
+++ branches/SAMBA_3_0_RELEASE/packaging/RedHat-9/filter-requires-samba_rh8.sh 2006-06-13 15:56:08 UTC (rev 16194)
@@ -1,2 +1,3 @@
#!/bin/sh
-/usr/lib/rpm/find-requires $* | egrep -v '(Net::LDAP|CGI)'
+
+/usr/lib/rpm/find-requires $* | grep -E -v '(Net::LDAP|Crypt::SmbHash|CGI|Unicode::MapUTF8)'
Modified: branches/SAMBA_3_0_RELEASE/packaging/RedHat-9/filter-requires-samba_rh9.sh
===================================================================
--- branches/SAMBA_3_0_RELEASE/packaging/RedHat-9/filter-requires-samba_rh9.sh 2006-06-13 15:49:22 UTC (rev 16193)
+++ branches/SAMBA_3_0_RELEASE/packaging/RedHat-9/filter-requires-samba_rh9.sh 2006-06-13 15:56:08 UTC (rev 16194)
@@ -1,4 +1,4 @@
#!/bin/sh
-/usr/lib/rpm/perl.req $* | grep -E -v '(Net::LDAP|Crypt::SmbHash|CGI)'
+/usr/lib/rpm/perl.req $* | grep -E -v '(Net::LDAP|Crypt::SmbHash|CGI|Unicode::MapUTF8)'
Modified: branches/SAMBA_3_0_RELEASE/source/VERSION
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/VERSION 2006-06-13 15:49:22 UTC (rev 16193)
+++ branches/SAMBA_3_0_RELEASE/source/VERSION 2006-06-13 15:56:08 UTC (rev 16194)
@@ -57,7 +57,7 @@
# e.g. SAMBA_VERSION_RC_RELEASE=1 #
# -> "3.0.0rc1" #
########################################################
-SAMBA_VERSION_RC_RELEASE=2
+SAMBA_VERSION_RC_RELEASE=3
########################################################
# To mark SVN snapshots this should be set to 'yes' #
Modified: branches/SAMBA_3_0_RELEASE/source/libads/ldap.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/libads/ldap.c 2006-06-13 15:49:22 UTC (rev 16193)
+++ branches/SAMBA_3_0_RELEASE/source/libads/ldap.c 2006-06-13 15:56:08 UTC (rev 16194)
@@ -1213,9 +1213,10 @@
status = ads_search_dn(ads, &res, base, attrs);
if (!ADS_ERR_OK(status)) {
DEBUG(1,("Failed while searching for: %s\n", base));
+ SAFE_FREE(base);
return NULL;
}
- free(base);
+ SAFE_FREE(base);
if (ads_count_replies(ads, res) != 1) {
return NULL;
@@ -1242,6 +1243,10 @@
free(s);
}
+ ads_memfree(ads, wkn_dn);
+ ldap_value_free(wkn_dn_exp);
+ ldap_value_free(bind_dn_exp);
+
return ret;
}
Modified: branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_ads.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_ads.c 2006-06-13 15:49:22 UTC (rev 16193)
+++ branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_ads.c 2006-06-13 15:56:08 UTC (rev 16194)
@@ -723,7 +723,7 @@
ADS_STATUS rc;
int count;
LDAPMessage *msg = NULL;
- char *user_dn;
+ char *user_dn = NULL;
DOM_SID *sids;
int i;
DOM_SID primary_group;
@@ -791,9 +791,6 @@
count = ads_pull_sids(ads, mem_ctx, msg, "tokenGroups", &sids);
- if (msg)
- ads_msgfree(ads, msg);
-
/* there must always be at least one group in the token,
unless we are talking to a buggy Win2k server */
@@ -811,15 +808,16 @@
&primary_group,
p_num_groups, user_sids);
if (NT_STATUS_IS_OK(status)) {
- return status;
+ goto done;
}
/* lookup what groups this user is a member of by DN search on
* "member" */
- return lookup_usergroups_member(domain, mem_ctx, user_dn,
- &primary_group,
- p_num_groups, user_sids);
+ status = lookup_usergroups_member(domain, mem_ctx, user_dn,
+ &primary_group,
+ p_num_groups, user_sids);
+ goto done;
}
*user_sids = NULL;
@@ -844,6 +842,8 @@
DEBUG(3,("ads lookup_usergroups (tokenGroups) succeeded for sid=%s\n",
sid_to_string(sid_string, sid)));
done:
+ ads_memfree(ads, user_dn);
+ ads_msgfree(ads, msg);
return status;
}
@@ -885,7 +885,10 @@
goto done;
}
- sidstr = sid_binstring(group_sid);
+ if ((sidstr = sid_binstring(group_sid)) == NULL) {
+ status = NT_STATUS_NO_MEMORY;
+ goto done;
+ }
/* search for all members of the group */
if (!(ldap_exp = talloc_asprintf(mem_ctx, "(objectSid=%s)",sidstr))) {
Modified: branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_nss.h
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_nss.h 2006-06-13 15:49:22 UTC (rev 16193)
+++ branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_nss.h 2006-06-13 15:56:08 UTC (rev 16194)
@@ -330,17 +330,17 @@
uint16 min_length_password;
uint16 password_history;
uint32 password_properties;
- uint32 expire;
- uint32 min_passwordage;
+ time_t expire;
+ time_t min_passwordage;
} policy;
uint32 reject_reason;
struct info3_text {
- uint32 logon_time;
- uint32 logoff_time;
- uint32 kickoff_time;
- uint32 pass_last_set_time;
- uint32 pass_can_change_time;
- uint32 pass_must_change_time;
+ time_t logon_time;
+ time_t logoff_time;
+ time_t kickoff_time;
+ time_t pass_last_set_time;
+ time_t pass_can_change_time;
+ time_t pass_must_change_time;
uint16 logon_count;
uint16 bad_pw_count;
uint32 user_rid;
More information about the samba-cvs
mailing list