SOURCES: heimdal-am_man_fixes.patch, heimdal-dbpaths.patch, heimda...
arekm
arekm at pld-linux.org
Sun Jul 3 19:34:36 CEST 2005
Author: arekm Date: Sun Jul 3 17:34:36 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- up to 0.7
---- Files affected:
SOURCES:
heimdal-am_man_fixes.patch (1.2 -> 1.3) , heimdal-dbpaths.patch (1.3 -> 1.4) , heimdal-gcc4.patch (1.2 -> 1.3) , heimdal-paths.patch (1.8 -> 1.9) , heimdal-system-comm_err.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/heimdal-am_man_fixes.patch
diff -u SOURCES/heimdal-am_man_fixes.patch:1.2 SOURCES/heimdal-am_man_fixes.patch:1.3
--- SOURCES/heimdal-am_man_fixes.patch:1.2 Sat Jul 26 14:04:28 2003
+++ SOURCES/heimdal-am_man_fixes.patch Sun Jul 3 19:34:31 2005
@@ -1,6 +1,7 @@
---- heimdal-0.5.1/cf/Makefile.am.common~ Tue Mar 18 03:51:25 2003
-+++ heimdal-0.5.1/cf/Makefile.am.common Tue Mar 18 03:51:25 2003
-@@ -118,80 +118,7 @@
+diff -urNbB heimdal-0.7.org/cf/Makefile.am.common heimdal-0.7/cf/Makefile.am.common
+--- heimdal-0.7.org/cf/Makefile.am.common 2005-06-16 18:28:31.000000000 +0200
++++ heimdal-0.7/cf/Makefile.am.common 2005-07-03 19:11:48.112415176 +0200
+@@ -126,80 +126,7 @@
.x.c:
@cmp -s $< $@ 2> /dev/null || cp $< $@
@@ -82,60 +83,4 @@
.et.h:
$(COMPILE_ET) $<
---- /dev/null Tue May 5 22:32:27 1998
-+++ heimdal-0.5.1/kuser/kauth.1 Tue Mar 18 04:09:40 2003
-@@ -0,0 +1 @@
-+.so man1/kinit.1
---- heimdal-0.5.1/kuser/Makefile.am~ Tue Mar 18 04:12:04 2003
-+++ heimdal-0.5.1/kuser/Makefile.am Tue Mar 18 04:12:04 2003
-@@ -4,7 +4,7 @@
-
- INCLUDES += $(INCLUDE_krb4)
-
--man_MANS = kinit.1 klist.1 kdestroy.1 kgetcred.1
-+man_MANS = kinit.1 klist.1 kdestroy.1 kgetcred.1 kauth.1
-
- bin_PROGRAMS = kinit klist kdestroy kgetcred
-
---- /dev/null Tue May 5 22:32:27 1998
-+++ heimdal-0.5.1/lib/roken/arg_printusage.3 Tue Mar 18 05:48:41 2003
-@@ -0,0 +1 @@
-+.so man3/getarg.3
---- heimdal-0.5.1/lib/roken/Makefile.am~ Tue Mar 18 05:50:17 2003
-+++ heimdal-0.5.1/lib/roken/Makefile.am Tue Mar 18 05:50:17 2003
-@@ -215,7 +215,7 @@
-
- nodist_include_HEADERS = roken.h
-
--man_MANS = getarg.3
-+man_MANS = getarg.3 arg_printusage.3
-
- SUFFIXES += .hin
- .hin.h:
---- heimdal-0.5.1/lib/kafs/Makefile.am~ Tue Mar 18 05:52:47 2003
-+++ heimdal-0.5.1/lib/kafs/Makefile.am Tue Mar 18 05:52:47 2003
-@@ -81,7 +81,7 @@
-
- EXTRA_DIST = README.dlfcn afsl.exp afslib.exp
-
--man_MANS = kafs.3
-+man_MANS = kafs.3 k_hasafs.3 k_pioctl.3 k_setpag.3 k_unlog.3
-
- # AIX: this almost works with gcc, but somehow it fails to use the
- # correct ld, use ld instead
---- /dev/null Tue May 5 22:32:27 1998
-+++ heimdal-0.5.1/lib/kafs/k_hasafs.3 Tue Mar 18 05:54:44 2003
-@@ -0,0 +1 @@
-+.so man3/kafs.3
---- /dev/null Tue May 5 22:32:27 1998
-+++ heimdal-0.5.1/lib/kafs/k_pioctl.3 Tue Mar 18 05:54:44 2003
-@@ -0,0 +1 @@
-+.so man3/kafs.3
---- /dev/null Tue May 5 22:32:27 1998
-+++ heimdal-0.5.1/lib/kafs/k_setpag.3 Tue Mar 18 05:54:44 2003
-@@ -0,0 +1 @@
-+.so man3/kafs.3
---- /dev/null Tue May 5 22:32:27 1998
-+++ heimdal-0.5.1/lib/kafs/k_unlog.3 Tue Mar 18 05:54:44 2003
-@@ -0,0 +1 @@
-+.so man3/kafs.3
+
================================================================
Index: SOURCES/heimdal-dbpaths.patch
diff -u SOURCES/heimdal-dbpaths.patch:1.3 SOURCES/heimdal-dbpaths.patch:1.4
--- SOURCES/heimdal-dbpaths.patch:1.3 Fri Apr 2 20:39:49 2004
+++ SOURCES/heimdal-dbpaths.patch Sun Jul 3 19:34:31 2005
@@ -1,7 +1,7 @@
-diff -urN heimdal-0.6-orig/configure.in heimdal-0.6/configure.in
---- heimdal-0.6-orig/configure.in 2003-05-12 09:26:39.000000000 -0600
-+++ heimdal-0.6/configure.in 2003-07-26 15:40:58.000000000 -0600
-@@ -17,7 +17,7 @@
+diff -urbB heimdal-0.7/configure.in heimdal-0.7.org/configure.in
+--- heimdal-0.7/configure.in 2005-06-16 18:29:14.000000000 +0200
++++ heimdal-0.7.org/configure.in 2005-07-03 18:58:54.158074120 +0200
+@@ -16,7 +16,7 @@
AC_PREFIX_DEFAULT(/usr/heimdal)
test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
@@ -10,15 +10,16 @@
AC_CANONICAL_HOST
CANONICAL_HOST=$host
---- heimdal-0.6.1/doc/setup.texi.orig 2003-10-21 23:37:56.000000000 +0200
-+++ heimdal-0.6.1/doc/setup.texi 2004-04-02 20:45:31.677952352 +0200
-@@ -102,17 +102,17 @@
+diff -urbB heimdal-0.7/doc/setup.texi heimdal-0.7.org/doc/setup.texi
+--- heimdal-0.7/doc/setup.texi 2005-06-16 18:27:48.000000000 +0200
++++ heimdal-0.7.org/doc/setup.texi 2005-07-03 19:00:43.961381480 +0200
+@@ -105,17 +105,17 @@
@section Creating the database
The database library will look for the database in the directory
- at file{/var/heimdal}, so you should probably create that directory.
+ at file{/var/lib/heimdal}, so you should probably create that directory.
- Make sure the directory have restrictive permissions.
+ Make sure the directory has restrictive permissions.
@example
-# mkdir /var/heimdal
@@ -33,7 +34,7 @@
master key, run @samp{kstash} to create this master key:
@example
-@@ -255,14 +255,14 @@
+@@ -328,14 +328,14 @@
one below to your @file{/etc/inetd.conf}.
@example
@@ -42,15 +43,15 @@
@end example
You might need to add @samp{kerberos-adm} to your @file{/etc/services}
- as 749/tcp.
+ as @samp{749/tcp}.
- Access to the administration server is controlled by an acl-file, (default
-- at file{/var/heimdal/kadmind.acl}.) The lines in the access file, has the
-+ at file{/var/lib/heimdal/kadmind.acl}.) The lines in the access file, has the
+ Access to the administration server is controlled by an ACL file, (default
+- at file{/var/heimdal/kadmind.acl}.) The lines in the access file, have the
++ at file{/var/lib/heimdal/kadmind.acl}.) The lines in the access file, have the
following syntax:
@smallexample
principal [priv1,priv2,...] [glob-pattern]
-@@ -375,7 +375,7 @@
+@@ -498,7 +498,7 @@
@example
slave# ktutil get -p foo/admin hprop/`hostname`
@@ -59,16 +60,16 @@
slave# hpropd
@end example
-@@ -426,7 +426,7 @@
- The program that runs on the master is @code{ipropd-master} and all
- clients run @code{ipropd-slave}.
+@@ -550,7 +550,7 @@
+ The program that runs on the master is @command{ipropd-master} and all
+ clients run @command{ipropd-slave}.
-Create the file @file{/var/heimdal/slaves} on the master containing all
+Create the file @file{/var/lib/heimdal/slaves} on the master containing all
the slaves that the database should be propagated to. Each line contains
the full name of the principal (for example
@samp{iprop/hemligare.foo.se@@FOO.SE}).
-@@ -442,20 +442,20 @@
+@@ -566,20 +566,20 @@
@example
@@ -76,14 +77,14 @@
+master# /usr/sbin/ktutil get iprop/`hostname`
@end example
- The next step is to start the @code{ipropd-master} process on the master
- server. The @code{ipropd-master} listens on the UNIX-socket
+ The next step is to start the @command{ipropd-master} process on the master
+ server. The @command{ipropd-master} listens on the UNIX domain socket
- at file{/var/heimdal/signal} to know when changes have been made to the
+ at file{/var/lib/heimdal/signal} to know when changes have been made to the
database so they can be propagated to the slaves. There is also a
safety feature of testing the version number regularly (every 30
seconds) to see if it has been modified by some means that do not raise
- this signal. Then, start @code{ipropd-slave} on all the slaves:
+ this signal. Then, start @command{ipropd-slave} on all the slaves:
@example
-master# /usr/heimdal/libexec/ipropd-master &
@@ -93,10 +94,10 @@
@end example
@node Salting, Cross realm, Incremental propagation, Setting up a realm
-diff -urN heimdal-0.6-orig/kadmin/kadmind.8 heimdal-0.6/kadmin/kadmind.8
---- heimdal-0.6-orig/kadmin/kadmind.8 2003-04-06 11:47:57.000000000 -0600
-+++ heimdal-0.6/kadmin/kadmind.8 2003-07-26 15:40:58.000000000 -0600
-@@ -88,7 +88,7 @@
+diff -urbB heimdal-0.7/kadmin/kadmind.8 heimdal-0.7.org/kadmin/kadmind.8
+--- heimdal-0.7/kadmin/kadmind.8 2005-06-16 18:27:56.000000000 +0200
++++ heimdal-0.7.org/kadmin/kadmind.8 2005-07-03 18:58:54.160073816 +0200
+@@ -85,7 +85,7 @@
Principals are always allowed to change their own password and list
their own principal. Apart from that, doing any operation requires
permission explicitly added in the ACL file
@@ -105,7 +106,7 @@
The format of this file is:
.Bd -ragged
.Va principal
-@@ -163,7 +163,7 @@
+@@ -155,7 +155,7 @@
.El
.\".Sh ENVIRONMENT
.Sh FILES
@@ -114,10 +115,10 @@
.Sh EXAMPLES
This will cause
.Nm
-diff -urN heimdal-0.6-orig/kdc/kdc.8 heimdal-0.6/kdc/kdc.8
---- heimdal-0.6-orig/kdc/kdc.8 2003-04-06 11:48:40.000000000 -0600
-+++ heimdal-0.6/kdc/kdc.8 2003-07-26 15:40:58.000000000 -0600
-@@ -74,7 +74,7 @@
+diff -urbB heimdal-0.7/kdc/kdc.8 heimdal-0.7.org/kdc/kdc.8
+--- heimdal-0.7/kdc/kdc.8 2005-06-16 18:27:58.000000000 +0200
++++ heimdal-0.7.org/kdc/kdc.8 2005-07-03 18:58:54.161073664 +0200
+@@ -77,7 +77,7 @@
.Fl -config-file= Ns Ar file
.Xc
Specifies the location of the config file, the default is
@@ -126,22 +127,22 @@
This is the only value that can't be specified in the config file.
.It Xo
.Fl p ,
-diff -urN heimdal-0.6-orig/lib/hdb/hdb.h heimdal-0.6/lib/hdb/hdb.h
---- heimdal-0.6-orig/lib/hdb/hdb.h 2000-07-08 10:03:37.000000000 -0600
-+++ heimdal-0.6/lib/hdb/hdb.h 2003-07-26 15:46:53.000000000 -0600
-@@ -78,7 +78,7 @@
- krb5_error_code (*destroy)(krb5_context, struct HDB*);
- }HDB;
+diff -urbB heimdal-0.7/lib/hdb/hdb.h heimdal-0.7.org/lib/hdb/hdb.h
+--- heimdal-0.7/lib/hdb/hdb.h 2005-06-16 18:28:05.000000000 +0200
++++ heimdal-0.7.org/lib/hdb/hdb.h 2005-07-03 18:58:54.161073664 +0200
+@@ -86,7 +86,7 @@
+ krb5_error_code (*create)(krb5_context, HDB **, const char *filename);
+ };
-#define HDB_DB_DIR "/var/heimdal"
+#define HDB_DB_DIR "/var/lib/heimdal"
#define HDB_DEFAULT_DB HDB_DB_DIR "/heimdal"
#define HDB_DB_FORMAT_ENTRY "hdb/db-format"
-diff -urN heimdal-0.6-orig/lib/krb5/krb5.conf.5 heimdal-0.6/lib/krb5/krb5.conf.5
---- heimdal-0.6-orig/lib/krb5/krb5.conf.5 2003-04-16 07:26:13.000000000 -0600
-+++ heimdal-0.6/lib/krb5/krb5.conf.5 2003-07-26 15:40:58.000000000 -0600
-@@ -416,7 +416,7 @@
+diff -urbB heimdal-0.7/lib/krb5/krb5.conf.5 heimdal-0.7.org/lib/krb5/krb5.conf.5
+--- heimdal-0.7/lib/krb5/krb5.conf.5 2005-06-16 18:28:09.000000000 +0200
++++ heimdal-0.7.org/lib/krb5/krb5.conf.5 2005-07-03 18:58:54.162073512 +0200
+@@ -490,7 +490,7 @@
default_domain = foo.se
}
[logging]
@@ -150,10 +151,10 @@
kdc = SYSLOG:INFO
default = SYSLOG:INFO:USER
.Ed
-diff -urN heimdal-0.6-orig/lib/krb5/krb5.conf.cat5 heimdal-0.6/lib/krb5/krb5.conf.cat5
---- heimdal-0.6-orig/lib/krb5/krb5.conf.cat5 2003-05-12 09:28:53.000000000 -0600
-+++ heimdal-0.6/lib/krb5/krb5.conf.cat5 2003-07-26 15:40:58.000000000 -0600
-@@ -423,7 +423,7 @@
+diff -urbB heimdal-0.7/lib/krb5/krb5.conf.cat5 heimdal-0.7.org/lib/krb5/krb5.conf.cat5
+--- heimdal-0.7/lib/krb5/krb5.conf.cat5 2005-06-16 18:33:58.000000000 +0200
++++ heimdal-0.7.org/lib/krb5/krb5.conf.cat5 2005-07-03 18:58:54.163073360 +0200
+@@ -503,7 +503,7 @@
default_domain = foo.se
}
[logging]
================================================================
Index: SOURCES/heimdal-gcc4.patch
diff -u SOURCES/heimdal-gcc4.patch:1.2 SOURCES/heimdal-gcc4.patch:1.3
--- SOURCES/heimdal-gcc4.patch:1.2 Sun Mar 20 00:46:29 2005
+++ SOURCES/heimdal-gcc4.patch Sun Jul 3 19:34:31 2005
@@ -1,50 +1,7 @@
---- heimdal-0.6.3/lib/asn1/gen.c.orig 2005-03-19 22:43:42.241146312 +0000
-+++ heimdal-0.6.3/lib/asn1/gen.c 2005-03-19 22:46:28.356892880 +0000
-@@ -434,8 +434,9 @@
- "#include <stdlib.h>\n"
- "#include <time.h>\n"
- "#include <string.h>\n"
-- "#include <errno.h>\n",
-- orig_filename);
-+ "#include <errno.h>\n\n"
-+ "#include <parse_units.h>\n",
-+ orig_filename);
-
- for (i = imports; i != NULL; i = i->next)
- fprintf (codefile,
-@@ -446,8 +447,7 @@
- headerbase);
- fprintf (codefile,
- "#include <asn1_err.h>\n"
-- "#include <der.h>\n"
-- "#include <parse_units.h>\n\n");
-+ "#include <der.h>\n\n");
- generate_type_header (s);
- generate_type_encode (s);
- generate_type_decode (s);
---- heimdal-0.6.3/lib/krb5/krb5_locl.h~ 2002-09-10 20:10:45.000000000 +0000
-+++ heimdal-0.6.3/lib/krb5/krb5_locl.h 2005-03-19 22:57:54.271617992 +0000
-@@ -115,6 +115,7 @@
-
- #include "crypto-headers.h"
-
-+#include <parse_units.h>
- #include <krb5_asn1.h>
- #include <der.h>
-
---- heimdal-0.6.3/lib/krb5/krb5.h~ 2004-06-21 08:32:00.000000000 +0000
-+++ heimdal-0.6.3/lib/krb5/krb5.h 2005-03-19 23:18:24.890535480 +0000
-@@ -44,6 +44,7 @@
- #include <heim_err.h>
- #include <k524_err.h>
-
-+#include <parse_units.h>
- #include <krb5_asn1.h>
-
- /* name confusion with MIT */
---- heimdal-0.6.3/appl/ftp/ftpd/ls.c~ 2005-03-19 23:39:40.687584848 +0000
-+++ heimdal-0.6.3/appl/ftp/ftpd/ls.c 2005-03-19 23:41:36.309007720 +0000
-@@ -51,7 +51,7 @@
+diff -urbB heimdal-0.7.org/appl/ftp/ftpd/ls.c heimdal-0.7/appl/ftp/ftpd/ls.c
+--- heimdal-0.7.org/appl/ftp/ftpd/ls.c 2005-06-16 18:29:12.000000000 +0200
++++ heimdal-0.7/appl/ftp/ftpd/ls.c 2005-07-03 19:07:20.019171544 +0200
+@@ -50,7 +50,7 @@
#define sec_fprintf2 fprintf
#define sec_fflush fflush
static void list_files(FILE *out, const char **files, int n_files, int flags);
@@ -53,7 +10,7 @@
int
main(int argc, char **argv)
-@@ -59,10 +59,10 @@
+@@ -58,10 +58,10 @@
int i = 1;
int flags;
if(argc > 1 && argv[1][0] == '-') {
@@ -66,7 +23,7 @@
list_files(stdout, (const char **)argv + i, argc - i, flags);
return 0;
-@@ -762,7 +762,7 @@
+@@ -761,7 +761,7 @@
}
static int
@@ -75,7 +32,7 @@
{
#ifdef TEST
int flags = LS_SORT_NAME | LS_IGNORE_DOT | LS_DISP_COLUMN;
-@@ -844,10 +844,10 @@
+@@ -843,10 +843,10 @@
int ret;
if(*file == '-') {
@@ -88,3 +45,48 @@
ret = list_files(out, &file, 1, flags);
sec_fflush(out);
+diff -urbB heimdal-0.7.org/lib/asn1/gen.c heimdal-0.7/lib/asn1/gen.c
+--- heimdal-0.7.org/lib/asn1/gen.c 2005-06-16 18:28:00.000000000 +0200
++++ heimdal-0.7/lib/asn1/gen.c 2005-07-03 19:08:11.015418936 +0200
+@@ -463,7 +463,8 @@
+ "#include <stdlib.h>\n"
+ "#include <time.h>\n"
+ "#include <string.h>\n"
+- "#include <errno.h>\n",
++ "#include <errno.h>\n\n"
++ "#include <parse_units.h>\n",
+ orig_filename);
+
+ for (i = imports; i != NULL; i = i->next)
+@@ -475,8 +476,7 @@
+ headerbase);
+ fprintf (codefile,
+ "#include <asn1_err.h>\n"
+- "#include <der.h>\n"
+- "#include <parse_units.h>\n\n");
++ "#include <der.h>\n\n");
+
+ if (s->stype == Stype && s->type->type == TChoice) {
+ fprintf(codefile,
+diff -urbB heimdal-0.7.org/lib/krb5/krb5.h heimdal-0.7/lib/krb5/krb5.h
+--- heimdal-0.7.org/lib/krb5/krb5.h 2005-06-16 18:28:09.000000000 +0200
++++ heimdal-0.7/lib/krb5/krb5.h 2005-07-03 19:07:20.018171696 +0200
+@@ -44,6 +44,7 @@
+ #include <heim_err.h>
+ #include <k524_err.h>
+
++#include <parse_units.h>
+ #include <krb5_asn1.h>
+
+ /* name confusion with MIT */
+diff -urbB heimdal-0.7.org/lib/krb5/krb5_locl.h heimdal-0.7/lib/krb5/krb5_locl.h
+--- heimdal-0.7.org/lib/krb5/krb5_locl.h 2005-06-16 18:28:09.000000000 +0200
++++ heimdal-0.7/lib/krb5/krb5_locl.h 2005-07-03 19:07:20.017171848 +0200
+@@ -134,6 +134,7 @@
+ #include "crypto-headers.h"
+
+
++#include <parse_units.h>
+ #include <krb5_asn1.h>
+
+ /* XXX glue for pkinit */
================================================================
Index: SOURCES/heimdal-paths.patch
diff -u SOURCES/heimdal-paths.patch:1.8 SOURCES/heimdal-paths.patch:1.9
--- SOURCES/heimdal-paths.patch:1.8 Sat Jul 26 14:04:28 2003
+++ SOURCES/heimdal-paths.patch Sun Jul 3 19:34:31 2005
@@ -1,6 +1,7 @@
---- heimdal-0.6/appl/ftp/ftpd/pathnames.h.orig 2003-03-24 04:33:55.000000000 +0100
-+++ heimdal-0.6/appl/ftp/ftpd/pathnames.h 2003-07-26 03:34:41.000000000 +0200
-@@ -50,12 +50,12 @@
+diff -urN heimdal-0.7.org/appl/ftp/ftpd/pathnames.h heimdal-0.7/appl/ftp/ftpd/pathnames.h
+--- heimdal-0.7.org/appl/ftp/ftpd/pathnames.h 2005-06-16 18:29:12.000000000 +0200
++++ heimdal-0.7/appl/ftp/ftpd/pathnames.h 2005-07-03 18:55:47.464455864 +0200
+@@ -50,14 +50,14 @@
#endif
#ifndef _PATH_FTPUSERS
@@ -15,7 +16,9 @@
+#define _PATH_FTPWELCOME "/etc/ftpd/ftpwelcome"
+#define _PATH_FTPLOGINMESG "/etc/ftpd/motd"
+ #ifndef _PATH_ISSUE
-#define _PATH_ISSUE SYSCONFDIR "/issue"
--#define _PATH_ISSUE_NET SYSCONFDIR "/issue.net"
+#define _PATH_ISSUE "/etc/ftpd/issue"
+ #endif
+-#define _PATH_ISSUE_NET SYSCONFDIR "/issue.net"
+#define _PATH_ISSUE_NET "/etc/ftpd/issue.net"
================================================================
Index: SOURCES/heimdal-system-comm_err.patch
diff -u SOURCES/heimdal-system-comm_err.patch:1.1 SOURCES/heimdal-system-comm_err.patch:1.2
--- SOURCES/heimdal-system-comm_err.patch:1.1 Thu Oct 9 02:52:59 2003
+++ SOURCES/heimdal-system-comm_err.patch Sun Jul 3 19:34:31 2005
@@ -1,5 +1,42 @@
---- heimdal-0.6/lib/kadm5/kadm5_err.et.wiget 2003-10-08 23:45:29.000000000 +0200
-+++ heimdal-0.6/lib/kadm5/kadm5_err.et 2003-10-08 23:47:42.000000000 +0200
+diff -urbB heimdal-0.7.org/lib/hdb/hdb.c heimdal-0.7/lib/hdb/hdb.c
+--- heimdal-0.7.org/lib/hdb/hdb.c 2005-06-16 18:28:04.000000000 +0200
++++ heimdal-0.7/lib/hdb/hdb.c 2005-07-03 19:03:44.222977552 +0200
+@@ -361,7 +361,7 @@
+
+ if(filename == NULL)
+ filename = HDB_DEFAULT_DB;
+- krb5_add_et_list(context, initialize_hdb_error_table_r);
++ krb5_add_et_list(context, initialize_hdb_error_table);
+ h = find_method (filename, &residual);
+ #ifdef HAVE_DLOPEN
+ if (h == NULL)
+diff -urbB heimdal-0.7.org/lib/kadm5/context_s.c heimdal-0.7/lib/kadm5/context_s.c
+--- heimdal-0.7.org/lib/kadm5/context_s.c 2005-06-16 18:28:07.000000000 +0200
++++ heimdal-0.7/lib/kadm5/context_s.c 2005-07-03 19:03:44.222977552 +0200
+@@ -182,7 +182,7 @@
+ memset(*ctx, 0, sizeof(**ctx));
+ set_funcs(*ctx);
+ (*ctx)->context = context;
+- krb5_add_et_list (context, initialize_kadm5_error_table_r);
++ krb5_add_et_list (context, initialize_kadm5_error_table);
+ #define is_set(M) (params && params->mask & KADM5_CONFIG_ ## M)
+ if(is_set(REALM))
+ (*ctx)->config.realm = strdup(params->realm);
+diff -urbB heimdal-0.7.org/lib/kadm5/init_c.c heimdal-0.7/lib/kadm5/init_c.c
+--- heimdal-0.7.org/lib/kadm5/init_c.c 2005-06-16 18:28:07.000000000 +0200
++++ heimdal-0.7/lib/kadm5/init_c.c 2005-07-03 19:03:44.223977400 +0200
+@@ -69,7 +69,7 @@
+ if(*ctx == NULL)
+ return ENOMEM;
+ memset(*ctx, 0, sizeof(**ctx));
+- krb5_add_et_list (context, initialize_kadm5_error_table_r);
++ krb5_add_et_list (context, initialize_kadm5_error_table);
+ set_funcs(*ctx);
+ (*ctx)->context = context;
+ if(params->mask & KADM5_CONFIG_REALM) {
+diff -urbB heimdal-0.7.org/lib/kadm5/kadm5_err.et heimdal-0.7/lib/kadm5/kadm5_err.et
+--- heimdal-0.7.org/lib/kadm5/kadm5_err.et 2005-06-16 18:28:07.000000000 +0200
++++ heimdal-0.7/lib/kadm5/kadm5_err.et 2005-07-03 19:03:44.219978008 +0200
@@ -45,10 +45,10 @@
error_code NEW_STRUCT_VERSION, "API structure version specified by application is unknown to libraries"
error_code BAD_API_VERSION, "Programmer error! Bad API version"
@@ -14,29 +51,10 @@
error_code NO_RENAME_SALT, "The salt type of the specified principal does not support renaming"
error_code BAD_CLIENT_PARAMS, "Invalid configuration parameter for remote KADM5 client"
error_code BAD_SERVER_PARAMS, "Invalid configuration parameter for local KADM5 client."
---- heimdal-0.6/lib/krb5/krb5_err.et.wiget 2003-10-08 23:46:18.000000000 +0200
-+++ heimdal-0.6/lib/krb5/krb5_err.et 2003-10-08 23:47:20.000000000 +0200
-@@ -16,7 +16,7 @@
- error_code S_OLD_MAST_KVNO, "Server's key is encrypted in an old master key"
- error_code C_PRINCIPAL_UNKNOWN, "Client not found in Kerberos database"
- error_code S_PRINCIPAL_UNKNOWN, "Server not found in Kerberos database"
--error_code PRINCIPAL_NOT_UNIQUE,"Principal has multiple entries in Kerberos database"
-+error_code PRINCIPAL_NOT_UNIQUE, "Principal has multiple entries in Kerberos database"
- error_code NULL_KEY, "Client or server has a null key"
- error_code CANNOT_POSTDATE, "Ticket is ineligible for postdating"
- error_code NEVER_VALID, "Requested effective lifetime is negative or too short"
-@@ -83,7 +83,7 @@
- error_code INVALID_CERTIFICATE, "Invalid certificate"
- error_code REVOKED_CERTIFICATE, "Revoked certificate"
- error_code REVOCATION_STATUS_UNKNOWN, "Revocation status unknown"
--error_code REVOCATION_STATUS_UNAVAILABLE,"Revocation status unavailable"
-+error_code REVOCATION_STATUS_UNAVAILABLE, "Revocation status unavailable"
- error_code CLIENT_NAME_MISMATCH, "Client name mismatch"
- error_code KDC_NAME_MISMATCH, "KDC name mismatch"
-
---- heimdal-0.6/lib/krb5/context.c.wiget 2003-10-09 00:54:42.000000000 +0200
-+++ heimdal-0.6/lib/krb5/context.c 2003-10-09 00:57:13.000000000 +0200
-@@ -422,10 +422,10 @@
+diff -urbB heimdal-0.7.org/lib/krb5/context.c heimdal-0.7/lib/krb5/context.c
+--- heimdal-0.7.org/lib/krb5/context.c 2005-06-16 18:28:08.000000000 +0200
++++ heimdal-0.7/lib/krb5/context.c 2005-07-03 19:03:44.221977704 +0200
+@@ -531,10 +531,10 @@
krb5_init_ets(krb5_context context)
{
if(context->et_list == NULL){
@@ -51,36 +69,15 @@
}
}
---- heimdal-0.6/lib/hdb/hdb.c.wig 2003-10-09 01:09:31.000000000 +0200
-+++ heimdal-0.6/lib/hdb/hdb.c 2003-10-09 01:09:54.000000000 +0200
-@@ -232,7 +232,7 @@
-
- if(filename == NULL)
- filename = HDB_DEFAULT_DB;
-- krb5_add_et_list(context, initialize_hdb_error_table_r);
-+ krb5_add_et_list(context, initialize_hdb_error_table);
- h = find_method (filename, &residual);
- if (h == NULL)
- krb5_errx(context, 1, "No database support! (hdb_create)");
---- heimdal-0.6/lib/kadm5/context_s.c.wig2 2003-10-09 01:13:29.000000000 +0200
-+++ heimdal-0.6/lib/kadm5/context_s.c 2003-10-09 01:22:54.000000000 +0200
-@@ -182,7 +182,7 @@
- memset(*ctx, 0, sizeof(**ctx));
- set_funcs(*ctx);
- (*ctx)->context = context;
-- krb5_add_et_list (context, initialize_kadm5_error_table_r);
-+ krb5_add_et_list (context, initialize_kadm5_error_table);
- #define is_set(M) (params && params->mask & KADM5_CONFIG_ ## M)
- if(is_set(REALM))
- (*ctx)->config.realm = strdup(params->realm);
---- heimdal-0.6/lib/kadm5/init_c.c.wig3 2003-04-01 17:06:41.000000000 +0200
-+++ heimdal-0.6/lib/kadm5/init_c.c 2003-10-09 02:21:41.000000000 +0200
-@@ -69,7 +69,7 @@
- if(*ctx == NULL)
- return ENOMEM;
- memset(*ctx, 0, sizeof(**ctx));
-- krb5_add_et_list (context, initialize_kadm5_error_table_r);
-+ krb5_add_et_list (context, initialize_kadm5_error_table);
- set_funcs(*ctx);
- (*ctx)->context = context;
- if(params->mask & KADM5_CONFIG_REALM)
+diff -urbB heimdal-0.7.org/lib/krb5/krb5_err.et heimdal-0.7/lib/krb5/krb5_err.et
+--- heimdal-0.7.org/lib/krb5/krb5_err.et 2005-06-16 18:28:09.000000000 +0200
++++ heimdal-0.7/lib/krb5/krb5_err.et 2005-07-03 19:03:44.220977856 +0200
+@@ -16,7 +16,7 @@
+ error_code S_OLD_MAST_KVNO, "Server's key is encrypted in an old master key"
+ error_code C_PRINCIPAL_UNKNOWN, "Client not found in Kerberos database"
+ error_code S_PRINCIPAL_UNKNOWN, "Server not found in Kerberos database"
+-error_code PRINCIPAL_NOT_UNIQUE,"Principal has multiple entries in Kerberos database"
++error_code PRINCIPAL_NOT_UNIQUE, "Principal has multiple entries in Kerberos database"
+ error_code NULL_KEY, "Client or server has a null key"
+ error_code CANNOT_POSTDATE, "Ticket is ineligible for postdating"
+ error_code NEVER_VALID, "Requested effective lifetime is negative or too short"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/heimdal-am_man_fixes.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/heimdal-dbpaths.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/SOURCES/heimdal-gcc4.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/heimdal-paths.patch?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/SOURCES/heimdal-system-comm_err.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list