Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-6]: src Apply patch (requested by dbj in ticket 1724):
details: https://anonhg.NetBSD.org/src/rev/eef445abf329
branches: netbsd-1-6
changeset: 531449:eef445abf329
user: tron <tron%NetBSD.org@localhost>
date: Fri Jul 23 15:03:55 2004 +0000
description:
Apply patch (requested by dbj in ticket 1724):
Fix problems when building the netbsd-1-6 branch with GCC 3.3.3.
diffstat:
bin/dd/strsuftoull.c | 6 +-
bin/ed/re.c | 26 +-
crypto/dist/ssh/auth-krb4.c | 24 +-
crypto/dist/ssh/auth-options.c | 6 +-
crypto/dist/ssh/auth-rh-rsa.c | 4 +-
crypto/dist/ssh/auth-rhosts.c | 8 +-
crypto/dist/ssh/auth-rsa.c | 6 +-
crypto/dist/ssh/auth.c | 24 +-
crypto/dist/ssh/auth1.c | 4 +-
crypto/dist/ssh/auth2-hostbased.c | 6 +-
crypto/dist/ssh/auth2-passwd.c | 4 +-
crypto/dist/ssh/auth2-pubkey.c | 6 +-
crypto/dist/ssh/auth2.c | 4 +-
crypto/dist/ssh/authfd.c | 12 +-
crypto/dist/ssh/bufaux.c | 4 +-
crypto/dist/ssh/canohost.c | 10 +-
crypto/dist/ssh/channels.c | 40 ++--
crypto/dist/ssh/clientloop.c | 16 +-
crypto/dist/ssh/compat.c | 4 +-
crypto/dist/ssh/dh.c | 10 +-
crypto/dist/ssh/dispatch.c | 6 +-
crypto/dist/ssh/groupaccess.c | 4 +-
crypto/dist/ssh/hostfile.c | 6 +-
crypto/dist/ssh/log.c | 4 +-
crypto/dist/ssh/log.h | 4 +-
crypto/dist/ssh/monitor.c | 6 +-
crypto/dist/ssh/nchan.c | 6 +-
crypto/dist/ssh/packet.c | 18 +-
crypto/dist/ssh/packet.h | 4 +-
crypto/dist/ssh/scard.c | 6 +-
crypto/dist/ssh/servconf.c | 4 +-
crypto/dist/ssh/session.c | 10 +-
crypto/dist/ssh/sftp-client.c | 4 +-
crypto/dist/ssh/sftp-server.c | 6 +-
crypto/dist/ssh/ssh-agent.c | 6 +-
crypto/dist/ssh/ssh-keygen.c | 4 +-
crypto/dist/ssh/ssh.c | 16 +-
crypto/dist/ssh/sshconnect.c | 20 +-
crypto/dist/ssh/sshconnect1.c | 24 +-
crypto/dist/ssh/sshconnect2.c | 14 +-
crypto/dist/ssh/sshd.c | 28 +-
crypto/dist/ssh/sshlogin.c | 4 +-
crypto/dist/ssh/ttymodes.c | 14 +-
dist/am-utils/fsinfo/fsi_analyze.c | 40 ++--
dist/am-utils/fsinfo/fsi_util.c | 6 +-
dist/am-utils/fsinfo/fsinfo.c | 6 +-
dist/am-utils/fsinfo/fsinfo.h | 4 +-
dist/am-utils/fsinfo/wr_fstab.c | 4 +-
games/cribbage/cribbage.h | 4 +-
games/cribbage/extern.c | 6 +-
games/cribbage/score.c | 32 ++--
games/cribbage/support.c | 6 +-
gnu/dist/map-mbone/mapper.c | 36 ++--
gnu/dist/mrinfo/mrinfo.c | 22 +-
gnu/dist/mrouted/callout.c | 8 +-
gnu/dist/mrouted/cfparse.y | 14 +-
gnu/dist/mrouted/config.c | 12 +-
gnu/dist/mrouted/defs.h | 4 +-
gnu/dist/mrouted/igmp.c | 22 +-
gnu/dist/mrouted/kern.c | 30 ++--
gnu/dist/mrouted/main.c | 30 ++--
gnu/dist/mrouted/prune.c | 154 ++++++++++----------
gnu/dist/mrouted/route.c | 26 +-
gnu/dist/mrouted/rsrr.c | 46 +++---
gnu/dist/mrouted/vif.c | 72 ++++----
gnu/dist/mtrace/mtrace.c | 12 +-
gnu/usr.sbin/mrouted/Makefile | 4 +-
lib/libcompat/regexp/regexp.c | 16 +-
libexec/ftpd/ftpd.c | 14 +-
libexec/rexecd/rexecd.c | 32 ++--
libexec/uucpd/uucpd.c | 26 +-
sbin/savecore/savecore.c | 5 +-
sys/arch/sbmips/sbmips/sb1250_icu.c | 4 +-
usr.bin/make/suff.c | 18 +-
usr.bin/rdist/defs.h | 4 +-
usr.bin/rdist/docmd.c | 10 +-
usr.bin/rdist/server.c | 33 ++--
usr.bin/xlint/xlint/xlint.c | 6 +-
usr.sbin/isdn/isdnd/alias.c | 10 +-
usr.sbin/isdn/isdnd/controller.c | 72 ++++----
usr.sbin/isdn/isdnd/curses.c | 20 +-
usr.sbin/isdn/isdnd/dial.c | 22 +-
usr.sbin/isdn/isdnd/exec.c | 36 ++--
usr.sbin/isdn/isdnd/fsm.c | 54 +++---
usr.sbin/isdn/isdnd/holiday.c | 16 +-
usr.sbin/isdn/isdnd/isdnd.h | 4 +-
usr.sbin/isdn/isdnd/log.c | 6 +-
usr.sbin/isdn/isdnd/main.c | 46 +++---
usr.sbin/isdn/isdnd/monitor.c | 54 +++---
usr.sbin/isdn/isdnd/msghdl.c | 160 ++++++++++----------
usr.sbin/isdn/isdnd/process.c | 34 ++--
usr.sbin/isdn/isdnd/rates.c | 48 +++---
usr.sbin/isdn/isdnd/rc_config.c | 270 ++++++++++++++++++------------------
usr.sbin/isdn/isdnd/support.c | 138 +++++++++---------
usr.sbin/isdn/isdnd/timer.c | 52 +++---
usr.sbin/pppd/chat/chat.c | 64 ++++----
96 files changed, 1159 insertions(+), 1157 deletions(-)
diffs (truncated from 9401 to 300 lines):
diff -r 15f9e84cfb7f -r eef445abf329 bin/dd/strsuftoull.c
--- a/bin/dd/strsuftoull.c Fri Jul 23 14:35:52 2004 +0000
+++ b/bin/dd/strsuftoull.c Fri Jul 23 15:03:55 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: strsuftoull.c,v 1.7 2002/01/31 22:43:33 tv Exp $ */
+/* $NetBSD: strsuftoull.c,v 1.7.2.1 2004/07/23 15:03:55 tron Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -75,7 +75,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: strsuftoull.c,v 1.7 2002/01/31 22:43:33 tv Exp $");
+__RCSID("$NetBSD: strsuftoull.c,v 1.7.2.1 2004/07/23 15:03:55 tron Exp $");
#endif /* not lint */
#if HAVE_CONFIG_H
@@ -179,7 +179,7 @@
break;
case 't':
t = num;
- num *= 1099511627776; /* 1 terabyte */
+ num *= 1099511627776LL; /* 1 terabyte */
if (t > num)
goto erange;
++expr;
diff -r 15f9e84cfb7f -r eef445abf329 bin/ed/re.c
--- a/bin/ed/re.c Fri Jul 23 14:35:52 2004 +0000
+++ b/bin/ed/re.c Fri Jul 23 15:03:55 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: re.c,v 1.17 2002/01/23 19:07:33 atatat Exp $ */
+/* $NetBSD: re.c,v 1.17.2.1 2004/07/23 15:03:55 tron Exp $ */
/* re.c: This file contains the regular expression interface routines for
the ed line editor. */
@@ -33,7 +33,7 @@
#if 0
static char *rcsid = "@(#)re.c,v 1.6 1994/02/01 00:34:43 alm Exp";
#else
-__RCSID("$NetBSD: re.c,v 1.17 2002/01/23 19:07:33 atatat Exp $");
+__RCSID("$NetBSD: re.c,v 1.17.2.1 2004/07/23 15:03:55 tron Exp $");
#endif
#endif /* not lint */
@@ -47,7 +47,7 @@
pattern_t *
get_compiled_pattern()
{
- static pattern_t *exp = NULL;
+ static pattern_t *expr = NULL;
char *exps;
char delimiter;
@@ -57,25 +57,25 @@
sprintf(errmsg, "invalid pattern delimiter");
return NULL;
} else if (delimiter == '\n' || *++ibufp == '\n' || *ibufp == delimiter) {
- if (!exp) sprintf(errmsg, "no previous pattern");
- return exp;
+ if (!expr) sprintf(errmsg, "no previous pattern");
+ return expr;
} else if ((exps = extract_pattern(delimiter)) == NULL)
return NULL;
/* buffer alloc'd && not reserved */
- if (exp && !patlock)
- regfree(exp);
- else if ((exp = (pattern_t *) malloc(sizeof(pattern_t))) == NULL) {
+ if (expr && !patlock)
+ regfree(expr);
+ else if ((expr = (pattern_t *) malloc(sizeof(pattern_t))) == NULL) {
fprintf(stderr, "%s\n", strerror(errno));
sprintf(errmsg, "out of memory");
return NULL;
}
patlock = 0;
- if ((n = regcomp(exp, exps, ere)) != 0) {
- regerror(n, exp, errmsg, sizeof errmsg);
- free(exp);
- return exp = NULL;
+ if ((n = regcomp(expr, exps, ere)) != 0) {
+ regerror(n, expr, errmsg, sizeof errmsg);
+ free(expr);
+ return expr = NULL;
}
- return exp;
+ return expr;
}
diff -r 15f9e84cfb7f -r eef445abf329 crypto/dist/ssh/auth-krb4.c
--- a/crypto/dist/ssh/auth-krb4.c Fri Jul 23 14:35:52 2004 +0000
+++ b/crypto/dist/ssh/auth-krb4.c Fri Jul 23 15:03:55 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auth-krb4.c,v 1.6.2.1 2002/06/26 16:52:37 tv Exp $ */
+/* $NetBSD: auth-krb4.c,v 1.6.2.2 2004/07/23 15:03:55 tron Exp $ */
/*
* Copyright (c) 1999 Dug Song. All rights reserved.
*
@@ -79,7 +79,7 @@
return (1);
}
/* Failure - cancel cleanup function, leaving ticket for inspection. */
- log("WARNING: bad ticket file %s", authctxt->krb4_ticket_file);
+ logit("WARNING: bad ticket file %s", authctxt->krb4_ticket_file);
fatal_remove_cleanup(krb4_cleanup_proc, authctxt);
cleanup_registered = 0;
@@ -115,7 +115,7 @@
if (pw->pw_uid != 0 && krb_get_lrealm(realm, 1) == KSUCCESS) {
/* Set up our ticket file. */
if (!krb4_init(authctxt)) {
- log("Couldn't initialize Kerberos ticket file for %s!",
+ logit("Couldn't initialize Kerberos ticket file for %s!",
pw->pw_name);
goto failure;
}
@@ -142,7 +142,7 @@
if (r == KSUCCESS) {
if ((hp = gethostbyname(localhost)) == NULL) {
- log("Couldn't get local host address!");
+ logit("Couldn't get local host address!");
goto failure;
}
memmove((void *)&faddr, (void *)hp->h_addr,
@@ -156,12 +156,12 @@
* Probably didn't have a srvtab on
* localhost. Disallow login.
*/
- log("Kerberos v4 TGT for %s unverifiable, "
+ logit("Kerberos v4 TGT for %s unverifiable, "
"no srvtab installed? krb_rd_req: %s",
pw->pw_name, krb_err_txt[r]);
goto failure;
} else if (r != KSUCCESS) {
- log("Kerberos v4 %s ticket unverifiable: %s",
+ logit("Kerberos v4 %s ticket unverifiable: %s",
KRB4_SERVICE_NAME, krb_err_txt[r]);
goto failure;
}
@@ -170,7 +170,7 @@
* Disallow login if no rcmd service exists, and
* log the error.
*/
- log("Kerberos v4 TGT for %s unverifiable: %s; %s.%s "
+ logit("Kerberos v4 TGT for %s unverifiable: %s; %s.%s "
"not registered, or srvtab is wrong?", pw->pw_name,
krb_err_txt[r], KRB4_SERVICE_NAME, phost);
goto failure;
@@ -251,7 +251,7 @@
/* Check ~/.klogin authorization now. */
if (kuserok(&adat, authctxt->user) != KSUCCESS) {
- log("Kerberos v4 .klogin authorization failed for %s to "
+ logit("Kerberos v4 .klogin authorization failed for %s to "
"account %s", *client, authctxt->user);
xfree(*client);
*client = NULL;
@@ -296,14 +296,14 @@
temporarily_use_uid(pw);
if (!radix_to_creds(string, &creds)) {
- log("Protocol error decoding Kerberos v4 TGT");
+ logit("Protocol error decoding Kerberos v4 TGT");
goto failure;
}
if (strncmp(creds.service, "", 1) == 0) /* backward compatibility */
strlcpy(creds.service, "krbtgt", sizeof creds.service);
if (strcmp(creds.service, "krbtgt")) {
- log("Kerberos v4 TGT (%s%s%s@%s) rejected for %s",
+ logit("Kerberos v4 TGT (%s%s%s@%s) rejected for %s",
creds.pname, creds.pinst[0] ? "." : "", creds.pinst,
creds.realm, pw->pw_name);
goto failure;
@@ -350,7 +350,7 @@
return (0);
if (!radix_to_creds(token_string, &creds)) {
- log("Protocol error decoding AFS token");
+ logit("Protocol error decoding AFS token");
return (0);
}
if (strncmp(creds.service, "", 1) == 0) /* backward compatibility */
@@ -362,7 +362,7 @@
uid = pw->pw_uid;
if (kafs_settoken(creds.realm, uid, &creds)) {
- log("AFS token (%s@%s) rejected for %s",
+ logit("AFS token (%s@%s) rejected for %s",
creds.pname, creds.realm, pw->pw_name);
memset(&creds, 0, sizeof(creds));
return (0);
diff -r 15f9e84cfb7f -r eef445abf329 crypto/dist/ssh/auth-options.c
--- a/crypto/dist/ssh/auth-options.c Fri Jul 23 14:35:52 2004 +0000
+++ b/crypto/dist/ssh/auth-options.c Fri Jul 23 15:03:55 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auth-options.c,v 1.1.1.10.2.1 2002/06/26 16:52:38 tv Exp $ */
+/* $NetBSD: auth-options.c,v 1.1.1.10.2.2 2004/07/23 15:03:55 tron Exp $ */
/*
* Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
* Copyright (c) 1995 Tatu Ylonen <ylo%cs.hut.fi@localhost>, Espoo, Finland
@@ -203,7 +203,7 @@
if (match_host_and_ip(remote_host, remote_ip,
patterns) != 1) {
xfree(patterns);
- log("Authentication tried for %.100s with "
+ logit("Authentication tried for %.100s with "
"correct key but not from a permitted "
"host (host=%.200s, ip=%.200s).",
pw->pw_name, remote_host, remote_ip);
@@ -289,7 +289,7 @@
return 1;
bad_option:
- log("Bad options in %.100s file, line %lu: %.50s",
+ logit("Bad options in %.100s file, line %lu: %.50s",
file, linenum, opts);
auth_debug_add("Bad options in %.100s file, line %lu: %.50s",
file, linenum, opts);
diff -r 15f9e84cfb7f -r eef445abf329 crypto/dist/ssh/auth-rh-rsa.c
--- a/crypto/dist/ssh/auth-rh-rsa.c Fri Jul 23 14:35:52 2004 +0000
+++ b/crypto/dist/ssh/auth-rh-rsa.c Fri Jul 23 15:03:55 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auth-rh-rsa.c,v 1.1.1.8 2002/04/22 07:35:43 itojun Exp $ */
+/* $NetBSD: auth-rh-rsa.c,v 1.1.1.8.2.1 2004/07/23 15:03:55 tron Exp $ */
/*
* Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
* Copyright (c) 1995 Tatu Ylonen <ylo%cs.hut.fi@localhost>, Espoo, Finland
@@ -76,7 +76,7 @@
/* Perform the challenge-response dialog with the client for the host key. */
if (!auth_rsa_challenge_dialog(client_host_key)) {
- log("Client on %.800s failed to respond correctly to host authentication.",
+ logit("Client on %.800s failed to respond correctly to host authentication.",
chost);
return 0;
}
diff -r 15f9e84cfb7f -r eef445abf329 crypto/dist/ssh/auth-rhosts.c
--- a/crypto/dist/ssh/auth-rhosts.c Fri Jul 23 14:35:52 2004 +0000
+++ b/crypto/dist/ssh/auth-rhosts.c Fri Jul 23 15:03:55 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auth-rhosts.c,v 1.10.2.2 2002/06/26 16:52:40 tv Exp $ */
+/* $NetBSD: auth-rhosts.c,v 1.10.2.3 2004/07/23 15:03:55 tron Exp $ */
/*
* Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
* Copyright (c) 1995 Tatu Ylonen <ylo%cs.hut.fi@localhost>, Espoo, Finland
@@ -221,7 +221,7 @@
* not group or world writable.
*/
if (stat(pw->pw_dir, &st) < 0) {
- log("Rhosts authentication refused for %.100s: "
+ logit("Rhosts authentication refused for %.100s: "
"no home directory %.200s", pw->pw_name, pw->pw_dir);
auth_debug_add("Rhosts authentication refused for %.100s: "
"no home directory %.200s", pw->pw_name, pw->pw_dir);
@@ -230,7 +230,7 @@
if (options.strict_modes &&
((st.st_uid != 0 && st.st_uid != pw->pw_uid) ||
(st.st_mode & 022) != 0)) {
- log("Rhosts authentication refused for %.100s: "
+ logit("Rhosts authentication refused for %.100s: "
"bad ownership or modes for home directory.", pw->pw_name);
auth_debug_add("Rhosts authentication refused for %.100s: "
"bad ownership or modes for home directory.", pw->pw_name);
@@ -257,7 +257,7 @@
if (options.strict_modes &&
((st.st_uid != 0 && st.st_uid != pw->pw_uid) ||
(st.st_mode & 022) != 0)) {
- log("Rhosts authentication refused for %.100s: bad modes for %.200s",
+ logit("Rhosts authentication refused for %.100s: bad modes for %.200s",
pw->pw_name, buf);
auth_debug_add("Bad file modes for %.200s", buf);
continue;
diff -r 15f9e84cfb7f -r eef445abf329 crypto/dist/ssh/auth-rsa.c
--- a/crypto/dist/ssh/auth-rsa.c Fri Jul 23 14:35:52 2004 +0000
+++ b/crypto/dist/ssh/auth-rsa.c Fri Jul 23 15:03:55 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auth-rsa.c,v 1.1.1.10.2.1 2002/06/26 16:52:41 tv Exp $ */
+/* $NetBSD: auth-rsa.c,v 1.1.1.10.2.2 2004/07/23 15:03:55 tron Exp $ */
/*
* Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
* Copyright (c) 1995 Tatu Ylonen <ylo%cs.hut.fi@localhost>, Espoo, Finland
@@ -188,7 +188,7 @@
secure_filename(f, file, pw, line, sizeof(line)) != 0) {
xfree(file);
fclose(f);
- log("Authentication refused: %s", line);
+ logit("Authentication refused: %s", line);
restore_uid();
return (0);
}
@@ -247,7 +247,7 @@
/* check the real bits */
if (bits != BN_num_bits(key->rsa->n))
- log("Warning: %s, line %lu: keysize mismatch: "
+ logit("Warning: %s, line %lu: keysize mismatch: "
"actual %d vs. announced %d.",
Home |
Main Index |
Thread Index |
Old Index