svn commit: lorikeet r750 - in trunk/heimdal: cf kdc lib/asn1
lib/hdb lib/sl tests
lha at samba.org
lha at samba.org
Mon Jun 18 19:57:53 GMT 2007
Author: lha
Date: 2007-06-18 19:57:52 +0000 (Mon, 18 Jun 2007)
New Revision: 750
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=750
Log:
Merged with Heimdal svn revision 21120
Modified:
trunk/heimdal/cf/ChangeLog
trunk/heimdal/cf/Makefile.am.common
trunk/heimdal/cf/valgrind-suppressions
trunk/heimdal/kdc/digest.c
trunk/heimdal/lib/asn1/check-der.c
trunk/heimdal/lib/hdb/ext.c
trunk/heimdal/lib/sl/sl.c
trunk/heimdal/tests/ChangeLog
Changeset:
Modified: trunk/heimdal/cf/ChangeLog
===================================================================
--- trunk/heimdal/cf/ChangeLog 2007-06-18 16:24:35 UTC (rev 749)
+++ trunk/heimdal/cf/ChangeLog 2007-06-18 19:57:52 UTC (rev 750)
@@ -1,5 +1,7 @@
2007-06-18 Love Hörnquist Åstrand <lha at it.su.se>
+ * Makefile.am.common (makedir-in-tree): depend on INFO_DEPS.
+
* valgrind-suppressions: Unknown suppression in runtime link
editor
Modified: trunk/heimdal/cf/Makefile.am.common
===================================================================
--- trunk/heimdal/cf/Makefile.am.common 2007-06-18 16:24:35 UTC (rev 749)
+++ trunk/heimdal/cf/Makefile.am.common 2007-06-18 19:57:52 UTC (rev 750)
@@ -1,4 +1,4 @@
-# $Id: Makefile.am.common 21025 2007-06-09 02:56:22Z lha $
+# $Id: Makefile.am.common 21116 2007-06-18 16:46:01Z lha $
SUFFIXES = .et .h
@@ -239,14 +239,14 @@
#
check-valgrind:
- env TESTS_ENVIRONMENT="$(top_builddir)/libtool --mode execute valgrind --leak-check=full --quiet --run-libc-freeres=no --suppressions=$(top_srcdir)/cf/valgrind-suppressions" make check
+ env TESTS_ENVIRONMENT="$(top_builddir)/libtool --mode execute valgrind --leak-check=full --quiet --suppressions=$(top_srcdir)/cf/valgrind-suppressions" make check
#
# Target to please samba build farm, builds distfiles in-tree.
# Will break when automake changes...
#
-distdir-in-tree: $(DISTFILES)
+distdir-in-tree: $(DISTFILES) $(INFO_DEPS)
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" != .; then \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) distdir-in-tree) ; \
Modified: trunk/heimdal/cf/valgrind-suppressions
===================================================================
--- trunk/heimdal/cf/valgrind-suppressions 2007-06-18 16:24:35 UTC (rev 749)
+++ trunk/heimdal/cf/valgrind-suppressions 2007-06-18 19:57:52 UTC (rev 750)
@@ -1,4 +1,4 @@
-# $Id: valgrind-suppressions 21107 2007-06-18 10:27:15Z lha $
+# $Id: valgrind-suppressions 21115 2007-06-18 13:29:19Z lha $
{
linux db init brokenness
Memcheck:Param
@@ -65,22 +65,6 @@
obj:/lib/ld-2.3.6.so
obj:/lib/ld-2.3.6.so
obj:/lib/ld-2.3.6.so
- obj:/lib/tls/libc-2.3.6.so
- obj:/lib/ld-2.3.6.so
- fun:_dl_open
- obj:/lib/tls/libc-2.3.6.so
- obj:/lib/ld-2.3.6.so
- fun:__libc_dlopen_mode
- fun:__nss_lookup_function
- obj:/lib/tls/libnss_compat-2.3.6.so
- fun:_nss_compat_getpwuid_r
- fun:getpwuid_r
- fun:getpwuid
- obj:/bin/ls
- obj:/bin/ls
- obj:/bin/ls
- obj:/bin/ls
- fun:__libc_start_main
}
{
Unknown suppression in runtime link editor
@@ -91,3 +75,12 @@
obj:/lib/ld-2.5.so
obj:/lib/ld-2.5.so
}
+{
+ Unknown suppression in runtime link editor
+ Memcheck:Addr4
+ obj:/lib/ld-2.5.so
+ obj:/lib/ld-2.5.so
+ obj:/lib/ld-2.5.so
+ obj:/lib/ld-2.5.so
+ obj:/lib/ld-2.5.so
+}
Modified: trunk/heimdal/kdc/digest.c
===================================================================
--- trunk/heimdal/kdc/digest.c 2007-06-18 16:24:35 UTC (rev 749)
+++ trunk/heimdal/kdc/digest.c 2007-06-18 19:57:52 UTC (rev 750)
@@ -34,7 +34,7 @@
#include "kdc_locl.h"
#include <hex.h>
-RCSID("$Id: digest.c 20877 2007-06-04 04:07:26Z lha $");
+RCSID("$Id: digest.c 21114 2007-06-18 13:17:23Z lha $");
#define MS_CHAP_V2 0x20
#define CHAP_MD5 0x10
@@ -861,15 +861,15 @@
r.element = choice_DigestRepInner_response;
ret = strcasecmp(mdx, ireq.u.digestRequest.responseData);
- free(mdx);
if (ret == 0) {
r.u.response.success = TRUE;
} else {
kdc_log(context, config, 0,
- "MS-CHAP-V2 reply mismatch for %s",
+ "MS-CHAP-V2 hash mismatch for %s",
ireq.u.digestRequest.username);
r.u.response.success = FALSE;
}
+ free(mdx);
if (r.u.response.success) {
unsigned char hashhash[MD4_DIGEST_LENGTH];
Modified: trunk/heimdal/lib/asn1/check-der.c
===================================================================
--- trunk/heimdal/lib/asn1/check-der.c 2007-06-18 16:24:35 UTC (rev 749)
+++ trunk/heimdal/lib/asn1/check-der.c 2007-06-18 19:57:52 UTC (rev 750)
@@ -41,7 +41,7 @@
#include "check-common.h"
-RCSID("$Id: check-der.c 21022 2007-06-08 17:02:42Z lha $");
+RCSID("$Id: check-der.c 21120 2007-06-18 19:48:02Z lha $");
static int
cmp_integer (void *a, void *b)
@@ -883,7 +883,7 @@
}
/* same */
{
- uint32_t data;
+ uint32_t data = (uint32_t)'a';
heim_universal_string us1 = { 1, NULL } , us2 = { 1, NULL };
us1.data = &data;
us2.data = &data;
Modified: trunk/heimdal/lib/hdb/ext.c
===================================================================
--- trunk/heimdal/lib/hdb/ext.c 2007-06-18 16:24:35 UTC (rev 749)
+++ trunk/heimdal/lib/hdb/ext.c 2007-06-18 19:57:52 UTC (rev 750)
@@ -34,7 +34,7 @@
#include "hdb_locl.h"
#include <der.h>
-RCSID("$Id: ext.c 20236 2007-02-16 23:52:29Z lha $");
+RCSID("$Id: ext.c 21113 2007-06-18 12:59:32Z lha $");
krb5_error_code
hdb_entry_check_mandatory(krb5_context context, const hdb_entry *ent)
@@ -268,6 +268,7 @@
const hdb_entry *entry, char **p)
{
HDB_extension *ext;
+ char *str;
int ret;
ext = hdb_find_extension(entry, choice_HDB_extension_data_password);
@@ -314,7 +315,14 @@
}
return 0;
}
- krb5_set_error_string(context, "password attribute not found");
+
+ ret = krb5_unparse_name(context, entry->principal, &str);
+ if (ret == 0) {
+ krb5_set_error_string(context, "no password attributefor %s", str);
+ free(str);
+ } else
+ krb5_clear_error_string(context);
+
return ENOENT;
}
Modified: trunk/heimdal/lib/sl/sl.c
===================================================================
--- trunk/heimdal/lib/sl/sl.c 2007-06-18 16:24:35 UTC (rev 749)
+++ trunk/heimdal/lib/sl/sl.c 2007-06-18 19:57:52 UTC (rev 750)
@@ -33,7 +33,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
-RCSID("$Id: sl.c 19557 2006-12-28 23:41:17Z lha $");
+RCSID("$Id: sl.c 21119 2007-06-18 19:45:53Z lha $");
#endif
#include "sl_locl.h"
@@ -242,12 +242,12 @@
;
} else if (*p == '"') {
quote = !quote;
- strcpy(&p[0], &p[1]);
+ memmove(&p[0], &p[1], strlen(p[1]);
continue;
} else if (*p == '\\') {
if (p[1] == '\0')
goto failed;
- strcpy(&p[0], &p[1]);
+ memmove(&p[0], &p[1], strlen(p[1]);
p += 2;
continue;
} else if (quote || !isspace((unsigned char)*p)) {
Modified: trunk/heimdal/tests/ChangeLog
===================================================================
--- trunk/heimdal/tests/ChangeLog 2007-06-18 16:24:35 UTC (rev 749)
+++ trunk/heimdal/tests/ChangeLog 2007-06-18 19:57:52 UTC (rev 750)
@@ -1,3 +1,7 @@
+2007-06-18 Love Hörnquist Åstrand <lha at it.su.se>
+
+ * can/test_can.in: spoon feed kadmin diffrently
+
2007-06-11 Love Hörnquist Åstrand <lha at it.su.se>
* kdc/check-kdc.in: Also test rename user to anther realm.
More information about the samba-cvs
mailing list