Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/crypto/external/bsd/openssh - Merge conflicts
details: https://anonhg.NetBSD.org/src/rev/adb4716bed0f
branches: trunk
changeset: 767621:adb4716bed0f
user: christos <christos%NetBSD.org@localhost>
date: Mon Jul 25 03:03:09 2011 +0000
description:
- Merge conflicts
- WARNS=5
diffstat:
crypto/external/bsd/openssh/Makefile.inc | 4 +-
crypto/external/bsd/openssh/bin/sshd/Makefile | 5 +-
crypto/external/bsd/openssh/dist/LICENCE | 1 +
crypto/external/bsd/openssh/dist/OVERVIEW | 1 +
crypto/external/bsd/openssh/dist/PROTOCOL | 1 +
crypto/external/bsd/openssh/dist/PROTOCOL.agent | 1 +
crypto/external/bsd/openssh/dist/PROTOCOL.certkeys | 1 +
crypto/external/bsd/openssh/dist/PROTOCOL.mux | 1 +
crypto/external/bsd/openssh/dist/README | 1 +
crypto/external/bsd/openssh/dist/atomicio.c | 37 +-
crypto/external/bsd/openssh/dist/atomicio.h | 10 +-
crypto/external/bsd/openssh/dist/auth-chall.c | 6 +-
crypto/external/bsd/openssh/dist/auth-krb5.c | 12 +-
crypto/external/bsd/openssh/dist/auth-options.c | 17 +-
crypto/external/bsd/openssh/dist/auth-options.h | 4 +-
crypto/external/bsd/openssh/dist/auth-pam.h | 1 +
crypto/external/bsd/openssh/dist/auth-rh-rsa.c | 6 +-
crypto/external/bsd/openssh/dist/auth-rsa.c | 21 +-
crypto/external/bsd/openssh/dist/auth.c | 61 +-
crypto/external/bsd/openssh/dist/auth.h | 10 +-
crypto/external/bsd/openssh/dist/auth1.c | 18 +-
crypto/external/bsd/openssh/dist/auth2-chall.c | 8 +-
crypto/external/bsd/openssh/dist/auth2-hostbased.c | 6 +-
crypto/external/bsd/openssh/dist/auth2-jpake.c | 9 +-
crypto/external/bsd/openssh/dist/auth2-pubkey.c | 14 +-
crypto/external/bsd/openssh/dist/auth2.c | 16 +-
crypto/external/bsd/openssh/dist/authfd.c | 24 +-
crypto/external/bsd/openssh/dist/authfile.c | 512 +++++++++------
crypto/external/bsd/openssh/dist/bufaux.c | 39 +-
crypto/external/bsd/openssh/dist/bufec.c | 3 +
crypto/external/bsd/openssh/dist/buffer.h | 13 +-
crypto/external/bsd/openssh/dist/canohost.c | 6 +-
crypto/external/bsd/openssh/dist/channels.c | 34 +-
crypto/external/bsd/openssh/dist/channels.h | 15 +-
crypto/external/bsd/openssh/dist/cipher-3des1.c | 10 +-
crypto/external/bsd/openssh/dist/cipher-bf1.c | 9 +-
crypto/external/bsd/openssh/dist/cipher-ctr-mt.c | 1 +
crypto/external/bsd/openssh/dist/cipher-ctr.c | 6 +-
crypto/external/bsd/openssh/dist/cipher.c | 14 +-
crypto/external/bsd/openssh/dist/cipher.h | 4 +-
crypto/external/bsd/openssh/dist/clientloop.c | 155 ++--
crypto/external/bsd/openssh/dist/clientloop.h | 4 +-
crypto/external/bsd/openssh/dist/compat.c | 10 +-
crypto/external/bsd/openssh/dist/compat.h | 4 +-
crypto/external/bsd/openssh/dist/compress.c | 9 +-
crypto/external/bsd/openssh/dist/dh.c | 8 +-
crypto/external/bsd/openssh/dist/dns.c | 7 +-
crypto/external/bsd/openssh/dist/fmt_scaled.h | 1 +
crypto/external/bsd/openssh/dist/gss-genr.c | 4 +-
crypto/external/bsd/openssh/dist/gss-serv-krb5.c | 8 +-
crypto/external/bsd/openssh/dist/gss-serv.c | 6 +-
crypto/external/bsd/openssh/dist/hostfile.c | 308 +++++---
crypto/external/bsd/openssh/dist/hostfile.h | 32 +-
crypto/external/bsd/openssh/dist/includes.h | 1 +
crypto/external/bsd/openssh/dist/jpake.c | 13 +-
crypto/external/bsd/openssh/dist/kex.c | 48 +-
crypto/external/bsd/openssh/dist/kex.h | 25 +-
crypto/external/bsd/openssh/dist/kexdhc.c | 8 +-
crypto/external/bsd/openssh/dist/kexdhs.c | 8 +-
crypto/external/bsd/openssh/dist/kexecdh.c | 3 +
crypto/external/bsd/openssh/dist/kexecdhc.c | 3 +
crypto/external/bsd/openssh/dist/kexecdhs.c | 3 +
crypto/external/bsd/openssh/dist/kexgexc.c | 8 +-
crypto/external/bsd/openssh/dist/kexgexs.c | 8 +-
crypto/external/bsd/openssh/dist/key.c | 621 +++++++++++++++++-
crypto/external/bsd/openssh/dist/key.h | 29 +-
crypto/external/bsd/openssh/dist/log.c | 11 +-
crypto/external/bsd/openssh/dist/log.h | 4 +-
crypto/external/bsd/openssh/dist/mac.c | 6 +-
crypto/external/bsd/openssh/dist/misc.c | 144 ++++-
crypto/external/bsd/openssh/dist/misc.h | 21 +-
crypto/external/bsd/openssh/dist/moduli | 1 +
crypto/external/bsd/openssh/dist/moduli.c | 12 +-
crypto/external/bsd/openssh/dist/monitor.c | 27 +-
crypto/external/bsd/openssh/dist/monitor_wrap.c | 9 +-
crypto/external/bsd/openssh/dist/monitor_wrap.h | 4 +-
crypto/external/bsd/openssh/dist/mux.c | 64 +-
crypto/external/bsd/openssh/dist/myproposal.h | 28 +-
crypto/external/bsd/openssh/dist/nchan.c | 8 +-
crypto/external/bsd/openssh/dist/openssh2netbsd | 38 +-
crypto/external/bsd/openssh/dist/packet.c | 59 +-
crypto/external/bsd/openssh/dist/packet.h | 10 +-
crypto/external/bsd/openssh/dist/pathnames.h | 6 +-
crypto/external/bsd/openssh/dist/pkcs11.h | 1 +
crypto/external/bsd/openssh/dist/progressmeter.c | 6 +-
crypto/external/bsd/openssh/dist/readconf.c | 65 +-
crypto/external/bsd/openssh/dist/readconf.h | 7 +-
crypto/external/bsd/openssh/dist/readpass.c | 36 +-
crypto/external/bsd/openssh/dist/roaming_dummy.c | 1 +
crypto/external/bsd/openssh/dist/roaming_serv.c | 1 +
crypto/external/bsd/openssh/dist/schnorr.c | 42 +-
crypto/external/bsd/openssh/dist/schnorr.h | 1 +
crypto/external/bsd/openssh/dist/scp.1 | 17 +-
crypto/external/bsd/openssh/dist/scp.c | 270 ++++---
crypto/external/bsd/openssh/dist/servconf.c | 86 ++-
crypto/external/bsd/openssh/dist/servconf.h | 7 +-
crypto/external/bsd/openssh/dist/session.c | 40 +-
crypto/external/bsd/openssh/dist/sftp-client.c | 274 +++++---
crypto/external/bsd/openssh/dist/sftp-client.h | 17 +-
crypto/external/bsd/openssh/dist/sftp-glob.c | 10 +-
crypto/external/bsd/openssh/dist/sftp-server.c | 48 +-
crypto/external/bsd/openssh/dist/sftp.1 | 31 +-
crypto/external/bsd/openssh/dist/sftp.c | 180 +++--
crypto/external/bsd/openssh/dist/ssh-add.1 | 18 +-
crypto/external/bsd/openssh/dist/ssh-add.c | 11 +-
crypto/external/bsd/openssh/dist/ssh-agent.1 | 21 +-
crypto/external/bsd/openssh/dist/ssh-agent.c | 71 +-
crypto/external/bsd/openssh/dist/ssh-dss.c | 8 +-
crypto/external/bsd/openssh/dist/ssh-ecdsa.c | 3 +
crypto/external/bsd/openssh/dist/ssh-gss.h | 6 +-
crypto/external/bsd/openssh/dist/ssh-keygen.1 | 82 +-
crypto/external/bsd/openssh/dist/ssh-keygen.c | 68 +-
crypto/external/bsd/openssh/dist/ssh-keyscan.1 | 22 +-
crypto/external/bsd/openssh/dist/ssh-keyscan.c | 24 +-
crypto/external/bsd/openssh/dist/ssh-keysign.8 | 8 +-
crypto/external/bsd/openssh/dist/ssh-keysign.c | 8 +-
crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.8 | 1 +
crypto/external/bsd/openssh/dist/ssh-pkcs11.c | 6 +-
crypto/external/bsd/openssh/dist/ssh-pkcs11.h | 1 +
crypto/external/bsd/openssh/dist/ssh-rsa.c | 8 +-
crypto/external/bsd/openssh/dist/ssh.1 | 44 +-
crypto/external/bsd/openssh/dist/ssh.c | 89 +-
crypto/external/bsd/openssh/dist/ssh2.h | 8 +-
crypto/external/bsd/openssh/dist/ssh_config.5 | 78 ++-
crypto/external/bsd/openssh/dist/sshconnect.c | 313 +++++----
crypto/external/bsd/openssh/dist/sshconnect.h | 14 +-
crypto/external/bsd/openssh/dist/sshconnect2.c | 71 ++-
crypto/external/bsd/openssh/dist/sshd.8 | 22 +-
crypto/external/bsd/openssh/dist/sshd.c | 28 +-
crypto/external/bsd/openssh/dist/sshd_config | 5 +-
crypto/external/bsd/openssh/dist/sshd_config.5 | 62 +-
crypto/external/bsd/openssh/dist/sshlogin.c | 8 +-
crypto/external/bsd/openssh/dist/uuencode.c | 8 +-
crypto/external/bsd/openssh/dist/uuencode.h | 6 +-
crypto/external/bsd/openssh/dist/version.h | 10 +-
crypto/external/bsd/openssh/lib/Makefile | 70 +-
crypto/external/bsd/openssh/lib/shlib_version | 4 +-
137 files changed, 3470 insertions(+), 1624 deletions(-)
diffs (truncated from 11365 to 300 lines):
diff -r 7b29f76c5262 -r adb4716bed0f crypto/external/bsd/openssh/Makefile.inc
--- a/crypto/external/bsd/openssh/Makefile.inc Mon Jul 25 00:06:49 2011 +0000
+++ b/crypto/external/bsd/openssh/Makefile.inc Mon Jul 25 03:03:09 2011 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.3 2011/04/24 14:09:39 elric Exp $
+# $NetBSD: Makefile.inc,v 1.4 2011/07/25 03:03:09 christos Exp $
-WARNS?= 1 # XXX -Wshadow -Wcast-qual
+WARNS?= 5
.include <bsd.own.mk>
diff -r 7b29f76c5262 -r adb4716bed0f crypto/external/bsd/openssh/bin/sshd/Makefile
--- a/crypto/external/bsd/openssh/bin/sshd/Makefile Mon Jul 25 00:06:49 2011 +0000
+++ b/crypto/external/bsd/openssh/bin/sshd/Makefile Mon Jul 25 03:03:09 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/06/20 07:43:56 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2011/07/25 03:03:10 christos Exp $
.include <bsd.own.mk>
@@ -14,7 +14,8 @@
auth-skey.c auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c \
auth2-none.c auth2-passwd.c auth2-pubkey.c \
monitor_mm.c monitor.c monitor_wrap.c \
- kexdhs.c kexgexs.c sftp-server.c sftp-common.c auth2-jpake.c \
+ kexdhs.c kexgexs.c kexecdhs.c sftp-server.c sftp-common.c \
+ auth2-jpake.c \
roaming_common.c roaming_serv.c
.if defined(HAVE_GCC) || defined(HAVE_PCC)
diff -r 7b29f76c5262 -r adb4716bed0f crypto/external/bsd/openssh/dist/LICENCE
--- a/crypto/external/bsd/openssh/dist/LICENCE Mon Jul 25 00:06:49 2011 +0000
+++ b/crypto/external/bsd/openssh/dist/LICENCE Mon Jul 25 03:03:09 2011 +0000
@@ -204,3 +204,4 @@
------
$OpenBSD: LICENCE,v 1.19 2004/08/30 09:18:08 markus Exp $
+$NetBSD: LICENCE,v 1.2 2011/07/25 03:03:10 christos Exp $
diff -r 7b29f76c5262 -r adb4716bed0f crypto/external/bsd/openssh/dist/OVERVIEW
--- a/crypto/external/bsd/openssh/dist/OVERVIEW Mon Jul 25 00:06:49 2011 +0000
+++ b/crypto/external/bsd/openssh/dist/OVERVIEW Mon Jul 25 03:03:09 2011 +0000
@@ -166,3 +166,4 @@
xmalloc.c "safe" malloc routines
$OpenBSD: OVERVIEW,v 1.11 2006/08/03 03:34:41 deraadt Exp $
+$NetBSD: OVERVIEW,v 1.2 2011/07/25 03:03:10 christos Exp $
diff -r 7b29f76c5262 -r adb4716bed0f crypto/external/bsd/openssh/dist/PROTOCOL
--- a/crypto/external/bsd/openssh/dist/PROTOCOL Mon Jul 25 00:06:49 2011 +0000
+++ b/crypto/external/bsd/openssh/dist/PROTOCOL Mon Jul 25 03:03:09 2011 +0000
@@ -292,3 +292,4 @@
"1".
$OpenBSD: PROTOCOL,v 1.17 2010/12/04 00:18:01 djm Exp $
+$NetBSD: PROTOCOL,v 1.2 2011/07/25 03:03:10 christos Exp $
diff -r 7b29f76c5262 -r adb4716bed0f crypto/external/bsd/openssh/dist/PROTOCOL.agent
--- a/crypto/external/bsd/openssh/dist/PROTOCOL.agent Mon Jul 25 00:06:49 2011 +0000
+++ b/crypto/external/bsd/openssh/dist/PROTOCOL.agent Mon Jul 25 03:03:09 2011 +0000
@@ -558,3 +558,4 @@
SSH_AGENT_CONSTRAIN_CONFIRM 2
$OpenBSD: PROTOCOL.agent,v 1.6 2010/08/31 11:54:45 djm Exp $
+$NetBSD: PROTOCOL.agent,v 1.2 2011/07/25 03:03:10 christos Exp $
diff -r 7b29f76c5262 -r adb4716bed0f crypto/external/bsd/openssh/dist/PROTOCOL.certkeys
--- a/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys Mon Jul 25 00:06:49 2011 +0000
+++ b/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys Mon Jul 25 03:03:09 2011 +0000
@@ -254,3 +254,4 @@
this option is not present.
$OpenBSD: PROTOCOL.certkeys,v 1.8 2010/08/31 11:54:45 djm Exp $
+$NetBSD: PROTOCOL.certkeys,v 1.2 2011/07/25 03:03:10 christos Exp $
diff -r 7b29f76c5262 -r adb4716bed0f crypto/external/bsd/openssh/dist/PROTOCOL.mux
--- a/crypto/external/bsd/openssh/dist/PROTOCOL.mux Mon Jul 25 00:06:49 2011 +0000
+++ b/crypto/external/bsd/openssh/dist/PROTOCOL.mux Mon Jul 25 03:03:09 2011 +0000
@@ -201,3 +201,4 @@
XXX send signals via mux
$OpenBSD: PROTOCOL.mux,v 1.4 2011/01/31 21:42:15 djm Exp $
+$NetBSD: PROTOCOL.mux,v 1.2 2011/07/25 03:03:10 christos Exp $
diff -r 7b29f76c5262 -r adb4716bed0f crypto/external/bsd/openssh/dist/README
--- a/crypto/external/bsd/openssh/dist/README Mon Jul 25 00:06:49 2011 +0000
+++ b/crypto/external/bsd/openssh/dist/README Mon Jul 25 03:03:09 2011 +0000
@@ -25,3 +25,4 @@
See http://www.openssh.com/ for more information.
$OpenBSD: README,v 1.7 2006/04/01 05:37:46 djm Exp $
+$NetBSD: README,v 1.2 2011/07/25 03:03:10 christos Exp $
diff -r 7b29f76c5262 -r adb4716bed0f crypto/external/bsd/openssh/dist/atomicio.c
--- a/crypto/external/bsd/openssh/dist/atomicio.c Mon Jul 25 00:06:49 2011 +0000
+++ b/crypto/external/bsd/openssh/dist/atomicio.c Mon Jul 25 03:03:09 2011 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: atomicio.c,v 1.2 2009/06/07 22:38:46 christos Exp $ */
-/* $OpenBSD: atomicio.c,v 1.25 2007/06/25 12:02:27 dtucker Exp $ */
+/* $NetBSD: atomicio.c,v 1.3 2011/07/25 03:03:10 christos Exp $ */
+/* $OpenBSD: atomicio.c,v 1.26 2010/09/22 22:58:51 djm Exp $ */
/*
* Copyright (c) 2006 Damien Miller. All rights reserved.
* Copyright (c) 2005 Anil Madhavapeddy. All rights reserved.
@@ -28,7 +28,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: atomicio.c,v 1.2 2009/06/07 22:38:46 christos Exp $");
+__RCSID("$NetBSD: atomicio.c,v 1.3 2011/07/25 03:03:10 christos Exp $");
#include <sys/param.h>
#include <sys/uio.h>
@@ -43,7 +43,8 @@
* ensure all of data on socket comes through. f==read || f==vwrite
*/
size_t
-atomicio(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n)
+atomicio6(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n,
+ int (*cb)(void *, size_t), void *cb_arg)
{
char *s = _s;
size_t pos = 0;
@@ -68,17 +69,28 @@
return pos;
default:
pos += (size_t)res;
+ if (cb != NULL && cb(cb_arg, (size_t)res) == -1) {
+ errno = EINTR;
+ return pos;
+ }
}
}
- return (pos);
+ return pos;
+}
+
+size_t
+atomicio(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n)
+{
+ return atomicio6(f, fd, _s, n, NULL, NULL);
}
/*
* ensure all of data on socket comes through. f==readv || f==writev
*/
size_t
-atomiciov(ssize_t (*f) (int, const struct iovec *, int), int fd,
- const struct iovec *_iov, int iovcnt)
+atomiciov6(ssize_t (*f) (int, const struct iovec *, int), int fd,
+ const struct iovec *_iov, int iovcnt,
+ int (*cb)(void *, size_t), void *cb_arg)
{
size_t pos = 0, rem;
ssize_t res;
@@ -128,6 +140,17 @@
iov[0].iov_base = ((char *)iov[0].iov_base) + rem;
iov[0].iov_len -= rem;
}
+ if (cb != NULL && cb(cb_arg, (size_t)res) == -1) {
+ errno = EINTR;
+ return pos;
+ }
}
return pos;
}
+
+size_t
+atomiciov(ssize_t (*f) (int, const struct iovec *, int), int fd,
+ const struct iovec *_iov, int iovcnt)
+{
+ return atomiciov6(f, fd, _iov, iovcnt, NULL, NULL);
+}
diff -r 7b29f76c5262 -r adb4716bed0f crypto/external/bsd/openssh/dist/atomicio.h
--- a/crypto/external/bsd/openssh/dist/atomicio.h Mon Jul 25 00:06:49 2011 +0000
+++ b/crypto/external/bsd/openssh/dist/atomicio.h Mon Jul 25 03:03:09 2011 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: atomicio.h,v 1.2 2009/06/07 22:38:46 christos Exp $ */
-/* $OpenBSD: atomicio.h,v 1.10 2006/08/03 03:34:41 deraadt Exp $ */
+/* $NetBSD: atomicio.h,v 1.3 2011/07/25 03:03:10 christos Exp $ */
+/* $OpenBSD: atomicio.h,v 1.11 2010/09/22 22:58:51 djm Exp $ */
/*
* Copyright (c) 2006 Damien Miller. All rights reserved.
@@ -33,6 +33,9 @@
/*
* Ensure all of data on socket comes through. f==read || f==vwrite
*/
+size_t
+atomicio6(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n,
+ int (*cb)(void *, size_t), void *);
size_t atomicio(ssize_t (*)(int, void *, size_t), int, void *, size_t);
#define vwrite (ssize_t (*)(int, void *, size_t))write
@@ -40,6 +43,9 @@
/*
* ensure all of data on socket comes through. f==readv || f==writev
*/
+size_t
+atomiciov6(ssize_t (*f) (int, const struct iovec *, int), int fd,
+ const struct iovec *_iov, int iovcnt, int (*cb)(void *, size_t), void *);
size_t atomiciov(ssize_t (*)(int, const struct iovec *, int),
int, const struct iovec *, int);
diff -r 7b29f76c5262 -r adb4716bed0f crypto/external/bsd/openssh/dist/auth-chall.c
--- a/crypto/external/bsd/openssh/dist/auth-chall.c Mon Jul 25 00:06:49 2011 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-chall.c Mon Jul 25 03:03:09 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auth-chall.c,v 1.2 2009/06/07 22:38:46 christos Exp $ */
+/* $NetBSD: auth-chall.c,v 1.3 2011/07/25 03:03:10 christos Exp $ */
/* $OpenBSD: auth-chall.c,v 1.12 2006/08/03 03:34:41 deraadt Exp $ */
/*
* Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: auth-chall.c,v 1.2 2009/06/07 22:38:46 christos Exp $");
+__RCSID("$NetBSD: auth-chall.c,v 1.3 2011/07/25 03:03:10 christos Exp $");
#include <sys/types.h>
#include "xmalloc.h"
@@ -90,7 +90,7 @@
return 0;
if (authctxt->kbdintctxt == NULL)
return 0;
- resp[0] = (char *)response;
+ resp[0] = __UNCONST(response);
if (device->respond(authctxt->kbdintctxt, 1, resp) == 0)
authenticated = 1;
device->free_ctx(authctxt->kbdintctxt);
diff -r 7b29f76c5262 -r adb4716bed0f crypto/external/bsd/openssh/dist/auth-krb5.c
--- a/crypto/external/bsd/openssh/dist/auth-krb5.c Mon Jul 25 00:06:49 2011 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-krb5.c Mon Jul 25 03:03:09 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auth-krb5.c,v 1.3 2011/04/24 14:01:46 elric Exp $ */
+/* $NetBSD: auth-krb5.c,v 1.4 2011/07/25 03:03:10 christos Exp $ */
/* $OpenBSD: auth-krb5.c,v 1.19 2006/08/03 03:34:41 deraadt Exp $ */
/*
* Kerberos v5 authentication and ticket-passing routines.
@@ -30,7 +30,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: auth-krb5.c,v 1.3 2011/04/24 14:01:46 elric Exp $");
+__RCSID("$NetBSD: auth-krb5.c,v 1.4 2011/07/25 03:03:10 christos Exp $");
#include <sys/types.h>
#include <pwd.h>
#include <stdarg.h>
@@ -189,7 +189,7 @@
authctxt->krb5_fwd_ccache = ccache;
ccache = NULL;
- authctxt->krb5_ticket_file = (char *)krb5_cc_get_name(authctxt->krb5_ctx, authctxt->krb5_fwd_ccache);
+ authctxt->krb5_ticket_file = __UNCONST(krb5_cc_get_name(authctxt->krb5_ctx, authctxt->krb5_fwd_ccache));
problem = krb5_unparse_name(authctxt->krb5_ctx, authctxt->krb5_user,
&pname);
@@ -198,7 +198,7 @@
#ifdef USE_PAM
if (options.use_pam)
- do_pam_putenv("KRB5CCNAME", authctxt->krb5_ticket_file);
+ do_pam_putenv(__UNCONST("KRB5CCNAME"), authctxt->krb5_ticket_file);
#endif
debug("Kerberos v5 TGT accepted (%s)", pname);
@@ -274,8 +274,8 @@
if (problem)
goto out;
- authctxt->krb5_ticket_file = (char *)krb5_cc_get_name(authctxt->krb5_ctx,
- authctxt->krb5_fwd_ccache);
+ authctxt->krb5_ticket_file = __UNCONST(krb5_cc_get_name(
+ authctxt->krb5_ctx, authctxt->krb5_fwd_ccache));
out:
restore_uid();
diff -r 7b29f76c5262 -r adb4716bed0f crypto/external/bsd/openssh/dist/auth-options.c
--- a/crypto/external/bsd/openssh/dist/auth-options.c Mon Jul 25 00:06:49 2011 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-options.c Mon Jul 25 03:03:09 2011 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: auth-options.c,v 1.3 2010/11/21 18:29:48 adam Exp $ */
-/* $OpenBSD: auth-options.c,v 1.52 2010/05/20 23:46:02 djm Exp $ */
+/* $NetBSD: auth-options.c,v 1.4 2011/07/25 03:03:10 christos Exp $ */
+/* $OpenBSD: auth-options.c,v 1.54 2010/12/24 21:41:48 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
* Copyright (c) 1995 Tatu Ylonen <ylo%cs.hut.fi@localhost>, Espoo, Finland
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: auth-options.c,v 1.3 2010/11/21 18:29:48 adam Exp $");
+__RCSID("$NetBSD: auth-options.c,v 1.4 2011/07/25 03:03:10 christos Exp $");
#include <sys/types.h>
#include <sys/queue.h>
@@ -94,7 +94,8 @@
* side effect: sets key option flags
*/
int
-auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
+auth_parse_options(struct passwd *pw, const char *opts, const char *file,
+ u_long linenum)
{
Home |
Main Index |
Thread Index |
Old Index