svn commit: r472784 - in head/security: krb5-114 krb5-114/files krb5-115 krb5-115/files krb5-116 krb5-116/files
Cy Schubert
cy at FreeBSD.org
Tue Jun 19 13:38:37 UTC 2018
Author: cy
Date: Tue Jun 19 13:38:35 2018
New Revision: 472784
URL: https://svnweb.freebsd.org/changeset/ports/472784
Log:
Revert r472760 and instead use upstream git commit
beeb2828945a41d86488e391ce440bacee0ec committed to the krb5
development branch Saturday, June 16. The upstream commit
message follows:
Author: Thomas Sondergaard <tsondergaard at vitalimages.com>
Date: Sat Jun 16 18:14:50 2018 +0200
Eliminate use of the 'register' keyword
'register' is a reserved and unused keyword in C++17 so having it
present in the public headers presents a a compatibility issue. Also
in C the 'register' keyword is mostly obsolete, so remove all uses of
it.
[ghudson at mit.edu: adjusted style of some of the affected lines]
Added:
head/security/krb5-114/files/patch-MIT-git-beeb2828945a41d86488e391ce440bacee0ec8a4 (contents, props changed)
head/security/krb5-115/files/patch-MIT-git-beeb2828945a41d86488e391ce440bacee0ec8a4 (contents, props changed)
head/security/krb5-116/files/patch-MIT-git-beeb2828945a41d86488e391ce440bacee0ec8a4 (contents, props changed)
Deleted:
head/security/krb5-114/files/patch-include_krb5_krb5.hin
head/security/krb5-115/files/patch-include_krb5_krb5.hin
head/security/krb5-116/files/patch-include_krb5_krb5.hin
Modified:
head/security/krb5-114/Makefile
head/security/krb5-115/Makefile
head/security/krb5-116/Makefile
Modified: head/security/krb5-114/Makefile
==============================================================================
--- head/security/krb5-114/Makefile Tue Jun 19 12:36:52 2018 (r472783)
+++ head/security/krb5-114/Makefile Tue Jun 19 13:38:35 2018 (r472784)
@@ -3,7 +3,7 @@
PORTNAME= krb5
PORTVERSION= 1.14.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security
MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
.if !defined(MASTERDIR)
Added: head/security/krb5-114/files/patch-MIT-git-beeb2828945a41d86488e391ce440bacee0ec8a4
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/krb5-114/files/patch-MIT-git-beeb2828945a41d86488e391ce440bacee0ec8a4 Tue Jun 19 13:38:35 2018 (r472784)
@@ -0,0 +1,3211 @@
+diff --git appl/user_user/client.c b/src/appl/user_user/client.c
+index 28901a637..34d852202 100644
+--- appl/user_user/client.c
++++ appl/user_user/client.c
+@@ -36,7 +36,7 @@
+ int main (int argc, char *argv[])
+ {
+ int s;
+- register int retval, i;
++ int retval, i;
+ char *hname; /* full name of server */
+ char **srealms; /* realm(s) of server */
+ char *princ; /* principal in credentials cache */
+diff --git clients/ksu/main.c b/src/clients/ksu/main.c
+index 6fa74a536..d9596d948 100644
+--- clients/ksu/main.c
++++ clients/ksu/main.c
+@@ -932,7 +932,7 @@ cleanup:
+ int standard_shell(sh)
+ char *sh;
+ {
+- register char *cp;
++ char *cp;
+ char *getusershell();
+
+ while ((cp = getusershell()) != NULL)
+diff --git clients/ksu/setenv.c b/src/clients/ksu/setenv.c
+index a7895c6b4..c7bd369bc 100644
+--- clients/ksu/setenv.c
++++ clients/ksu/setenv.c
+@@ -57,12 +57,12 @@ extern void unsetenv(char *);
+ #ifndef HAVE_SETENV
+ int
+ setenv(name, value, rewrite)
+- register char *name, *value;
++ char *name, *value;
+ int rewrite;
+ {
+ extern char **environ;
+ static int alloced; /* if allocated space before */
+- register char *C;
++ char *C;
+ int l_value, offset;
+
+ if (*value == '=') /* no `=' in value */
+@@ -77,8 +77,8 @@ setenv(name, value, rewrite)
+ }
+ }
+ else { /* create new slot */
+- register int cnt;
+- register char **P;
++ int cnt;
++ char **P;
+
+ for (P = environ, cnt = 0; *P; ++P, ++cnt);
+ if (alloced) { /* just increase size */
+@@ -119,7 +119,7 @@ unsetenv(name)
+ char *name;
+ {
+ extern char **environ;
+- register char **P;
++ char **P;
+ int offset;
+
+ while (_findenv(name, &offset)) /* if set multiple times */
+@@ -156,12 +156,12 @@ getenv(name)
+ */
+ static char *
+ _findenv(name, offset)
+- register char *name;
++ char *name;
+ int *offset;
+ {
+ extern char **environ;
+- register int len;
+- register char **P, *C;
++ int len;
++ char **P, *C;
+
+ for (C = name, len = 0; *C && *C != '='; ++C, ++len);
+ for (P = environ; *P; ++P)
+diff --git include/gssrpc/clnt.h b/src/include/gssrpc/clnt.h
+index 40f7c69a4..fc6836cb5 100644
+--- include/gssrpc/clnt.h
++++ include/gssrpc/clnt.h
+@@ -270,7 +270,7 @@ extern CLIENT *clnt_create(char *, rpcprog_t, rpcvers_t, char *);
+ * struct sockaddr_in *raddr;
+ * rpcprog_t prog;
+ * rpcvers_t version;
+- * register int *sockp;
++ * int *sockp;
+ * u_int sendsz;
+ * u_int recvsz;
+ */
+diff --git include/krb5/krb5.hin b/src/include/krb5/krb5.hin
+index 6d99de42d..384bb838f 100644
+--- include/krb5/krb5.hin
++++ include/krb5/krb5.hin
+@@ -3566,7 +3566,7 @@ krb5_parse_name_flags(krb5_context context, const char *name,
+ */
+ krb5_error_code KRB5_CALLCONV
+ krb5_unparse_name(krb5_context context, krb5_const_principal principal,
+- register char **name);
++ char **name);
+
+ /**
+ * Convert krb5_principal structure to string and length.
+@@ -4389,7 +4389,7 @@ krb5_kt_add_entry(krb5_context context, krb5_keytab id, krb5_keytab_entry *entry
+ */
+ krb5_error_code KRB5_CALLCONV_WRONG
+ krb5_principal2salt(krb5_context context,
+- register krb5_const_principal pr, krb5_data *ret);
++ krb5_const_principal pr, krb5_data *ret);
+ /* librc.spec--see rcache.h */
+
+ /* libcc.spec */
+@@ -4730,7 +4730,7 @@ krb5_free_ticket(krb5_context context, krb5_ticket *val);
+ * This function frees the contents of @a val and the structure itself.
+ */
+ void KRB5_CALLCONV
+-krb5_free_error(krb5_context context, register krb5_error *val);
++krb5_free_error(krb5_context context, krb5_error *val);
+
+ /**
+ * Free a krb5_creds structure.
+@@ -4763,7 +4763,7 @@ krb5_free_cred_contents(krb5_context context, krb5_creds *val);
+ * This function frees the contents of @a val and the structure itself.
+ */
+ void KRB5_CALLCONV
+-krb5_free_checksum(krb5_context context, register krb5_checksum *val);
++krb5_free_checksum(krb5_context context, krb5_checksum *val);
+
+ /**
+ * Free the contents of a krb5_checksum structure.
+@@ -4774,7 +4774,7 @@ krb5_free_checksum(krb5_context context, register krb5_checksum *val);
+ * This function frees the contents of @a val, but not the structure itself.
+ */
+ void KRB5_CALLCONV
+-krb5_free_checksum_contents(krb5_context context, register krb5_checksum *val);
++krb5_free_checksum_contents(krb5_context context, krb5_checksum *val);
+
+ /**
+ * Free a krb5_keyblock structure.
+@@ -4785,7 +4785,7 @@ krb5_free_checksum_contents(krb5_context context, register krb5_checksum *val);
+ * This function frees the contents of @a val and the structure itself.
+ */
+ void KRB5_CALLCONV
+-krb5_free_keyblock(krb5_context context, register krb5_keyblock *val);
++krb5_free_keyblock(krb5_context context, krb5_keyblock *val);
+
+ /**
+ * Free the contents of a krb5_keyblock structure.
+@@ -4796,7 +4796,7 @@ krb5_free_keyblock(krb5_context context, register krb5_keyblock *val);
+ * This function frees the contents of @a key, but not the structure itself.
+ */
+ void KRB5_CALLCONV
+-krb5_free_keyblock_contents(krb5_context context, register krb5_keyblock *key);
++krb5_free_keyblock_contents(krb5_context context, krb5_keyblock *key);
+
+ /**
+ * Free a krb5_ap_rep_enc_part structure.
+@@ -4912,7 +4912,7 @@ krb5_us_timeofday(krb5_context context,
+ * Kerberos error codes
+ */
+ krb5_error_code KRB5_CALLCONV
+-krb5_timeofday(krb5_context context, register krb5_timestamp *timeret);
++krb5_timeofday(krb5_context context, krb5_timestamp *timeret);
+
+ /**
+ * Check if a timestamp is within the allowed clock skew of the current time.
+diff --git kadmin/cli/getdate.y b/src/kadmin/cli/getdate.y
+index 059f112da..cb039acb3 100644
+--- kadmin/cli/getdate.y
++++ kadmin/cli/getdate.y
+@@ -689,9 +689,9 @@ RelativeMonth(time_t Start, time_t RelMonth)
+ static int
+ LookupWord(char *buff)
+ {
+- register char *p;
+- register char *q;
+- register const TABLE *tp;
++ char *p;
++ char *q;
++ const TABLE *tp;
+ int i;
+ int abbrev;
+
+@@ -786,8 +786,8 @@ LookupWord(char *buff)
+ static int
+ yylex()
+ {
+- register char c;
+- register char *p;
++ char c;
++ char *p;
+ char buff[20];
+ int Count;
+ int sign;
+diff --git kadmin/dbutil/strtok.c b/src/kadmin/dbutil/strtok.c
+index 0640c747e..dee466aea 100644
+--- kadmin/dbutil/strtok.c
++++ kadmin/dbutil/strtok.c
+@@ -51,11 +51,11 @@
+
+ char *
+ nstrtok(s, delim)
+- register char *s;
+- register const char *delim;
++ char *s;
++ const char *delim;
+ {
+- register const char *spanp;
+- register int c, sc;
++ const char *spanp;
++ int c, sc;
+ char *tok;
+ static char *last;
+
+diff --git kadmin/server/ipropd_svc.c b/src/kadmin/server/ipropd_svc.c
+index e6e190136..6a21fe6de 100644
+--- kadmin/server/ipropd_svc.c
++++ kadmin/server/ipropd_svc.c
+@@ -533,7 +533,7 @@ fail_name:
+
+ void
+ krb5_iprop_prog_1(struct svc_req *rqstp,
+- register SVCXPRT *transp)
++ SVCXPRT *transp)
+ {
+ union {
+ kdb_last_t iprop_get_updates_1_arg;
+diff --git kadmin/server/kadm_rpc_svc.c b/src/kadmin/server/kadm_rpc_svc.c
+index e43ca0d57..41fc88ac8 100644
+--- kadmin/server/kadm_rpc_svc.c
++++ kadmin/server/kadm_rpc_svc.c
+@@ -38,7 +38,7 @@ static int check_rpcsec_auth(struct svc_req *);
+
+ void kadm_1(rqstp, transp)
+ struct svc_req *rqstp;
+- register SVCXPRT *transp;
++ SVCXPRT *transp;
+ {
+ union {
+ cprinc_arg create_principal_2_arg;
+diff --git kdc/kdc_util.c b/src/kdc/kdc_util.c
+index 13111215d..21af360cd 100644
+--- kdc/kdc_util.c
++++ kdc/kdc_util.c
+@@ -87,8 +87,8 @@ concat_authorization_data(krb5_context context,
+ krb5_authdata **first, krb5_authdata **second,
+ krb5_authdata ***output)
+ {
+- register int i, j;
+- register krb5_authdata **ptr, **retdata;
++ int i, j;
++ krb5_authdata **ptr, **retdata;
+
+ /* count up the entries */
+ i = 0;
+@@ -638,7 +638,7 @@ check_anon(kdc_realm_t *kdc_active_realm,
+ KDC_OPT_ENC_TKT_IN_SKEY | KDC_OPT_CNAME_IN_ADDL_TKT)
+ int
+ validate_as_request(kdc_realm_t *kdc_active_realm,
+- register krb5_kdc_req *request, krb5_db_entry client,
++ krb5_kdc_req *request, krb5_db_entry client,
+ krb5_db_entry server, krb5_timestamp kdc_time,
+ const char **status, krb5_pa_data ***e_data)
+ {
+diff --git kdc/tgs_policy.c b/src/kdc/tgs_policy.c
+index 33cfbcd81..4c08e44e6 100644
+--- kdc/tgs_policy.c
++++ kdc/tgs_policy.c
+@@ -320,7 +320,7 @@ check_tgs_tgt(kdc_realm_t *kdc_active_realm, krb5_kdc_req *req,
+
+ int
+ validate_tgs_request(kdc_realm_t *kdc_active_realm,
+- register krb5_kdc_req *request, krb5_db_entry server,
++ krb5_kdc_req *request, krb5_db_entry server,
+ krb5_ticket *ticket, krb5_timestamp kdc_time,
+ const char **status, krb5_pa_data ***e_data)
+ {
+diff --git lib/apputils/net-server.c b/src/lib/apputils/net-server.c
+index a40da927e..f0955c503 100644
+--- lib/apputils/net-server.c
++++ lib/apputils/net-server.c
+@@ -1452,7 +1452,7 @@ accept_rpc_connection(verto_ctx *ctx, verto_ev *ev)
+ verto_ev_flag flags;
+ struct connection *conn;
+ fd_set fds;
+- register int s;
++ int s;
+
+ conn = verto_get_private(ev);
+
+diff --git lib/crypto/builtin/des/destest.c b/src/lib/crypto/builtin/des/destest.c
+index dd2f68ec4..e51351c5e 100644
+--- lib/crypto/builtin/des/destest.c
++++ lib/crypto/builtin/des/destest.c
+@@ -159,7 +159,7 @@ convert(text, cblock)
+ char *text;
+ unsigned char cblock[];
+ {
+- register int i;
++ int i;
+ for (i = 0; i < 8; i++) {
+ if (!isascii((unsigned char)text[i * 2]))
+ abort ();
+@@ -189,7 +189,7 @@ des_cblock_print_file(x, fp)
+ FILE *fp;
+ {
+ unsigned char *y = (unsigned char *) x;
+- register int i = 0;
++ int i = 0;
+ fprintf(fp," 0x { ");
+
+ while (i++ < 8) {
+@@ -212,7 +212,7 @@ des_cblock_print_file(x, fp)
+ */
+ int
+ mit_des_check_key_parity(key)
+- register mit_des_cblock key;
++ mit_des_cblock key;
+ {
+ unsigned int i;
+
+@@ -231,7 +231,7 @@ mit_des_check_key_parity(key)
+
+ void
+ mit_des_fixup_key_parity(key)
+- register mit_des_cblock key;
++ mit_des_cblock key;
+ {
+ unsigned int i;
+ for (i=0; i<sizeof(mit_des_cblock); i++)
+diff --git lib/crypto/builtin/des/doc/libdes.doc b/src/lib/crypto/builtin/des/doc/libdes.doc
+index 70f9f336a..19c03c1d3 100644
+--- lib/crypto/builtin/des/doc/libdes.doc
++++ lib/crypto/builtin/des/doc/libdes.doc
+@@ -157,8 +157,8 @@ int
+
+ int
+ string_to_key(str,key)
+- register char *str;
+- register C_Block *key;
++ char *str;
++ C_Block *key;
+
+ This routines converts an arbitrary length, null terminated string
+ to an 8 byte DES key, with each byte parity set to odd, per FIPS spec.
+diff --git lib/crypto/builtin/des/f_cksum.c b/src/lib/crypto/builtin/des/f_cksum.c
+index 4492ce6df..cb482b009 100644
+--- lib/crypto/builtin/des/f_cksum.c
++++ lib/crypto/builtin/des/f_cksum.c
+@@ -56,7 +56,7 @@ mit_des_cbc_cksum(const krb5_octet *in, krb5_octet *out,
+ const unsigned DES_INT32 *kp;
+ const unsigned char *ip;
+ unsigned char *op;
+- register DES_INT32 len;
++ DES_INT32 len;
+
+ /*
+ * Initialize left and right with the contents of the initial
+diff --git lib/crypto/builtin/des/f_sched.c b/src/lib/crypto/builtin/des/f_sched.c
+index 89d820f45..666a510fb 100644
+--- lib/crypto/builtin/des/f_sched.c
++++ lib/crypto/builtin/des/f_sched.c
+@@ -241,14 +241,14 @@ static const unsigned DES_INT32 PC2_D[4][64] = {
+ int
+ mit_des_make_key_sched(mit_des_cblock key, mit_des_key_schedule schedule)
+ {
+- register unsigned DES_INT32 c, d;
++ unsigned DES_INT32 c, d;
+
+ {
+ /*
+ * Need a pointer for the keys and a temporary DES_INT32
+ */
+ const unsigned char *k;
+- register unsigned DES_INT32 tmp;
++ unsigned DES_INT32 tmp;
+
+ /*
+ * Fetch the key into something we can work with
+@@ -288,10 +288,10 @@ mit_des_make_key_sched(mit_des_cblock key, mit_des_key_schedule schedule)
+ /*
+ * Need several temporaries in here
+ */
+- register unsigned DES_INT32 ltmp, rtmp;
+- register unsigned DES_INT32 *k;
+- register int two_bit_shifts;
+- register int i;
++ unsigned DES_INT32 ltmp, rtmp;
++ unsigned DES_INT32 *k;
++ int two_bit_shifts;
++ int i;
+ /*
+ * Now iterate to compute the key schedule. Note that we
+ * record the entire set of subkeys in 6 bit chunks since
+diff --git lib/crypto/builtin/des/f_tables.h b/src/lib/crypto/builtin/des/f_tables.h
+index a99eb0a14..fc91b566c 100644
+--- lib/crypto/builtin/des/f_tables.h
++++ lib/crypto/builtin/des/f_tables.h
+@@ -156,7 +156,7 @@ extern const unsigned DES_INT32 des_SP_table[8][64];
+ * temporary. Use this more as a guide for rolling your own, though.
+ * The best way to do the IP depends on the form of the data you
+ * are dealing with. If you use this, though, try to make left,
+- * right and temp register unsigned DES_INT32s.
++ * right and temp unsigned DES_INT32s.
+ */
+ #define DES_INITIAL_PERM(left, right, temp) do { \
+ (temp) = DES_IP_RIGHT_BITS((left), (right)); \
+@@ -228,8 +228,8 @@ extern const unsigned DES_INT32 des_SP_table[8][64];
+ */
+ #define DES_DO_ENCRYPT_1(left, right, kp) \
+ do { \
+- register int i; \
+- register unsigned DES_INT32 temp1; \
++ int i; \
++ unsigned DES_INT32 temp1; \
+ DEB (("do_encrypt %8lX %8lX \n", left, right)); \
+ DES_INITIAL_PERM((left), (right), (temp1)); \
+ DEB ((" after IP %8lX %8lX\n", left, right)); \
+@@ -246,8 +246,8 @@ extern const unsigned DES_INT32 des_SP_table[8][64];
+
+ #define DES_DO_DECRYPT_1(left, right, kp) \
+ do { \
+- register int i; \
+- register unsigned DES_INT32 temp2; \
++ int i; \
++ unsigned DES_INT32 temp2; \
+ DES_INITIAL_PERM((left), (right), (temp2)); \
+ (kp) += (2 * 16); \
+ for (i = 0; i < 8; i++) { \
+diff --git lib/crypto/builtin/des/t_verify.c b/src/lib/crypto/builtin/des/t_verify.c
+index 1f3239fed..be0e8adc7 100644
+--- lib/crypto/builtin/des/t_verify.c
++++ lib/crypto/builtin/des/t_verify.c
+@@ -339,7 +339,7 @@ void
+ flip(array)
+ char *array;
+ {
+- register int old,new,i,j;
++ int old,new,i,j;
+ /* flips the bit order within each byte from 0 lsb to 0 msb */
+ for (i = 0; i<=7; i++) {
+ old = *array;
+diff --git lib/crypto/builtin/md4/md4.c b/src/lib/crypto/builtin/md4/md4.c
+index 27d2ad514..f7c16caaa 100644
+--- lib/crypto/builtin/md4/md4.c
++++ lib/crypto/builtin/md4/md4.c
+@@ -151,7 +151,7 @@ krb5int_MD4Final (krb5_MD4_CTX *mdContext)
+ */
+ static void Transform (krb5_ui_4 *buf, krb5_ui_4 *in)
+ {
+- register krb5_ui_4 a = buf[0], b = buf[1], c = buf[2], d = buf[3];
++ krb5_ui_4 a = buf[0], b = buf[1], c = buf[2], d = buf[3];
+
+ #if defined(CONFIG_SMALL) && !defined(CONFIG_SMALL_NO_CRYPTO)
+ int i;
+diff --git lib/crypto/builtin/md5/md5.c b/src/lib/crypto/builtin/md5/md5.c
+index 4a169065c..a5e0c82db 100644
+--- lib/crypto/builtin/md5/md5.c
++++ lib/crypto/builtin/md5/md5.c
+@@ -189,7 +189,7 @@ krb5int_MD5Final (krb5_MD5_CTX *mdContext)
+ */
+ static void Transform (krb5_ui_4 *buf, krb5_ui_4 *in)
+ {
+- register krb5_ui_4 a = buf[0], b = buf[1], c = buf[2], d = buf[3];
++ krb5_ui_4 a = buf[0], b = buf[1], c = buf[2], d = buf[3];
+
+ #if defined(CONFIG_SMALL) && !defined(CONFIG_SMALL_NO_CRYPTO)
+
+diff --git lib/crypto/krb/crc32.c b/src/lib/crypto/krb/crc32.c
+index d3b1b7a13..11fe312da 100644
+--- lib/crypto/krb/crc32.c
++++ lib/crypto/krb/crc32.c
+@@ -148,9 +148,9 @@ static u_long const crc_table[256] = {
+ void
+ mit_crc32(krb5_pointer in, size_t in_length, unsigned long *cksum)
+ {
+- register u_char *data;
+- register u_long c = *cksum;
+- register int idx;
++ u_char *data;
++ u_long c = *cksum;
++ int idx;
+ size_t i;
+
+ data = (u_char *)in;
+diff --git lib/crypto/krb/keyblocks.c b/src/lib/crypto/krb/keyblocks.c
+index 98696f508..1126d0a0a 100644
+--- lib/crypto/krb/keyblocks.c
++++ lib/crypto/krb/keyblocks.c
+@@ -56,7 +56,7 @@ krb5int_c_init_keyblock(krb5_context context, krb5_enctype enctype,
+ }
+
+ void
+-krb5int_c_free_keyblock(krb5_context context, register krb5_keyblock *val)
++krb5int_c_free_keyblock(krb5_context context, krb5_keyblock *val)
+ {
+ krb5int_c_free_keyblock_contents(context, val);
+ free(val);
+diff --git lib/kdb/iprop_xdr.c b/src/lib/kdb/iprop_xdr.c
+index 8bf2c89e6..b866fdf7b 100644
+--- lib/kdb/iprop_xdr.c
++++ lib/kdb/iprop_xdr.c
+@@ -12,7 +12,7 @@
+ static bool_t
+ xdr_int16_t (XDR *xdrs, int16_t *objp)
+ {
+- register int32_t *buf;
++ int32_t *buf;
+
+ if (!xdr_short (xdrs, objp))
+ return FALSE;
+@@ -22,7 +22,7 @@ xdr_int16_t (XDR *xdrs, int16_t *objp)
+ static bool_t
+ xdr_int32_t (XDR *xdrs, int32_t *objp)
+ {
+- register int32_t *buf;
++ int32_t *buf;
+
+ if (!xdr_int (xdrs, objp))
+ return FALSE;
+@@ -32,7 +32,7 @@ xdr_int32_t (XDR *xdrs, int32_t *objp)
+ static bool_t
+ xdr_uint32_t (XDR *xdrs, uint32_t *objp)
+ {
+- register int32_t *buf;
++ int32_t *buf;
+
+ if (!xdr_u_int (xdrs, objp))
+ return FALSE;
+@@ -42,7 +42,7 @@ xdr_uint32_t (XDR *xdrs, uint32_t *objp)
+ bool_t
+ xdr_utf8str_t (XDR *xdrs, utf8str_t *objp)
+ {
+- register int32_t *buf;
++ int32_t *buf;
+
+ if (!xdr_bytes (xdrs, (char **)&objp->utf8str_t_val, (u_int *) &objp->utf8str_t_len, ~0))
+ return FALSE;
+@@ -52,7 +52,7 @@ xdr_utf8str_t (XDR *xdrs, utf8str_t *objp)
+ bool_t
+ xdr_kdb_sno_t (XDR *xdrs, kdb_sno_t *objp)
+ {
+- register int32_t *buf;
++ int32_t *buf;
+
+ if (!xdr_uint32_t (xdrs, objp))
+ return FALSE;
+@@ -62,7 +62,7 @@ xdr_kdb_sno_t (XDR *xdrs, kdb_sno_t *objp)
+ bool_t
+ xdr_kdbe_time_t (XDR *xdrs, kdbe_time_t *objp)
+ {
+- register int32_t *buf;
++ int32_t *buf;
+
+ if (!xdr_uint32_t (xdrs, &objp->seconds))
+ return FALSE;
+@@ -74,7 +74,7 @@ xdr_kdbe_time_t (XDR *xdrs, kdbe_time_t *objp)
+ bool_t
+ xdr_kdbe_key_t (XDR *xdrs, kdbe_key_t *objp)
+ {
+- register int32_t *buf;
++ int32_t *buf;
+
+ if (!xdr_int32_t (xdrs, &objp->k_ver))
+ return FALSE;
+@@ -92,7 +92,7 @@ xdr_kdbe_key_t (XDR *xdrs, kdbe_key_t *objp)
+ bool_t
+ xdr_kdbe_data_t (XDR *xdrs, kdbe_data_t *objp)
+ {
+- register int32_t *buf;
++ int32_t *buf;
+
+ if (!xdr_int32_t (xdrs, &objp->k_magic))
+ return FALSE;
+@@ -104,7 +104,7 @@ xdr_kdbe_data_t (XDR *xdrs, kdbe_data_t *objp)
+ bool_t
+ xdr_kdbe_princ_t (XDR *xdrs, kdbe_princ_t *objp)
+ {
+- register int32_t *buf;
++ int32_t *buf;
+
+ if (!xdr_utf8str_t (xdrs, &objp->k_realm))
+ return FALSE;
+@@ -119,7 +119,7 @@ xdr_kdbe_princ_t (XDR *xdrs, kdbe_princ_t *objp)
+ bool_t
+ xdr_kdbe_tl_t (XDR *xdrs, kdbe_tl_t *objp)
+ {
+- register int32_t *buf;
++ int32_t *buf;
+
+ if (!xdr_int16_t (xdrs, &objp->tl_type))
+ return FALSE;
+@@ -131,7 +131,7 @@ xdr_kdbe_tl_t (XDR *xdrs, kdbe_tl_t *objp)
+ bool_t
+ xdr_kdbe_pw_hist_t (XDR *xdrs, kdbe_pw_hist_t *objp)
+ {
+- register int32_t *buf;
++ int32_t *buf;
+
+ if (!xdr_array (xdrs, (char **)&objp->kdbe_pw_hist_t_val, (u_int *) &objp->kdbe_pw_hist_t_len, ~0,
+ sizeof (kdbe_key_t), (xdrproc_t) xdr_kdbe_key_t))
+@@ -142,7 +142,7 @@ xdr_kdbe_pw_hist_t (XDR *xdrs, kdbe_pw_hist_t *objp)
+ bool_t
+ xdr_kdbe_attr_type_t (XDR *xdrs, kdbe_attr_type_t *objp)
+ {
+- register int32_t *buf;
++ int32_t *buf;
+
+ if (!xdr_enum (xdrs, (enum_t *) objp))
+ return FALSE;
+@@ -152,7 +152,7 @@ xdr_kdbe_attr_type_t (XDR *xdrs, kdbe_attr_type_t *objp)
+ bool_t
+ xdr_kdbe_val_t (XDR *xdrs, kdbe_val_t *objp)
+ {
+- register int32_t *buf;
++ int32_t *buf;
+
+ if (!xdr_kdbe_attr_type_t (xdrs, &objp->av_type))
+ return FALSE;
+@@ -251,7 +251,7 @@ xdr_kdbe_val_t (XDR *xdrs, kdbe_val_t *objp)
+ bool_t
+ xdr_kdbe_t (XDR *xdrs, kdbe_t *objp)
+ {
+- register int32_t *buf;
++ int32_t *buf;
+
+ if (!xdr_array (xdrs, (char **)&objp->kdbe_t_val, (u_int *) &objp->kdbe_t_len, ~0,
+ sizeof (kdbe_val_t), (xdrproc_t) xdr_kdbe_val_t))
+@@ -262,7 +262,7 @@ xdr_kdbe_t (XDR *xdrs, kdbe_t *objp)
+ bool_t
+ xdr_kdb_incr_update_t (XDR *xdrs, kdb_incr_update_t *objp)
+ {
+- register int32_t *buf;
++ int32_t *buf;
+
+ if (!xdr_utf8str_t (xdrs, &objp->kdb_princ_name))
+ return FALSE;
+@@ -287,7 +287,7 @@ xdr_kdb_incr_update_t (XDR *xdrs, kdb_incr_update_t *objp)
+ bool_t
+ xdr_kdb_ulog_t (XDR *xdrs, kdb_ulog_t *objp)
+ {
+- register int32_t *buf;
++ int32_t *buf;
+
+ if (!xdr_array (xdrs, (char **)&objp->kdb_ulog_t_val, (u_int *) &objp->kdb_ulog_t_len, ~0,
+ sizeof (kdb_incr_update_t), (xdrproc_t) xdr_kdb_incr_update_t))
+@@ -298,7 +298,7 @@ xdr_kdb_ulog_t (XDR *xdrs, kdb_ulog_t *objp)
+ bool_t
+ xdr_update_status_t (XDR *xdrs, update_status_t *objp)
+ {
+- register int32_t *buf;
++ int32_t *buf;
+
+ if (!xdr_enum (xdrs, (enum_t *) objp))
+ return FALSE;
+@@ -308,7 +308,7 @@ xdr_update_status_t (XDR *xdrs, update_status_t *objp)
+ bool_t
+ xdr_kdb_last_t (XDR *xdrs, kdb_last_t *objp)
+ {
+- register int32_t *buf;
++ int32_t *buf;
+
+ if (!xdr_kdb_sno_t (xdrs, &objp->last_sno))
+ return FALSE;
+@@ -320,7 +320,7 @@ xdr_kdb_last_t (XDR *xdrs, kdb_last_t *objp)
+ bool_t
+ xdr_kdb_incr_result_t (XDR *xdrs, kdb_incr_result_t *objp)
+ {
+- register int32_t *buf;
++ int32_t *buf;
+
+ if (!xdr_kdb_last_t (xdrs, &objp->lastentry))
+ return FALSE;
+@@ -334,7 +334,7 @@ xdr_kdb_incr_result_t (XDR *xdrs, kdb_incr_result_t *objp)
+ bool_t
+ xdr_kdb_fullresync_result_t (XDR *xdrs, kdb_fullresync_result_t *objp)
+ {
+- register int32_t *buf;
++ int32_t *buf;
+
+ if (!xdr_kdb_last_t (xdrs, &objp->lastentry))
+ return FALSE;
+diff --git lib/krb5/ccache/cc_mslsa.c b/src/lib/krb5/ccache/cc_mslsa.c
+index 030098360..0d00c86d4 100644
+--- lib/krb5/ccache/cc_mslsa.c
++++ lib/krb5/ccache/cc_mslsa.c
+@@ -1638,8 +1638,8 @@ krb5_lcc_initialize(krb5_context context, krb5_ccache id, krb5_principal princ)
+ static krb5_error_code KRB5_CALLCONV
+ krb5_lcc_close(krb5_context context, krb5_ccache id)
+ {
+- register int closeval = KRB5_OK;
+- register krb5_lcc_data *data;
++ int closeval = KRB5_OK;
++ krb5_lcc_data *data;
+
+ if (id) {
+ data = (krb5_lcc_data *) id->data;
+@@ -1665,7 +1665,7 @@ krb5_lcc_close(krb5_context context, krb5_ccache id)
+ static krb5_error_code KRB5_CALLCONV
+ krb5_lcc_destroy(krb5_context context, krb5_ccache id)
+ {
+- register krb5_lcc_data *data;
++ krb5_lcc_data *data;
+
+ if (id) {
+ data = (krb5_lcc_data *) id->data;
+diff --git lib/krb5/ccache/ccapi/stdcc_util.c b/src/lib/krb5/ccache/ccapi/stdcc_util.c
+index 6092ee432..62d847c18 100644
+--- lib/krb5/ccache/ccapi/stdcc_util.c
++++ lib/krb5/ccache/ccapi/stdcc_util.c
+@@ -921,8 +921,8 @@ cc_int32 krb5int_free_cc_cred_union (cred_union** creds)
+ */
+ static krb5_boolean
+ times_match(t1, t2)
+- register const krb5_ticket_times *t1;
+- register const krb5_ticket_times *t2;
++ const krb5_ticket_times *t1;
++ const krb5_ticket_times *t2;
+ {
+ if (t1->renew_till) {
+ if (ts_after(t1->renew_till, t2->renew_till))
+@@ -938,7 +938,7 @@ times_match(t1, t2)
+
+ static krb5_boolean
+ times_match_exact (t1, t2)
+- register const krb5_ticket_times *t1, *t2;
++ const krb5_ticket_times *t1, *t2;
+ {
+ return (t1->authtime == t2->authtime
+ && t1->starttime == t2->starttime
+@@ -949,7 +949,7 @@ times_match_exact (t1, t2)
+ static krb5_boolean
+ standard_fields_match(context, mcreds, creds)
+ krb5_context context;
+- register const krb5_creds *mcreds, *creds;
++ const krb5_creds *mcreds, *creds;
+ {
+ return (krb5_principal_compare(context, mcreds->client,creds->client) &&
+ krb5_principal_compare(context, mcreds->server,creds->server));
+@@ -960,7 +960,7 @@ standard_fields_match(context, mcreds, creds)
+ static krb5_boolean
+ srvname_match(context, mcreds, creds)
+ krb5_context context;
+- register const krb5_creds *mcreds, *creds;
++ const krb5_creds *mcreds, *creds;
+ {
+ krb5_boolean retval;
+ krb5_principal_data p1, p2;
+@@ -1008,7 +1008,7 @@ authdata_match(mdata, data)
+
+ static krb5_boolean
+ data_match(data1, data2)
+- register const krb5_data *data1, *data2;
++ const krb5_data *data1, *data2;
+ {
+ if (!data1) {
+ if (!data2)
+diff --git lib/krb5/keytab/kt_file.c b/src/lib/krb5/keytab/kt_file.c
+index 091f2c43f..89cb68680 100644
+--- lib/krb5/keytab/kt_file.c
++++ lib/krb5/keytab/kt_file.c
+@@ -1182,7 +1182,7 @@ krb5_ktfileint_internal_read_entry(krb5_context context, krb5_keytab id, krb5_ke
+ unsigned int u_count, u_princ_size;
+ krb5_int16 enctype;
+ krb5_int16 princ_size;
+- register int i;
++ int i;
+ krb5_int32 size;
+ krb5_int32 start_pos, pos;
+ krb5_error_code error;
+diff --git lib/krb5/krb/addr_order.c b/src/lib/krb5/krb/addr_order.c
+index e9ea0ba8c..39c9e1e69 100644
+--- lib/krb5/krb/addr_order.c
++++ lib/krb5/krb/addr_order.c
+@@ -38,7 +38,7 @@ int KRB5_CALLCONV
+ krb5_address_order(krb5_context context, const krb5_address *addr1, const krb5_address *addr2)
+ {
+ int dir;
+- register int i;
++ int i;
+ const int minlen = min(addr1->length, addr2->length);
+
+ if (addr1->addrtype != addr2->addrtype)
+diff --git lib/krb5/krb/authdata.c b/src/lib/krb5/krb/authdata.c
+index abb2ab9e2..8fd1f0538 100644
+--- lib/krb5/krb/authdata.c
++++ lib/krb5/krb/authdata.c
+@@ -1299,7 +1299,7 @@ krb5int_copy_authdatum(krb5_context context,
+ void KRB5_CALLCONV
+ krb5_free_authdata(krb5_context context, krb5_authdata **val)
+ {
+- register krb5_authdata **temp;
++ krb5_authdata **temp;
+
+ if (val == NULL)
+ return;
+diff --git lib/krb5/krb/conv_princ.c b/src/lib/krb5/krb/conv_princ.c
+index c33c67dda..78fc2f4c6 100644
+--- lib/krb5/krb/conv_princ.c
++++ lib/krb5/krb/conv_princ.c
+@@ -130,8 +130,8 @@ static const struct krb_convert sconv_list[] = {
+ * This falls in the "should have been in the ANSI C library"
+ * category. :-)
+ */
+-static char *strnchr(register char *s, register int c,
+- register unsigned int n)
++static char *
++strnchr(char *s, int c, unsigned int n)
+ {
+ if (n < 1)
+ return 0;
+diff --git lib/krb5/krb/copy_addrs.c b/src/lib/krb5/krb/copy_addrs.c
+index 494bccf92..9c9bc7ba3 100644
+--- lib/krb5/krb/copy_addrs.c
++++ lib/krb5/krb/copy_addrs.c
+@@ -51,7 +51,7 @@ krb5_copy_addresses(krb5_context context, krb5_address *const *inaddr, krb5_addr
+ {
+ krb5_error_code retval;
+ krb5_address ** tempaddr;
+- register unsigned int nelems = 0;
++ unsigned int nelems = 0;
+
+ if (!inaddr) {
+ *outaddr = 0;
+diff --git lib/krb5/krb/copy_auth.c b/src/lib/krb5/krb/copy_auth.c
+index 06a06450c..ffb7ee9c6 100644
+--- lib/krb5/krb/copy_auth.c
++++ lib/krb5/krb/copy_auth.c
+@@ -65,7 +65,7 @@ krb5_merge_authdata(krb5_context context,
+ {
+ krb5_error_code retval;
+ krb5_authdata ** tempauthdat;
+- register unsigned int nelems = 0, nelems2 = 0;
++ unsigned int nelems = 0, nelems2 = 0;
+
+ *outauthdat = NULL;
+ if (!inauthdat1 && !inauthdat2) {
+diff --git lib/krb5/krb/copy_princ.c b/src/lib/krb5/krb/copy_princ.c
+index 0d0e6a004..81b338124 100644
+--- lib/krb5/krb/copy_princ.c
++++ lib/krb5/krb/copy_princ.c
+@@ -32,7 +32,7 @@
+ krb5_error_code KRB5_CALLCONV
+ krb5_copy_principal(krb5_context context, krb5_const_principal inprinc, krb5_principal *outprinc)
+ {
+- register krb5_principal tempprinc;
++ krb5_principal tempprinc;
+ krb5_int32 i;
+
+ tempprinc = (krb5_principal)malloc(sizeof(krb5_principal_data));
+diff --git lib/krb5/krb/decrypt_tk.c b/src/lib/krb5/krb/decrypt_tk.c
+index 51f9e8fdf..e848554e2 100644
+--- lib/krb5/krb/decrypt_tk.c
++++ lib/krb5/krb/decrypt_tk.c
+@@ -36,7 +36,8 @@
+ */
+
+ krb5_error_code KRB5_CALLCONV
+-krb5_decrypt_tkt_part(krb5_context context, const krb5_keyblock *srv_key, register krb5_ticket *ticket)
++krb5_decrypt_tkt_part(krb5_context context, const krb5_keyblock *srv_key,
++ krb5_ticket *ticket)
+ {
+ krb5_enc_tkt_part *dec_tkt_part;
+ krb5_data scratch;
+diff --git lib/krb5/krb/encrypt_tk.c b/src/lib/krb5/krb/encrypt_tk.c
+index 7fcd0ffc8..13a774f07 100644
+--- lib/krb5/krb/encrypt_tk.c
++++ lib/krb5/krb/encrypt_tk.c
+@@ -39,11 +39,12 @@
+ */
+
+ krb5_error_code
+-krb5_encrypt_tkt_part(krb5_context context, const krb5_keyblock *srv_key, register krb5_ticket *dec_ticket)
++krb5_encrypt_tkt_part(krb5_context context, const krb5_keyblock *srv_key,
++ krb5_ticket *dec_ticket)
+ {
+ krb5_data *scratch;
+ krb5_error_code retval;
+- register krb5_enc_tkt_part *dec_tkt_part = dec_ticket->enc_part2;
++ krb5_enc_tkt_part *dec_tkt_part = dec_ticket->enc_part2;
+
+ /* start by encoding the to-be-encrypted part. */
+ if ((retval = encode_krb5_enc_tkt_part(dec_tkt_part, &scratch))) {
+diff --git lib/krb5/krb/kfree.c b/src/lib/krb5/krb/kfree.c
+index 71e7fcad0..ab2409f17 100644
+--- lib/krb5/krb/kfree.c
++++ lib/krb5/krb/kfree.c
+@@ -66,7 +66,7 @@ krb5_free_address(krb5_context context, krb5_address *val)
+ void KRB5_CALLCONV
+ krb5_free_addresses(krb5_context context, krb5_address **val)
+ {
+- register krb5_address **temp;
++ krb5_address **temp;
+
+ if (val == NULL)
+ return;
+@@ -78,7 +78,7 @@ krb5_free_addresses(krb5_context context, krb5_address **val)
+ }
+
+ void KRB5_CALLCONV
+-krb5_free_ap_rep(krb5_context context, register krb5_ap_rep *val)
++krb5_free_ap_rep(krb5_context context, krb5_ap_rep *val)
+ {
+ if (val == NULL)
+ return;
+@@ -87,7 +87,7 @@ krb5_free_ap_rep(krb5_context context, register krb5_ap_rep *val)
+ }
+
+ void KRB5_CALLCONV
+-krb5_free_ap_req(krb5_context context, register krb5_ap_req *val)
++krb5_free_ap_req(krb5_context context, krb5_ap_req *val)
+ {
+ if (val == NULL)
+ return;
+@@ -130,7 +130,7 @@ krb5_free_authenticator(krb5_context context, krb5_authenticator *val)
+ }
+
+ void KRB5_CALLCONV
+-krb5_free_checksum(krb5_context context, register krb5_checksum *val)
++krb5_free_checksum(krb5_context context, krb5_checksum *val)
+ {
+ if (val == NULL)
+ return;
+@@ -139,7 +139,7 @@ krb5_free_checksum(krb5_context context, register krb5_checksum *val)
+ }
+
+ void KRB5_CALLCONV
+-krb5_free_checksum_contents(krb5_context context, register krb5_checksum *val)
++krb5_free_checksum_contents(krb5_context context, krb5_checksum *val)
+ {
+ if (val == NULL)
+ return;
+@@ -148,7 +148,7 @@ krb5_free_checksum_contents(krb5_context context, register krb5_checksum *val)
+ }
+
+ void KRB5_CALLCONV
+-krb5_free_cred(krb5_context context, register krb5_cred *val)
++krb5_free_cred(krb5_context context, krb5_cred *val)
+ {
+ if (val == NULL)
+ return;
+@@ -183,9 +183,9 @@ krb5_free_cred_contents(krb5_context context, krb5_creds *val)
+ }
+
+ void KRB5_CALLCONV
+-krb5_free_cred_enc_part(krb5_context context, register krb5_cred_enc_part *val)
++krb5_free_cred_enc_part(krb5_context context, krb5_cred_enc_part *val)
+ {
+- register krb5_cred_info **temp;
++ krb5_cred_info **temp;
+
+ if (val == NULL)
+ return;
+@@ -273,7 +273,7 @@ void krb5_free_etype_info(krb5_context context, krb5_etype_info info)
+
+
+ void KRB5_CALLCONV
+-krb5_free_enc_kdc_rep_part(krb5_context context, register krb5_enc_kdc_rep_part *val)
++krb5_free_enc_kdc_rep_part(krb5_context context, krb5_enc_kdc_rep_part *val)
+ {
+ if (val == NULL)
+ return;
+@@ -300,7 +300,7 @@ krb5_free_enc_tkt_part(krb5_context context, krb5_enc_tkt_part *val)
+
+
+ void KRB5_CALLCONV
+-krb5_free_error(krb5_context context, register krb5_error *val)
++krb5_free_error(krb5_context context, krb5_error *val)
+ {
+ if (val == NULL)
+ return;
+@@ -342,13 +342,13 @@ krb5_free_kdc_req(krb5_context context, krb5_kdc_req *val)
+ }
+
+ void KRB5_CALLCONV
+-krb5_free_keyblock_contents(krb5_context context, register krb5_keyblock *key)
++krb5_free_keyblock_contents(krb5_context context, krb5_keyblock *key)
+ {
+ krb5int_c_free_keyblock_contents (context, key);
+ }
+
+ void KRB5_CALLCONV
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-head
mailing list