Hello community, here is the log from the commit of package xntp checked in at Thu Mar 22 13:29:21 CET 2007. -------- --- xntp/xntp.changes 2007-03-08 10:47:22.000000000 +0100 +++ /mounts/work_src_done/STABLE/xntp/xntp.changes 2007-03-22 12:40:44.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 22 12:40:26 CET 2007 - mskibbe@suse.de + +- ntp patch broken/md5 keys unusable (#253635) + +------------------------------------------------------------------- New: ---- ntp-4.2.4-w32-time-authentification.fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xntp.spec ++++++ --- /var/tmp/diff_new_pack.H30251/_old 2007-03-22 13:28:51.000000000 +0100 +++ /var/tmp/diff_new_pack.H30251/_new 2007-03-22 13:28:51.000000000 +0100 @@ -17,7 +17,7 @@ License: X11/MIT Group: Productivity/Networking/Other Version: 4.2.4 -Release: 3 +Release: 7 Summary: Network Time Protocol daemon (version 4) # main source Source0: ntp-%version.tar.bz2 @@ -53,6 +53,7 @@ Patch16: ntp-offset.diff Patch17: xntp-man-pages.diff Patch18: xntp-strcat-.diff +Patch19: ntp-4.2.4-w32-time-authentification.fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Autoreqprov: on Provides: ntp xntp3 @@ -116,7 +117,7 @@ Autoreqprov: on Provides: ntpdoc Obsoletes: xntpdoc -Summary: Additional Package Documentation. +Summary: Additional Package Documentation for xntp. %description doc The complete set of documentation for building and configuring an NTP @@ -186,6 +187,7 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch19 %patch10 %patch13 -p1 %if %_lib == lib64 @@ -344,6 +346,8 @@ %doc html/* %changelog +* Thu Mar 22 2007 - mskibbe@suse.de +- ntp patch broken/md5 keys unusable (#253635) * Thu Mar 08 2007 - mskibbe@suse.de - ntpq man page is corrupt (#251136) - xntp (server) - Ports for SuSEfirewall added via packages ++++++ ntp-4.2.4-w32-time-authentification.fix.patch ++++++ Index: libntp/authreadkeys.c =================================================================== --- libntp/authreadkeys.c (revision 3367) +++ libntp/authreadkeys.c (working copy) @@ -150,7 +150,7 @@ } else { switch(keytype) { case KEY_TYPE_MD5: - if (!authsetkey(keyno, keytype, + if (!keyfile_authprov_setkey(be, keyno, keytype, (u_char *)token, strlen(token), 0)) msyslog(LOG_ERR, "format/parity error for MD5 key %ld, not used", Index: libntp/authkeys.c =================================================================== --- libntp/authkeys.c (revision 3367) +++ libntp/authkeys.c (working copy) @@ -479,6 +479,19 @@ return (1); } +int +keyfile_authprov_setkey( + struct authkey_be *be, + keyid_t keyno, + int type, + const u_char *key, + const int len, + u_long trust + ) +{ + return internal_authprov_setkey(be, keyno, type, key, len, trust); +} + /* * keyfile_authprov_init - constructor for keyfile provider */ @@ -503,7 +516,7 @@ keyfile_be->be.havekey = internal_authprov_havekey; keyfile_be->be.trust = internal_authprov_trust; keyfile_be->be.istrusted = internal_authprov_istrusted; - keyfile_be->be.setkey = internal_authprov_setkey; + keyfile_be->be.setkey = keyfile_authprov_setkey; keyfile_be->be.refresh = keyfile_authprov_refresh; keyfile_be->be.stats = internal_authprov_stats; keyfile_be->be.reset_stats = internal_authprov_reset_stats; Index: include/ntp_authprov.h =================================================================== --- include/ntp_authprov.h (revision 3367) +++ include/ntp_authprov.h (working copy) @@ -61,6 +61,7 @@ extern struct authkey_be *keyfile_authprov_init P((int, int, const char *[])); extern void keyfile_authprov_delkeys P((struct authkey_be *be)); extern int keyfile_authprov_readkeys P((struct authkey_be *be, const char *file)); +extern int keyfile_authprov_setkey P((struct authkey_be *be, keyid_t keyno, int type, const u_char *key, const int len, u_long trust)); /* * Internal autokey authentication provider ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org