aboutsummaryrefslogtreecommitdiff
path: root/patches-applied/010_pam_cplusplus
diff options
context:
space:
mode:
authorvorlon <Unknown>2005-10-03 09:13:59 +0000
committervorlon <Unknown>2005-10-03 09:13:59 +0000
commit6d6b10d8f2b6f073c9689601a7c697ab1b14ad6e (patch)
tree6a18b1bd6d6ce6c4383246ca24bdecfa67661481 /patches-applied/010_pam_cplusplus
parent2b3dc64bcca60dd46f5a4032bbdb11f5e6a11800 (diff)
downloadpam-6d6b10d8f2b6f073c9689601a7c697ab1b14ad6e.tar.gz
pam-6d6b10d8f2b6f073c9689601a7c697ab1b14ad6e.tar.bz2
pam-6d6b10d8f2b6f073c9689601a7c697ab1b14ad6e.zip
Patch 010: remove parts of the patch that aren't necessary for C++
compatibility.
Diffstat (limited to 'patches-applied/010_pam_cplusplus')
-rw-r--r--patches-applied/010_pam_cplusplus51
1 files changed, 0 insertions, 51 deletions
diff --git a/patches-applied/010_pam_cplusplus b/patches-applied/010_pam_cplusplus
index 135954e8..0db90132 100644
--- a/patches-applied/010_pam_cplusplus
+++ b/patches-applied/010_pam_cplusplus
@@ -14,29 +14,6 @@ diff -u -r1.3 debian.defs
ifneq (,$(findstring $(DEB_BUILD_OPTIONS),debug DEBUG Debug))
CFLAGS += -g
endif
-Index: Linux-PAM/libpam/include/security/pam_appl.h
-===================================================================
-RCS file: /afs/sipb/project/debian/cvs/pam/Linux-PAM/libpam/include/security/pam_appl.h,v
-retrieving revision 1.3
-diff -u -r1.3 pam_appl.h
---- Linux-PAM/libpam/include/security/pam_appl.h 15 Sep 2002 20:17:59 -0000 1.3
-+++ Linux-PAM/libpam/include/security/pam_appl.h 15 Sep 2002 21:22:45 -0000
-@@ -47,12 +47,12 @@
-
- extern int pam_chauthtok(pam_handle_t *pamh, int flags);
-
-+/* take care of any compatibility issues */
-+#include <security/_pam_compat.h>
-+
- #ifdef __cplusplus
- }
- #endif
--
--/* take care of any compatibility issues */
--#include <security/_pam_compat.h>
-
- /*
- * Copyright Theodore Ts'o, 1996. All rights reserved.
Index: Linux-PAM/libpam/include/security/pam_malloc.h
===================================================================
RCS file: /afs/sipb/project/debian/cvs/pam/Linux-PAM/libpam/include/security/pam_malloc.h,v
@@ -94,31 +71,3 @@ diff -u -r1.3 pam_modules.h
/* Copyright (C) Theodore Ts'o, 1996.
* Copyright (C) Andrew Morgan, 1996-8.
-Index: Linux-PAM/libpamc/include/security/pam_client.h
-===================================================================
-RCS file: /afs/sipb/project/debian/cvs/pam/Linux-PAM/libpamc/include/security/pam_client.h,v
-retrieving revision 1.3
-diff -u -r1.3 pam_client.h
---- Linux-PAM/libpamc/include/security/pam_client.h 15 Sep 2002 20:17:59 -0000 1.3
-+++ Linux-PAM/libpamc/include/security/pam_client.h 15 Sep 2002 21:22:45 -0000
-@@ -17,6 +17,10 @@
- #include <string.h>
- #include <stdio.h>
-
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- /* opaque agent handling structure */
-
- typedef struct pamc_handle_s *pamc_handle_t;
-@@ -161,6 +165,9 @@
- memcpy((data), (offset) + PAM_BP_RDATA(__prompt), (length)); \
- } while (0)
-
-+#ifdef __cplusplus
-+}
-+#endif
-
- /* Control types */
-