Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce diffs with 0.3e (mostly, complete the merge).

Browse Source
This commit is contained in:
thorpej 2001-04-07 21:29:20 +00:00
parent 9ad709dc65
commit f4872dded4
18 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/dist/heimdal/appl/dceutils/Makefile.am vendored
View File

@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.1.1.2 2001/02/11 13:51:10 assar Exp $
# $Id: Makefile.am,v 1.2 2001/04/07 21:29:21 thorpej Exp $
include $(top_srcdir)/Makefile.am.common

6
crypto/dist/heimdal/appl/dceutils/Makefile.in vendored
View File

@ -113,13 +113,13 @@ dpagaix_CFLAGS = @dpagaix_CFLAGS@
dpagaix_LDADD = @dpagaix_LDADD@
install_sh = @install_sh@
# $Id: Makefile.in,v 1.1.1.2 2001/02/11 13:51:11 assar Exp $
# $Id: Makefile.in,v 1.2 2001/04/07 21:29:21 thorpej Exp $
# $Id: Makefile.in,v 1.1.1.2 2001/02/11 13:51:11 assar Exp $
# $Id: Makefile.in,v 1.2 2001/04/07 21:29:21 thorpej Exp $
# $Id: Makefile.in,v 1.1.1.2 2001/02/11 13:51:11 assar Exp $
# $Id: Makefile.in,v 1.2 2001/04/07 21:29:21 thorpej Exp $
AUTOMAKE_OPTIONS = foreign no-dependencies

4
crypto/dist/heimdal/cf/aix.m4 vendored
View File

@ -1,5 +1,5 @@
dnl
dnl $Id: aix.m4,v 1.1.1.2 2001/02/11 13:51:51 assar Exp $
dnl $Id: aix.m4,v 1.2 2001/04/07 21:29:21 thorpej Exp $
dnl
AC_DEFUN(KRB_AIX,[
@ -36,4 +36,4 @@ fi
AM_CONDITIONAL(HAVE_DLOPEN, test "$ac_cv_funclib_dlopen" != no)dnl
AC_SUBST(AIX_EXTRA_KAFS)dnl
])
])

4
crypto/dist/heimdal/cf/krb-readline.m4 vendored
View File

@ -1,4 +1,4 @@
dnl $Id: krb-readline.m4,v 1.1.1.2 2001/02/11 13:51:51 assar Exp $
dnl $Id: krb-readline.m4,v 1.2 2001/04/07 21:29:22 thorpej Exp $
dnl
dnl Tests for readline functions
dnl
@ -40,4 +40,4 @@ LIB_readline="$LIB_readline \$(LIB_tgetent)"
AC_DEFINE(HAVE_READLINE, 1,
[Define if you have a readline compatible library.])dnl
])
])

4
crypto/dist/heimdal/cf/roken-frag.m4 vendored
View File

@ -1,4 +1,4 @@
dnl $Id: roken-frag.m4,v 1.1.1.2 2001/02/11 13:51:51 assar Exp $
dnl $Id: roken-frag.m4,v 1.2 2001/04/07 21:29:22 thorpej Exp $
dnl
dnl some code to get roken working
dnl
@ -583,4 +583,4 @@ LIB_roken="${LIB_roken} \$(LIB_crypt) \$(LIB_dbopen)"
AC_SUBST(DIR_roken)dnl
AC_SUBST(LIB_roken)dnl
AC_SUBST(INCLUDES_roken)dnl
])
])

4
crypto/dist/heimdal/doc/setup.texi vendored
View File

@ -1,4 +1,4 @@
@c $Id: setup.texi,v 1.2 2001/02/11 17:56:09 assar Exp $
@c $Id: setup.texi,v 1.3 2001/04/07 21:29:22 thorpej Exp $
@node Setting up a realm, Things in search for a better place, Building and Installing, Top
@ -417,7 +417,7 @@ is the same thing as no salt at all).
Common types of salting includes
@itemize @bullet
@itemize
@item @code{v4} (or @code{des:pw-salt:})
The Kerberos 4 salting is using no salt att all. Reson there is colon

2
crypto/dist/heimdal/kadmin/add-random-users.c vendored
View File

@ -33,7 +33,7 @@
#include "kadmin_locl.h"
RCSID("$Id: add-random-users.c,v 1.1.1.2 2001/02/11 13:51:32 assar Exp $");
RCSID("$Id: add-random-users.c,v 1.2 2001/04/07 21:29:23 thorpej Exp $");
#define WORDS_FILENAME "/usr/share/dict/words"

3
crypto/dist/heimdal/kadmin/kadm_conn.c vendored
View File

@ -36,7 +36,7 @@
#include <sys/wait.h>
#endif
RCSID("$Id: kadm_conn.c,v 1.4 2001/02/11 14:13:08 assar Exp $");
RCSID("$Id: kadm_conn.c,v 1.5 2001/04/07 21:29:23 thorpej Exp $");
struct kadm_port {
char *port;
@ -91,6 +91,7 @@ parse_ports(krb5_context context, const char *str)
}
static pid_t pgrp;
sig_atomic_t term_flag, doing_useful_work;
static RETSIGTYPE
sigchld(int sig)

5
crypto/dist/heimdal/kdc/524.c vendored
View File

