summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-03-22 01:22:27 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-03-22 01:22:27 +0000
commiteacc71b558d29c243ea540c3d6acd2cf6ca15552 (patch)
treead5d9e5452d2ea2bb92ab7c6473b19bc489df445
parent186b7da2d796051dfe2c1fc3acb172aca1f06a82 (diff)
- stevesk@cvs.openbsd.org 2002/03/16 17:41:25
[auth-krb5.c] BSD license. from Daniel Kouril via Dug Song. ok markus@
-rw-r--r--ChangeLog5
-rw-r--r--auth-krb5.c25
2 files changed, 28 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c1cbb3e..d516cd90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,9 @@
- markus@cvs.openbsd.org 2002/03/16 17:22:09
[auth-rh-rsa.c auth.h]
split auth_rhosts_rsa(), ok provos@
+ - stevesk@cvs.openbsd.org 2002/03/16 17:41:25
+ [auth-krb5.c]
+ BSD license. from Daniel Kouril via Dug Song. ok markus@
20020317
- (tim) [configure.ac] Assume path given with --with-pid-dir=PATH is wanted,
@@ -7873,4 +7876,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1932 2002/03/22 01:20:32 mouring Exp $
+$Id: ChangeLog,v 1.1933 2002/03/22 01:22:27 mouring Exp $
diff --git a/auth-krb5.c b/auth-krb5.c
index 2da0669a..0a2fd4ba 100644
--- a/auth-krb5.c
+++ b/auth-krb5.c
@@ -3,9 +3,32 @@
*
* $FreeBSD: src/crypto/openssh/auth-krb5.c,v 1.6 2001/02/13 16:58:04 assar Exp $
*/
+/*
+ * Copyright (c) 2002 Daniel Kouril. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
#include "includes.h"
-RCSID("$OpenBSD: auth-krb5.c,v 1.6 2002/03/04 17:27:39 stevesk Exp $");
+RCSID("$OpenBSD: auth-krb5.c,v 1.7 2002/03/16 17:41:25 stevesk Exp $");
#include "ssh.h"
#include "ssh1.h"