From c5252af6a84316c11c8f23da4ed14780a5e67082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Tue, 17 Jan 2017 14:31:56 +0000 Subject: [PATCH] merge r890: bump copyright dates for files modified in 2014 or later git-svn-id: svn+ssh://svn.openpam.org/svn/openpam/branches/nooath@895 185d5e19-27fe-0310-9dcf-9bff6b9f3609 --- bin/openpam_dump_policy/openpam_dump_policy.c | 2 +- doc/man/pam_conv.3 | 2 +- include/security/openpam.h | 2 +- include/security/openpam_version.h | 2 +- lib/libpam/openpam_configure.c | 2 +- lib/libpam/openpam_ctype.h | 2 +- lib/libpam/openpam_dispatch.c | 4 ++-- lib/libpam/openpam_features.c | 2 +- lib/libpam/openpam_load.c | 2 +- lib/libpam/openpam_readlinev.c | 2 +- lib/libpam/openpam_readword.c | 2 +- lib/libpam/openpam_strlset.c | 2 +- lib/libpam/openpam_strlset.h | 2 +- lib/libpam/openpam_ttyconv.c | 2 +- lib/libpam/pam_get_authtok.c | 2 +- misc/gendoc.pl | 2 +- misc/history2wiki.pl | 2 +- mkpkgng.in | 2 +- modules/pam_unix/pam_unix.c | 2 +- t/t.h | 2 +- t/t_file.c | 2 +- t/t_main.c | 2 +- t/t_openpam_ctype.c | 2 +- t/t_openpam_readlinev.c | 2 +- t/t_openpam_readword.c | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bin/openpam_dump_policy/openpam_dump_policy.c b/bin/openpam_dump_policy/openpam_dump_policy.c index f15c2a8..e2338c8 100644 --- a/bin/openpam_dump_policy/openpam_dump_policy.c +++ b/bin/openpam_dump_policy/openpam_dump_policy.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2011 Dag-Erling Smørgrav + * Copyright (c) 2011-2014 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/doc/man/pam_conv.3 b/doc/man/pam_conv.3 index 2efe66d..c6263d0 100644 --- a/doc/man/pam_conv.3 +++ b/doc/man/pam_conv.3 @@ -1,6 +1,6 @@ .\"- .\" Copyright (c) 2002-2003 Networks Associates Technology, Inc. -.\" Copyright (c) 2004-2011 Dag-Erling Smørgrav +.\" Copyright (c) 2004-2014 Dag-Erling Smørgrav .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by ThinkSec AS and diff --git a/include/security/openpam.h b/include/security/openpam.h index 048c1bc..106ac1c 100644 --- a/include/security/openpam.h +++ b/include/security/openpam.h @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2015 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and diff --git a/include/security/openpam_version.h b/include/security/openpam_version.h index 703fdcc..8e1cd77 100644 --- a/include/security/openpam_version.h +++ b/include/security/openpam_version.h @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2014 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and diff --git a/lib/libpam/openpam_configure.c b/lib/libpam/openpam_configure.c index fb98cbc..62e7747 100644 --- a/lib/libpam/openpam_configure.c +++ b/lib/libpam/openpam_configure.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2001-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2014 Dag-Erling Smørgrav + * Copyright (c) 2004-2015 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and diff --git a/lib/libpam/openpam_ctype.h b/lib/libpam/openpam_ctype.h index 50499de..20efc34 100644 --- a/lib/libpam/openpam_ctype.h +++ b/lib/libpam/openpam_ctype.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012 Dag-Erling Smørgrav + * Copyright (c) 2012-2014 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/lib/libpam/openpam_dispatch.c b/lib/libpam/openpam_dispatch.c index 69432fa..1dc095c 100644 --- a/lib/libpam/openpam_dispatch.c +++ b/lib/libpam/openpam_dispatch.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2015 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -130,7 +130,7 @@ openpam_dispatch(pam_handle_t *pamh, if (r == PAM_IGNORE) continue; - if (r == PAM_SUCCESS) { + if (r == PAM_SUCCESS) { ++nsuccess; /* * For pam_setcred() and pam_chauthtok() with the diff --git a/lib/libpam/openpam_features.c b/lib/libpam/openpam_features.c index 0fdfc6d..a06f15b 100644 --- a/lib/libpam/openpam_features.c +++ b/lib/libpam/openpam_features.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012 Dag-Erling Smørgrav + * Copyright (c) 2012-2015 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/lib/libpam/openpam_load.c b/lib/libpam/openpam_load.c index 894050c..3ee24f6 100644 --- a/lib/libpam/openpam_load.c +++ b/lib/libpam/openpam_load.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2013 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and diff --git a/lib/libpam/openpam_readlinev.c b/lib/libpam/openpam_readlinev.c index a818dec..1e114f7 100644 --- a/lib/libpam/openpam_readlinev.c +++ b/lib/libpam/openpam_readlinev.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012 Dag-Erling Smørgrav + * Copyright (c) 2012-2016 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/lib/libpam/openpam_readword.c b/lib/libpam/openpam_readword.c index 8c3bf90..fdac700 100644 --- a/lib/libpam/openpam_readword.c +++ b/lib/libpam/openpam_readword.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012 Dag-Erling Smørgrav + * Copyright (c) 2012-2014 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/lib/libpam/openpam_strlset.c b/lib/libpam/openpam_strlset.c index 5711b3e..d4afe77 100644 --- a/lib/libpam/openpam_strlset.c +++ b/lib/libpam/openpam_strlset.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2011-2012 Dag-Erling Smørgrav + * Copyright (c) 2014 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/lib/libpam/openpam_strlset.h b/lib/libpam/openpam_strlset.h index 2da15ab..c2f47ff 100644 --- a/lib/libpam/openpam_strlset.h +++ b/lib/libpam/openpam_strlset.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2011 Dag-Erling Smørgrav + * Copyright (c) 2014 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/lib/libpam/openpam_ttyconv.c b/lib/libpam/openpam_ttyconv.c index f5eb384..49eb1bc 100644 --- a/lib/libpam/openpam_ttyconv.c +++ b/lib/libpam/openpam_ttyconv.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2014 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and diff --git a/lib/libpam/pam_get_authtok.c b/lib/libpam/pam_get_authtok.c index 940d1dc..837cb8f 100644 --- a/lib/libpam/pam_get_authtok.c +++ b/lib/libpam/pam_get_authtok.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2014 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and diff --git a/misc/gendoc.pl b/misc/gendoc.pl index 59c6008..3ce4c8c 100644 --- a/misc/gendoc.pl +++ b/misc/gendoc.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -w #- # Copyright (c) 2002-2003 Networks Associates Technology, Inc. -# Copyright (c) 2004-2011 Dag-Erling Smørgrav +# Copyright (c) 2004-2014 Dag-Erling Smørgrav # All rights reserved. # # This software was developed for the FreeBSD Project by ThinkSec AS and diff --git a/misc/history2wiki.pl b/misc/history2wiki.pl index 09ed122..48a38b6 100755 --- a/misc/history2wiki.pl +++ b/misc/history2wiki.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw #- -# Copyright (c) 2012 Dag-Erling Smørgrav +# Copyright (c) 2012-2014 Dag-Erling Smørgrav # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/mkpkgng.in b/mkpkgng.in index 3a292f6..5906f38 100644 --- a/mkpkgng.in +++ b/mkpkgng.in @@ -1,6 +1,6 @@ #!/bin/sh #- -# Copyright (c) 2013 Dag-Erling Smørgrav +# Copyright (c) 2013-2014 Dag-Erling Smørgrav # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/modules/pam_unix/pam_unix.c b/modules/pam_unix/pam_unix.c index 092aca2..2f8f0df 100644 --- a/modules/pam_unix/pam_unix.c +++ b/modules/pam_unix/pam_unix.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2015 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and diff --git a/t/t.h b/t/t.h index 2f6c858..015511c 100644 --- a/t/t.h +++ b/t/t.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012 Dag-Erling Smørgrav + * Copyright (c) 2012-2016 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/t/t_file.c b/t/t_file.c index 46c1790..60145b6 100644 --- a/t/t_file.c +++ b/t/t_file.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012 Dag-Erling Smørgrav + * Copyright (c) 2012-2016 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/t/t_main.c b/t/t_main.c index 5bb9586..7b99706 100644 --- a/t/t_main.c +++ b/t/t_main.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012 Dag-Erling Smørgrav + * Copyright (c) 2012-2015 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/t/t_openpam_ctype.c b/t/t_openpam_ctype.c index 9653883..2f20dad 100644 --- a/t/t_openpam_ctype.c +++ b/t/t_openpam_ctype.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2014 Dag-Erling Smørgrav + * Copyright (c) 2014-2015 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/t/t_openpam_readlinev.c b/t/t_openpam_readlinev.c index 74d734c..1b09cef 100644 --- a/t/t_openpam_readlinev.c +++ b/t/t_openpam_readlinev.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012 Dag-Erling Smørgrav + * Copyright (c) 2012-2015 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/t/t_openpam_readword.c b/t/t_openpam_readword.c index 600de6e..4a532c9 100644 --- a/t/t_openpam_readword.c +++ b/t/t_openpam_readword.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012 Dag-Erling Smørgrav + * Copyright (c) 2012-2015 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without