Jacques Vidrine a0c37ec326 Resolve conflicts after import of Heimdal 0.6.1.

2004-04-03 21:31:10 +00:00

..

generate-requests.c

Import of Heimdal Kerberos from KTH repository circa 2002/02/17.

2002-02-19 15:46:56 +00:00

kauth_options.c

…

kdecode_ticket.c

import of heimdal 0.3f

2001-06-21 02:12:07 +00:00

kdestroy.1

Vendor import of Heimdal 0.6.

2003-10-09 19:36:20 +00:00

kdestroy.c

Vendor import of Heimdal 0.6.

2003-10-09 19:36:20 +00:00

kgetcred.1

Vendor import of Heimdal 0.6.

2003-10-09 19:36:20 +00:00

kgetcred.c

import of heimdal 0.3f

2001-06-21 02:12:07 +00:00

kinit_options.c

…

kinit.1

Vendor import of Heimdal 0.6.

2003-10-09 19:36:20 +00:00

kinit.c

Vendor import of Heimdal 0.6.1.

2004-04-03 21:22:55 +00:00

klist.1

Vendor import of Heimdal 0.6.

2003-10-09 19:36:20 +00:00

klist.c

Vendor import of Heimdal 0.6.1.

2004-04-03 21:22:55 +00:00

kuser_locl.h

Add a missing include, needed to get a prototype for `des_read_pw_string'.

2003-01-21 14:19:06 +00:00

kverify.c

Import of Heimdal Kerberos from KTH repository circa 2002/02/17.

2002-02-19 15:46:56 +00:00

Makefile.am

Vendor import of Heimdal 0.6.

2003-10-09 19:36:20 +00:00

Makefile.in

Vendor import of Heimdal 0.6.1.

2004-04-03 21:22:55 +00:00