← Back to branch summary

~ubuntu-branches/ubuntu/breezy/pam/breezy

« back to all changes in this revision

Viewing changes to debian/patches-applied/010_pam_cplusplus

  • Committer: Bazaar Package Importer
  • Author(s): Sam Hartman
  • Date: 2004-06-28 14:28:08 UTC
  • mfrom: (2.1.1 warty)
  • Revision ID: james.westby@ubuntu.com-20040628142808-adikk7vtfg3pzcjw
Tags: 0.76-22
http://bugs.debian.org/254904
* Add uploaders
* Document location of repository
* Fix options containing arguments in pam_unix, Closes: #254904

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches-applied/010_pam_cplusplus
 
1
Index: Linux-PAM/defs/debian.defs
 
2
===================================================================
 
3
RCS file: /afs/sipb/project/debian/cvs/pam/Linux-PAM/defs/debian.defs,v
 
4
retrieving revision 1.3
 
5
diff -u -r1.3 debian.defs
 
6
--- Linux-PAM/defs/debian.defs  15 Sep 2002 20:17:56 -0000      1.3
 
7
+++ Linux-PAM/defs/debian.defs  15 Sep 2002 21:22:45 -0000
 
8
@@ -7,7 +7,7 @@
 
9
 # installed files on the system.
 
10
 ##
 
11
 
 
12
-CFLAGS := -O2 -I${shell pwd}/include # -D__NO_STRING_INLINES
 
13
+CFLAGS := -O2 -D_GNU_SOURCE -D_REENTRANT
 
14
 ifneq (,$(findstring $(DEB_BUILD_OPTIONS),debug DEBUG Debug))
 
15
   CFLAGS += -g
 
16
 endif
 
17
Index: Linux-PAM/libpam/include/security/pam_appl.h
 
18
===================================================================
 
19
RCS file: /afs/sipb/project/debian/cvs/pam/Linux-PAM/libpam/include/security/pam_appl.h,v
 
20
retrieving revision 1.3
 
21
diff -u -r1.3 pam_appl.h
 
22
--- Linux-PAM/libpam/include/security/pam_appl.h        15 Sep 2002 20:17:59 -0000      1.3
 
23
+++ Linux-PAM/libpam/include/security/pam_appl.h        15 Sep 2002 21:22:45 -0000
 
24
@@ -47,12 +47,12 @@
 
25
 
 
26
 extern int pam_chauthtok(pam_handle_t *pamh, int flags);
 
27
 
 
28
+/* take care of any compatibility issues */
 
29
+#include <security/_pam_compat.h>
 
30
+
 
31
 #ifdef __cplusplus
 
32
 }
 
33
 #endif
 
34
-
 
35
-/* take care of any compatibility issues */
 
36
-#include <security/_pam_compat.h>
 
37
 
 
38
 /*
 
39
  * Copyright Theodore Ts'o, 1996.  All rights reserved.
 
40
Index: Linux-PAM/libpam/include/security/pam_malloc.h
 
41
===================================================================
 
42
RCS file: /afs/sipb/project/debian/cvs/pam/Linux-PAM/libpam/include/security/pam_malloc.h,v
 
43
retrieving revision 1.3
 
44
diff -u -r1.3 pam_malloc.h
 
45
--- Linux-PAM/libpam/include/security/pam_malloc.h      15 Sep 2002 20:17:59 -0000      1.3
 
46
+++ Linux-PAM/libpam/include/security/pam_malloc.h      15 Sep 2002 21:22:45 -0000
 
47
@@ -13,6 +13,10 @@
 
48
 #ifndef PAM_MALLOC_H
 
49
 #define PAM_MALLOC_H
 
50
 
 
51
+#ifdef __cplusplus
 
52
+extern "C" {
 
53
+#endif
 
54
+
 
55
 /* these are the macro definitions for the stdlib.h memory functions */
 
56
 
 
57
 #define malloc(s)      pam_malloc(s,__FILE__,__FUNCTION__,__LINE__)
 
58
@@ -67,5 +71,9 @@
 
59
 
 
60
 extern int pam_malloc_flags;
 
61
 extern int pam_malloc_delay_length;      /* how long to pause on errors */
 
62
+
 
63
+#ifdef __cplusplus
 
64
+}
 
65
+#endif
 
66
 
 
67
 #endif /* PAM_MALLOC_H */
 
68
Index: Linux-PAM/libpam/include/security/pam_modules.h
 
69
===================================================================
 
70
RCS file: /afs/sipb/project/debian/cvs/pam/Linux-PAM/libpam/include/security/pam_modules.h,v
 
71
retrieving revision 1.3
 
72
diff -u -r1.3 pam_modules.h
 
73
--- Linux-PAM/libpam/include/security/pam_modules.h     15 Sep 2002 20:17:59 -0000      1.3
 
74
+++ Linux-PAM/libpam/include/security/pam_modules.h     15 Sep 2002 21:22:45 -0000
 
75
@@ -8,6 +8,10 @@
 
76
 #ifndef _SECURITY_PAM_MODULES_H
 
77
 #define _SECURITY_PAM_MODULES_H
 
78
 
 
79
+#ifdef __cplusplus
 
80
+extern "C" {
 
81
+#endif
 
82
+
 
83
 #include <security/_pam_types.h>      /* Linux-PAM common defined types */
 
84
 
 
85
 /* these defines are used by pam_set_item() and pam_get_item() and are
 
86
@@ -129,6 +133,10 @@
 
87
 
 
88
 /* take care of any compatibility issues */
 
89
 #include <security/_pam_compat.h>
 
90
+
 
91
+#ifdef __cplusplus
 
92
+}
 
93
+#endif
 
94
 
 
95
 /* Copyright (C) Theodore Ts'o, 1996.
 
96
  * Copyright (C) Andrew Morgan, 1996-8.
 
97
Index: Linux-PAM/libpamc/include/security/pam_client.h
 
98
===================================================================
 
99
RCS file: /afs/sipb/project/debian/cvs/pam/Linux-PAM/libpamc/include/security/pam_client.h,v
 
100
retrieving revision 1.3
 
101
diff -u -r1.3 pam_client.h
 
102
--- Linux-PAM/libpamc/include/security/pam_client.h     15 Sep 2002 20:17:59 -0000      1.3
 
103
+++ Linux-PAM/libpamc/include/security/pam_client.h     15 Sep 2002 21:22:45 -0000
 
104
@@ -17,6 +17,10 @@
 
105
 #include <string.h>
 
106
 #include <stdio.h>
 
107
 
 
108
+#ifdef __cplusplus
 
109
+extern "C" {
 
110
+#endif
 
111
+
 
112
 /* opaque agent handling structure */
 
113
 
 
114
 typedef struct pamc_handle_s *pamc_handle_t;
 
115
@@ -161,6 +165,9 @@
 
116
     memcpy((data), (offset) + PAM_BP_RDATA(__prompt), (length));           \
 
117
 } while (0)
 
118
 
 
119
+#ifdef __cplusplus
 
120
+}
 
121
+#endif
 
122
 
 
123
 /* Control types */
 
124