summaryrefslogtreecommitdiff
path: root/security/pam-mysql/files
diff options
context:
space:
mode:
Diffstat (limited to 'security/pam-mysql/files')
-rw-r--r--security/pam-mysql/files/patch-aa90
-rw-r--r--security/pam-mysql/files/patch-ab18
2 files changed, 0 insertions, 108 deletions
diff --git a/security/pam-mysql/files/patch-aa b/security/pam-mysql/files/patch-aa
deleted file mode 100644
index 202945343122..000000000000
--- a/security/pam-mysql/files/patch-aa
+++ /dev/null
@@ -1,90 +0,0 @@
---- pam_mysql.c.orig Sun Sep 15 10:28:58 2002
-+++ pam_mysql.c Thu Feb 13 14:58:21 2003
-@@ -23,6 +23,7 @@
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-+#include <time.h>
-
-
- /* AFAIK, only FreeBSD has MD5Data() defined in md5.h
-@@ -54,7 +55,53 @@
- #define DEBUG
-
- #include <security/pam_modules.h>
-+#ifdef _OPENPAM
-+#include <security/pam_appl.h>
-+#else
- #include <security/pam_misc.h>
-+#endif
-+
-+#ifdef _OPENPAM
-+/* some macros not defined in OpenPAM */
-+
-+/* Good policy to strike out passwords with some characters not just
-+ free the memory */
-+
-+#define _pam_overwrite(x) \
-+do { \
-+ register char *__xx__; \
-+ if ((__xx__=(x))) \
-+ while (*__xx__) \
-+ *__xx__++ = '\0'; \
-+} while (0)
-+
-+/*
-+ * Don't just free it, forget it too.
-+ */
-+
-+#define _pam_drop(X) \
-+do { \
-+ if (X) { \
-+ free(X); \
-+ X=NULL; \
-+ } \
-+} while (0)
-+
-+#define _pam_drop_reply(/* struct pam_response * */ reply, /* int */ replies) \
-+do { \
-+ int reply_i; \
-+ \
-+ for (reply_i=0; reply_i<replies; ++reply_i) { \
-+ if (reply[reply_i].resp) { \
-+ _pam_overwrite(reply[reply_i].resp); \
-+ free(reply[reply_i].resp); \
-+ } \
-+ } \
-+ if (reply) \
-+ free(reply); \
-+} while (0)
-+
-+#endif
-
- struct optionstruct {
- char host[257];
-@@ -620,7 +667,11 @@
- retval = conv->conv(nargs,
- (const struct pam_message **) message,
- response, conv->appdata_ptr);
-- if ((retval != PAM_SUCCESS) && (retval != PAM_CONV_AGAIN))
-+ if ((retval != PAM_SUCCESS)
-+#ifndef _OPENPAM
-+ && (retval != PAM_CONV_AGAIN)
-+#endif
-+ )
- syslog(LOG_DEBUG, "pam_mysql: conversation failure [%s]",
- pam_strerror(pamh, retval));
- } else {
-@@ -827,8 +878,12 @@
- if (retval != PAM_SUCCESS) {
- if (resp != NULL)
- _pam_drop_reply(resp,i);
-+#ifndef _OPENPAM
- return ((retval == PAM_CONV_AGAIN)
- ? PAM_INCOMPLETE : PAM_AUTHINFO_UNAVAIL);
-+#else
-+ return PAM_AUTHINFO_UNAVAIL;
-+#endif
- }
-
- /* we have a password so set AUTHTOK
diff --git a/security/pam-mysql/files/patch-ab b/security/pam-mysql/files/patch-ab
deleted file mode 100644
index b07b8ed513c7..000000000000
--- a/security/pam-mysql/files/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.orig Thu Nov 21 02:13:01 2002
-+++ Makefile Mon May 19 23:41:43 2003
-@@ -3,13 +3,9 @@
- ifndef FULL_LINUX_PAM_SOURCE_TREE
- export DYNAMIC=-DPAM_DYNAMIC
- export CC=gcc
--export CFLAGS=-O2 -Dlinux -DLINUX_PAM \
-- -ansi -D_POSIX_SOURCE -Wall -Wwrite-strings \
-- -Wpointer-arith -Wcast-qual -Wcast-align -Wtraditional \
-- -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline \
-- -Wshadow -pedantic -fPIC
-+export CFLAGS+=-I${LOCALBASE}/include -fPIC
- export MKDIR=mkdir -p
--export LD_D=gcc -shared -Xlinker -x -L/usr/lib/mysql -lz
-+export LD_D=${CC} -shared -Xlinker -x -L${LOCALBASE}/lib/mysql -lz
- endif
-
- #