svn commit: samba r2258 - in branches/SAMBA_3_0/source/lib: .
vlendec at samba.org
vlendec at samba.org
Wed Sep 8 18:30:00 GMT 2004
Author: vlendec
Date: 2004-09-08 18:30:00 +0000 (Wed, 08 Sep 2004)
New Revision: 2258
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_3_0/source/lib&rev=2258&nolog=1
Log:
Attempt to fix Bug 1715. Not sure if all of ldapsam_compat works now, but this
definitely fixes two segfaults.
Volker
Modified:
branches/SAMBA_3_0/source/lib/smbldap.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/smbldap.c
===================================================================
--- branches/SAMBA_3_0/source/lib/smbldap.c 2004-09-08 13:44:45 UTC (rev 2257)
+++ branches/SAMBA_3_0/source/lib/smbldap.c 2004-09-08 18:30:00 UTC (rev 2258)
@@ -66,6 +66,7 @@
{ LDAP_ATTR_DOMAIN, "domain" },
{ LDAP_ATTR_OBJCLASS, "objectClass" },
{ LDAP_ATTR_ACB_INFO, "acctFlags" },
+ { LDAP_ATTR_MOD_TIMESTAMP, "modifyTimestamp" },
{ LDAP_ATTR_LIST_END, NULL }
};
@@ -428,6 +429,12 @@
char oldval[2048]; /* current largest allowed value is mungeddial */
BOOL existed;
+ if (attribute == NULL) {
+ /* This can actually happen for ldapsam_compat where we for
+ * example don't have a password history */
+ return;
+ }
+
if (existing != NULL) {
existed = smbldap_get_single_attribute(ldap_struct, existing, attribute, oldval, sizeof(oldval));
} else {
More information about the samba-cvs
mailing list