1 |
flameeyes 08/03/29 00:47:00 |
2 |
|
3 |
Added: openpam-20071221-gentoo.patch |
4 |
Log: |
5 |
Bump to latest release, one chunk of our gentoo patch is not needed. |
6 |
(Portage version: 2.1.4.4) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 sys-auth/openpam/files/openpam-20071221-gentoo.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/openpam/files/openpam-20071221-gentoo.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/openpam/files/openpam-20071221-gentoo.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: openpam-20071221-gentoo.patch |
15 |
=================================================================== |
16 |
diff -Nur openpam-20050201/include/security/Makefile.am openpam-20050201-gentoo/include/security/Makefile.am |
17 |
--- openpam-20050201/include/security/Makefile.am 2005-02-01 00:00:00.000000000 +0100 |
18 |
+++ openpam-20050201-gentoo/include/security/Makefile.am 2005-06-11 12:48:19.038207056 +0200 |
19 |
@@ -6,4 +6,5 @@ |
20 |
pam_appl.h \ |
21 |
pam_constants.h \ |
22 |
pam_modules.h \ |
23 |
- pam_types.h |
24 |
+ pam_types.h \ |
25 |
+ pam_mod_misc.h |
26 |
diff -Nur openpam-20050201/include/security/pam_mod_misc.h openpam-20050201-gentoo/include/security/pam_mod_misc.h |
27 |
--- openpam-20050201/include/security/pam_mod_misc.h 1970-01-01 01:00:00.000000000 +0100 |
28 |
+++ openpam-20050201-gentoo/include/security/pam_mod_misc.h 2005-06-11 12:48:19.038207056 +0200 |
29 |
@@ -0,0 +1,56 @@ |
30 |
+/*- |
31 |
+ * Copyright 1998 Juniper Networks, Inc. |
32 |
+ * All rights reserved. |
33 |
+ * |
34 |
+ * Redistribution and use in source and binary forms, with or without |
35 |
+ * modification, are permitted provided that the following conditions |
36 |
+ * are met: |
37 |
+ * 1. Redistributions of source code must retain the above copyright |
38 |
+ * notice, this list of conditions and the following disclaimer. |
39 |
+ * 2. Redistributions in binary form must reproduce the above copyright |
40 |
+ * notice, this list of conditions and the following disclaimer in the |
41 |
+ * documentation and/or other materials provided with the distribution. |
42 |
+ * |
43 |
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND |
44 |
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
45 |
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
46 |
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE |
47 |
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL |
48 |
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS |
49 |
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) |
50 |
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
51 |
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
52 |
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
53 |
+ * SUCH DAMAGE. |
54 |
+ * |
55 |
+ * $FreeBSD: src/lib/libpam/libpam/security/pam_mod_misc.h,v 1.12 2003/05/31 16:56:35 des Exp $ |
56 |
+ */ |
57 |
+ |
58 |
+#ifndef PAM_MOD_MISC_H |
59 |
+#define PAM_MOD_MISC_H |
60 |
+ |
61 |
+#include <sys/cdefs.h> |
62 |
+ |
63 |
+/* |
64 |
+ * Common option names |
65 |
+ */ |
66 |
+#define PAM_OPT_NULLOK "nullok" |
67 |
+#define PAM_OPT_AUTH_AS_SELF "auth_as_self" |
68 |
+#define PAM_OPT_ECHO_PASS "echo_pass" |
69 |
+#define PAM_OPT_DEBUG "debug" |
70 |
+ |
71 |
+__BEGIN_DECLS |
72 |
+void _pam_verbose_error(pam_handle_t *, int, const char *, |
73 |
+ const char *, const char *, ...); |
74 |
+__END_DECLS |
75 |
+ |
76 |
+#define PAM_LOG(...) \ |
77 |
+ openpam_log(PAM_LOG_DEBUG, __VA_ARGS__) |
78 |
+ |
79 |
+#define PAM_RETURN(arg) \ |
80 |
+ return (arg) |
81 |
+ |
82 |
+#define PAM_VERBOSE_ERROR(...) \ |
83 |
+ _pam_verbose_error(pamh, flags, __FILE__, __FUNCTION__, __VA_ARGS__) |
84 |
+ |
85 |
+#endif |
86 |
diff -Nur openpam-20050201/lib/Makefile.am openpam-20050201-gentoo/lib/Makefile.am |
87 |
--- openpam-20050201/lib/Makefile.am 2005-02-01 00:00:00.000000000 +0100 |
88 |
+++ openpam-20050201-gentoo/lib/Makefile.am 2005-06-11 12:48:19.038207056 +0200 |
89 |
@@ -46,6 +46,7 @@ |
90 |
pam_verror.c \ |
91 |
pam_vinfo.c \ |
92 |
pam_vprompt.c \ |
93 |
+ pam_debug_log.c \ |
94 |
$(NULL) |
95 |
|
96 |
libpam_la_LDFLAGS = -no-undefined -version-info @LIB_MAJ@ @DL_LIBS@ |
97 |
diff -Nur openpam-20050201/lib/openpam_dynamic.c openpam-20050201-gentoo/lib/openpam_dynamic.c |
98 |
diff -Nur openpam-20050201/lib/pam_debug_log.c openpam-20050201-gentoo/lib/pam_debug_log.c |
99 |
--- openpam-20050201/lib/pam_debug_log.c 1970-01-01 01:00:00.000000000 +0100 |
100 |
+++ openpam-20050201-gentoo/lib/pam_debug_log.c 2005-06-11 12:55:17.688562528 +0200 |
101 |
@@ -0,0 +1,64 @@ |
102 |
+/*- |
103 |
+ * Copyright 2001 Mark R V Murray |
104 |
+ * All rights reserved. |
105 |
+ * |
106 |
+ * Redistribution and use in source and binary forms, with or without |
107 |
+ * modification, are permitted provided that the following conditions |
108 |
+ * are met: |
109 |
+ * 1. Redistributions of source code must retain the above copyright |
110 |
+ * notice, this list of conditions and the following disclaimer. |
111 |
+ * 2. Redistributions in binary form must reproduce the above copyright |
112 |
+ * notice, this list of conditions and the following disclaimer in the |
113 |
+ * documentation and/or other materials provided with the distribution. |
114 |
+ * |
115 |
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND |
116 |
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
117 |
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
118 |
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE |
119 |
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL |
120 |
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS |
121 |
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) |
122 |
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
123 |
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
124 |
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
125 |
+ * SUCH DAMAGE. |
126 |
+ */ |
127 |
+ |
128 |
+#include <sys/cdefs.h> |
129 |
+ |
130 |
+#ifndef __GLIBC__ |
131 |
+#include <libgen.h> |
132 |
+#endif |
133 |
+ |
134 |
+#include <stdarg.h> |
135 |
+#include <stdio.h> |
136 |
+#include <stdlib.h> |
137 |
+#include <string.h> |
138 |
+ |
139 |
+#include <security/pam_appl.h> |
140 |
+#include <security/openpam.h> |
141 |
+#include <security/pam_mod_misc.h> |
142 |
+ |
143 |
+/* Print a verbose error, including the function name and a |
144 |
+ * cleaned up filename. |
145 |
+ */ |
146 |
+void |
147 |
+_pam_verbose_error(pam_handle_t *pamh, int flags, |
148 |
+ const char *file, const char *function, const char *format, ...) |
149 |
+{ |
150 |
+ va_list ap; |
151 |
+ char *fmtbuf, *modname, *period; |
152 |
+ |
153 |
+ if (!(flags & PAM_SILENT) && !openpam_get_option(pamh, "no_warn")) { |
154 |
+ modname = basename(file); |
155 |
+ period = strchr(modname, '.'); |
156 |
+ if (period == NULL) |
157 |
+ period = strchr(modname, '\0'); |
158 |
+ va_start(ap, format); |
159 |
+ asprintf(&fmtbuf, "%.*s: %s: %s\n", (int)(period - modname), |
160 |
+ modname, function, format); |
161 |
+ pam_verror(pamh, fmtbuf, ap); |
162 |
+ free(fmtbuf); |
163 |
+ va_end(ap); |
164 |
+ } |
165 |
+} |
166 |
|
167 |
|
168 |
|
169 |
-- |
170 |
gentoo-commits@l.g.o mailing list |