@ -33,7 +33,7 @@
#include "kdc_locl.h"
RCSID("$Id: 524.c,v 1.3 2001/02/11 14:13:09 assar Exp $");
RCSID("$Id: 524.c,v 1.4 2001/04/07 21:29:23 thorpej Exp $");
#ifdef KRB4
@ -207,8 +207,7 @@ do_524(const Ticket *t, krb5_data *reply,
ret = hdb_enctype2key(context, server, t->enc_part.etype, &skey);
if(ret){
kdc_log(0, "No suitable key found for server (%s) "
"when converting ticket from %s", spn, from);
kdc_log(0, "No suitable key found for server (%s) from %s", spn, from);
goto out;
}
ret = krb5_crypto_init(context, &skey->key, 0, &crypto);

2
crypto/dist/heimdal/kpasswd/kpasswd-generator.c vendored
View File

@ -33,7 +33,7 @@
#include "kpasswd_locl.h"
RCSID("$Id: kpasswd-generator.c,v 1.1.1.2 2001/02/11 13:51:34 assar Exp $");
RCSID("$Id: kpasswd-generator.c,v 1.2 2001/04/07 21:29:23 thorpej Exp $");
static unsigned
read_words (const char *filename, char ***ret_w)

2
crypto/dist/heimdal/kuser/generate-requests.c vendored
View File

@ -33,7 +33,7 @@
#include "kuser_locl.h"
RCSID("$Id: generate-requests.c,v 1.1.1.2 2001/02/11 13:51:34 assar Exp $");
RCSID("$Id: generate-requests.c,v 1.2 2001/04/07 21:29:24 thorpej Exp $");
static krb5_error_code
null_key_proc (krb5_context context,

2
crypto/dist/heimdal/lib/kdfs/Makefile.am vendored
View File

@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.1.1.2 2001/02/11 13:51:43 assar Exp $
# $Id: Makefile.am,v 1.2 2001/04/07 21:29:24 thorpej Exp $
include $(top_srcdir)/Makefile.am.common

6
crypto/dist/heimdal/lib/kdfs/Makefile.in vendored
View File

@ -113,13 +113,13 @@ dpagaix_CFLAGS = @dpagaix_CFLAGS@
dpagaix_LDADD = @dpagaix_LDADD@
install_sh = @install_sh@
# $Id: Makefile.in,v 1.1.1.2 2001/02/11 13:51:43 assar Exp $
# $Id: Makefile.in,v 1.2 2001/04/07 21:29:25 thorpej Exp $
# $Id: Makefile.in,v 1.1.1.2 2001/02/11 13:51:43 assar Exp $
# $Id: Makefile.in,v 1.2 2001/04/07 21:29:25 thorpej Exp $
# $Id: Makefile.in,v 1.1.1.2 2001/02/11 13:51:43 assar Exp $
# $Id: Makefile.in,v 1.2 2001/04/07 21:29:25 thorpej Exp $
AUTOMAKE_OPTIONS = foreign no-dependencies

5
crypto/dist/heimdal/lib/roken/strlcat.c vendored
View File

@ -36,7 +36,9 @@
#endif
#include "roken.h"
RCSID("$Id: strlcat.c,v 1.2 2000/08/02 02:44:06 garbled Exp $");
RCSID("$Id: strlcat.c,v 1.3 2001/04/07 21:29:25 thorpej Exp $");
#ifndef HAVE_STRLCAT
size_t
strlcat (char *dst, const char *src, size_t dst_sz)
@ -45,3 +47,4 @@ strlcat (char *dst, const char *src, size_t dst_sz)
return len + strlcpy (dst + len, src, dst_sz - len);
}
#endif

6
crypto/dist/heimdal/lib/roken/strlcpy.c vendored
View File

@ -36,7 +36,9 @@
#endif
#include "roken.h"
RCSID("$Id: strlcpy.c,v 1.2 2000/08/02 02:44:06 garbled Exp $");
RCSID("$Id: strlcpy.c,v 1.3 2001/04/07 21:29:25 thorpej Exp $");
#ifndef HAVE_STRLCPY
size_t
strlcpy (char *dst, const char *src, size_t dst_sz)
@ -54,3 +56,5 @@ strlcpy (char *dst, const char *src, size_t dst_sz)
else
return n + strlen (src);
}
#endif

2
crypto/dist/heimdal/lib/roken/write_pid.c vendored
View File

@ -33,7 +33,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
RCSID("$Id: write_pid.c,v 1.1.1.2 2001/02/11 13:51:47 assar Exp $");
RCSID("$Id: write_pid.c,v 1.2 2001/04/07 21:29:25 thorpej Exp $");
#endif
#include <stdio.h>

2
crypto/dist/heimdal/lib/vers/Makefile.am vendored
View File

@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.1.1.2 2001/02/11 13:51:46 assar Exp $
# $Id: Makefile.am,v 1.2 2001/04/07 21:29:26 thorpej Exp $
include $(top_srcdir)/Makefile.am.common

6
crypto/dist/heimdal/lib/vers/Makefile.in vendored
View File

@ -113,13 +113,13 @@ dpagaix_CFLAGS = @dpagaix_CFLAGS@
dpagaix_LDADD = @dpagaix_LDADD@
install_sh = @install_sh@
# $Id: Makefile.in,v 1.1.1.2 2001/02/11 13:51:46 assar Exp $
# $Id: Makefile.in,v 1.2 2001/04/07 21:29:26 thorpej Exp $
# $Id: Makefile.in,v 1.1.1.2 2001/02/11 13:51:46 assar Exp $
# $Id: Makefile.in,v 1.2 2001/04/07 21:29:26 thorpej Exp $
# $Id: Makefile.in,v 1.1.1.2 2001/02/11 13:51:46 assar Exp $
# $Id: Makefile.in,v 1.2 2001/04/07 21:29:26 thorpej Exp $
AUTOMAKE_OPTIONS = foreign no-dependencies