Module Name: src
Committed By: christos
Date: Fri Oct 24 18:27:13 UTC 2014
Modified Files:
src/external/bsd/openpam/dist/bin/pamtest: pamtest.1 pamtest.c
src/external/bsd/openpam/dist/bin/su: su.1 su.c
src/external/bsd/openpam/dist/modules/pam_deny: pam_deny.c
src/external/bsd/openpam/dist/modules/pam_permit: pam_permit.c
src/external/bsd/openpam/dist/modules/pam_unix: pam_unix.c
Log Message:
resolve conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/openpam/dist/bin/pamtest/pamtest.1
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openpam/dist/bin/pamtest/pamtest.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/openpam/dist/bin/su/su.1
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openpam/dist/bin/su/su.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openpam/dist/modules/pam_deny/pam_deny.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openpam/dist/modules/pam_permit/pam_permit.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openpam/dist/modules/pam_unix/pam_unix.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/openpam/dist/bin/pamtest/pamtest.1
diff -u src/external/bsd/openpam/dist/bin/pamtest/pamtest.1:1.6 src/external/bsd/openpam/dist/bin/pamtest/pamtest.1:1.7
--- src/external/bsd/openpam/dist/bin/pamtest/pamtest.1:1.6 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/bin/pamtest/pamtest.1 Fri Oct 24 14:27:12 2014
@@ -1,8 +1,5 @@
-<<<<<<< pamtest.1
-.\" $NetBSD: pamtest.1,v 1.6 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pamtest.1,v 1.7 2014/10/24 18:27:12 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\"-
.\" Copyright (c) 2011 Dag-Erling Smørgrav
.\" All rights reserved.
Index: src/external/bsd/openpam/dist/bin/pamtest/pamtest.c
diff -u src/external/bsd/openpam/dist/bin/pamtest/pamtest.c:1.5 src/external/bsd/openpam/dist/bin/pamtest/pamtest.c:1.6
--- src/external/bsd/openpam/dist/bin/pamtest/pamtest.c:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/bin/pamtest/pamtest.c Fri Oct 24 14:27:12 2014
@@ -1,8 +1,5 @@
-<<<<<<< pamtest.c
-/* $NetBSD: pamtest.c,v 1.5 2014/10/24 18:17:56 christos Exp $ */
+/* $NetBSD: pamtest.c,v 1.6 2014/10/24 18:27:12 christos Exp $ */
-=======
->>>>>>> 1.1.1.4
/*-
* Copyright (c) 2011 Dag-Erling Smørgrav
* All rights reserved.
Index: src/external/bsd/openpam/dist/bin/su/su.1
diff -u src/external/bsd/openpam/dist/bin/su/su.1:1.6 src/external/bsd/openpam/dist/bin/su/su.1:1.7
--- src/external/bsd/openpam/dist/bin/su/su.1:1.6 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/bin/su/su.1 Fri Oct 24 14:27:12 2014
@@ -1,8 +1,5 @@
-<<<<<<< su.1
-.\" $NetBSD: su.1,v 1.6 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: su.1,v 1.7 2014/10/24 18:27:12 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\"-
.\" Copyright (c) 2011 Dag-Erling Smørgrav
.\" All rights reserved.
Index: src/external/bsd/openpam/dist/bin/su/su.c
diff -u src/external/bsd/openpam/dist/bin/su/su.c:1.5 src/external/bsd/openpam/dist/bin/su/su.c:1.6
--- src/external/bsd/openpam/dist/bin/su/su.c:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/bin/su/su.c Fri Oct 24 14:27:12 2014
@@ -1,8 +1,5 @@
-<<<<<<< su.c
-/* $NetBSD: su.c,v 1.5 2014/10/24 18:17:56 christos Exp $ */
+/* $NetBSD: su.c,v 1.6 2014/10/24 18:27:12 christos Exp $ */
-=======
->>>>>>> 1.1.1.4
/*-
* Copyright (c) 2002-2003 Networks Associates Technology, Inc.
* Copyright (c) 2004-2011 Dag-Erling Smørgrav
Index: src/external/bsd/openpam/dist/modules/pam_deny/pam_deny.c
diff -u src/external/bsd/openpam/dist/modules/pam_deny/pam_deny.c:1.5 src/external/bsd/openpam/dist/modules/pam_deny/pam_deny.c:1.6
--- src/external/bsd/openpam/dist/modules/pam_deny/pam_deny.c:1.5 Fri Oct 24 14:17:57 2014
+++ src/external/bsd/openpam/dist/modules/pam_deny/pam_deny.c Fri Oct 24 14:27:13 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_deny.c
-/* $NetBSD: pam_deny.c,v 1.5 2014/10/24 18:17:57 christos Exp $ */
+/* $NetBSD: pam_deny.c,v 1.6 2014/10/24 18:27:13 christos Exp $ */
-=======
->>>>>>> 1.1.1.4
/*-
* Copyright (c) 2002-2003 Networks Associates Technology, Inc.
* Copyright (c) 2004-2011 Dag-Erling Smørgrav
Index: src/external/bsd/openpam/dist/modules/pam_permit/pam_permit.c
diff -u src/external/bsd/openpam/dist/modules/pam_permit/pam_permit.c:1.5 src/external/bsd/openpam/dist/modules/pam_permit/pam_permit.c:1.6
--- src/external/bsd/openpam/dist/modules/pam_permit/pam_permit.c:1.5 Fri Oct 24 14:17:57 2014
+++ src/external/bsd/openpam/dist/modules/pam_permit/pam_permit.c Fri Oct 24 14:27:13 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_permit.c
-/* $NetBSD: pam_permit.c,v 1.5 2014/10/24 18:17:57 christos Exp $ */
+/* $NetBSD: pam_permit.c,v 1.6 2014/10/24 18:27:13 christos Exp $ */
-=======
->>>>>>> 1.1.1.4
/*-
* Copyright (c) 2002-2003 Networks Associates Technology, Inc.
* Copyright (c) 2004-2011 Dag-Erling Smørgrav
Index: src/external/bsd/openpam/dist/modules/pam_unix/pam_unix.c
diff -u src/external/bsd/openpam/dist/modules/pam_unix/pam_unix.c:1.5 src/external/bsd/openpam/dist/modules/pam_unix/pam_unix.c:1.6
--- src/external/bsd/openpam/dist/modules/pam_unix/pam_unix.c:1.5 Fri Oct 24 14:17:57 2014
+++ src/external/bsd/openpam/dist/modules/pam_unix/pam_unix.c Fri Oct 24 14:27:13 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_unix.c
-/* $NetBSD: pam_unix.c,v 1.5 2014/10/24 18:17:57 christos Exp $ */
+/* $NetBSD: pam_unix.c,v 1.6 2014/10/24 18:27:13 christos Exp $ */
-=======
->>>>>>> 1.1.1.4
/*-
* Copyright (c) 2002-2003 Networks Associates Technology, Inc.
* Copyright (c) 2004-2011 Dag-Erling Smørgrav
