- move GETXXKEY_R_FUNC into an internal helper file to allow for compiling
  with IMA.
diff --git a/libpwdgrp/pwd_grp_internal.c b/libpwdgrp/pwd_grp_internal.c
new file mode 100644
index 0000000..d935b86
--- /dev/null
+++ b/libpwdgrp/pwd_grp_internal.c
@@ -0,0 +1,111 @@
+/*  Copyright (C) 2003     Manuel Novoa III
+ *
+ *  Licensed under GPL v2, or later.  See file LICENSE in this tarball.
+ */
+
+/*  Nov 6, 2003  Initial version.
+ *
+ *  NOTE: This implementation is quite strict about requiring all
+ *    field seperators.  It also does not allow leading whitespace
+ *    except when processing the numeric fields.  glibc is more
+ *    lenient.  See the various glibc difference comments below.
+ *
+ *  TODO:
+ *    Move to dynamic allocation of (currently staticly allocated)
+ *      buffers; especially for the group-related functions since
+ *      large group member lists will cause error returns.
+ *
+ */
+
+#include <features.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <stddef.h>
+#include <errno.h>
+#include <assert.h>
+#include <ctype.h>
+#include "busybox.h"
+#include "pwd_.h"
+#include "grp_.h"
+#include "shadow_.h"
+
+#ifndef _PATH_SHADOW
+#define	_PATH_SHADOW	"/etc/shadow"
+#endif
+#ifndef _PATH_PASSWD
+#define	_PATH_PASSWD	"/etc/passwd"
+#endif
+#ifndef _PATH_GROUP
+#define	_PATH_GROUP	"/etc/group"
+#endif
+
+/**********************************************************************/
+/* Sizes for staticly allocated buffers. */
+
+/* If you change these values, also change _SC_GETPW_R_SIZE_MAX and
+ * _SC_GETGR_R_SIZE_MAX in libc/unistd/sysconf.c to match */
+#define PWD_BUFFER_SIZE 256
+#define GRP_BUFFER_SIZE 256
+
+/**********************************************************************/
+/* Prototypes for internal functions. */
+
+extern int __parsepwent(void *pw, char *line);
+extern int __parsegrent(void *gr, char *line);
+extern int __parsespent(void *sp, char *line);
+
+extern int __pgsreader(int (*__parserfunc)(void *d, char *line), void *data,
+					   char *__restrict line_buff, size_t buflen, FILE *f);
+
+
+#ifndef GETXXKEY_R_FUNC
+#error GETXXKEY_R_FUNC is not defined!
+#endif
+/**********************************************************************/
+#ifdef GETXXKEY_R_FUNC
+
+int GETXXKEY_R_FUNC(DO_GETXXKEY_R_KEYTYPE key,
+					GETXXKEY_R_ENTTYPE *__restrict resultbuf,
+					char *__restrict buffer, size_t buflen,
+					GETXXKEY_R_ENTTYPE **__restrict result)
+{
+	FILE *stream;
+	int rv;
+
+	*result = NULL;
+
+	if (!(stream = fopen(DO_GETXXKEY_R_PATHNAME, "r"))) {
+		rv = errno;
+	} else {
+		do {
+			if (!(rv = __pgsreader(GETXXKEY_R_PARSER, resultbuf,
+								   buffer, buflen, stream))
+				) {
+				if (GETXXKEY_R_TEST(resultbuf)) { /* Found key? */
+					*result = resultbuf;
+					break;
+				}
+			} else {
+				if (rv == ENOENT) {	/* end-of-file encountered. */
+					rv = 0;
+				}
+				break;
+			}
+		} while (1);
+		fclose(stream);
+	}
+
+	return rv;
+}
+
+#endif
+/**********************************************************************/
+#undef GETXXKEY_R_FUNC
+#undef GETXXKEY_R_PARSER
+#undef GETXXKEY_R_ENTTYPE
+#undef GETXXKEY_R_TEST
+#undef DO_GETXXKEY_R_KEYTYPE
+#undef DO_GETXXKEY_R_PATHNAME
+