diff --git a/COPYING b/COPYING index 9ab47e1..3b43351 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2006, 2007, 2008, 2009, 2011 Yubico AB +Copyright (c) 2006-2012 Yubico AB All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/Makefile.am b/Makefile.am index 98a7581..c704522 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # Written by Simon Josefsson . -# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 Yubico AB +# Copyright (c) 2006-2012 Yubico AB # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/NEWS b/NEWS index 3b8c9d0..31e6ba0 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ pam_yubico NEWS -- History of user-visible changes. -*- outline -*- +* Version 2.11 (unreleased) + * Version 2.10 (released 2011-12-14) ** Drop permissions (to the user that is trying to authenticate) before diff --git a/README b/README index 25eca39..a4053e9 100644 --- a/README +++ b/README @@ -25,9 +25,10 @@ The development community is co-ordinated via Google Code : http://code.google.com/p/yubico-pam/ -The license for pam_yubico is the 2-clause BSD license, which is -compatible with the Linux-PAM BSD/GPL license. See the file COPYING -for more information. +The project is licensed under a BSD license. See the file COPYING for +exact wording. For any copyright year range specified as YYYY-ZZZZ in +this package note that the range specifies every single year in that +closed interval. Building from Git diff --git a/configure.ac b/configure.ac index d5b8362..f3c5181 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # Written by Simon Josefsson . -# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 Yubico AB +# Copyright (c) 2006-2012 Yubico AB # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -26,10 +26,11 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -AC_INIT([pam_yubico], [2.10], [yubico-devel@googlegroups.com]) +AC_INIT([pam_yubico], [2.11], [yubico-devel@googlegroups.com]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([foreign]) +AM_INIT_AUTOMAKE([1.10 foreign -Wall -Werror]) +AM_SILENT_RULES([yes]) AC_PROG_CC AC_LIBTOOL_WIN32_DLL AC_DISABLE_STATIC diff --git a/drop_privs.c b/drop_privs.c index 29ed95b..9f769e5 100644 --- a/drop_privs.c +++ b/drop_privs.c @@ -1,8 +1,8 @@ /* Written by Ricky Zhou * Fredrik Thulin implemented pam_modutil_drop_priv * + * Copyright (c) 2011-2012 Yubico AB * Copyright (c) 2011 Ricky Zhou - * Copyright (c) 2011 Yubico AB * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drop_privs.h b/drop_privs.h index 87b53a4..fc4c7c5 100644 --- a/drop_privs.h +++ b/drop_privs.h @@ -1,3 +1,31 @@ +/* Copyright (c) 2011-2012 Yubico AB + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * 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 COPYRIGHT HOLDERS AND CONTRIBUTORS + * "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 COPYRIGHT + * OWNER OR CONTRIBUTORS 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. + */ + #ifndef __PAM_YUBICO_DROP_PRIVS_H_INCLUDED__ #define __PAM_YUBICO_DROP_PRIVS_H_INCLUDED__ diff --git a/pam_yubico.c b/pam_yubico.c index 20546fb..40192fb 100644 --- a/pam_yubico.c +++ b/pam_yubico.c @@ -1,5 +1,5 @@ /* Written by Simon Josefsson . - * Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 Yubico AB + * Copyright (c) 2006-2012 Yubico AB * Copyright (c) 2011 Tollef Fog Heen * All rights reserved. * diff --git a/test.c b/test.c index 7c67746..32b1355 100644 --- a/test.c +++ b/test.c @@ -1,5 +1,5 @@ /* Written by Simon Josefsson . - * Copyright (c) 2007, 2008, 2009, 2011 Yubico AB + * Copyright (c) 2007-2012 Yubico AB * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/util.c b/util.c index bbba209..7d4f723 100644 --- a/util.c +++ b/util.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Yubico AB. + * Copyright (c) 2011-2012 Yubico AB * Copyright (c) 2011 Tollef Fog Heen * All rights reserved. * diff --git a/util.h b/util.h index e076169..beaa2b0 100644 --- a/util.h +++ b/util.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Yubico AB. + * Copyright (c) 2011-2012 Yubico AB * Copyright (c) 2011 Tollef Fog Heen * All rights reserved. * diff --git a/ykpamcfg.1 b/ykpamcfg.1 index d49220b..db7bdb7 100644 --- a/ykpamcfg.1 +++ b/ykpamcfg.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2011 Yubico AB +.\" Copyright (c) 2011-2012 Yubico AB .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without diff --git a/ykpamcfg.c b/ykpamcfg.c index f0946d0..9c57b18 100644 --- a/ykpamcfg.c +++ b/ykpamcfg.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Yubico AB. + * Copyright (c) 2011-2012 Yubico AB * All rights reserved. * * Author : Fredrik Thulin