diff options
Diffstat (limited to 'libpam_misc')
| -rw-r--r-- | libpam_misc/Makefile.in | 12 | ||||
| -rw-r--r-- | libpam_misc/help_env.c | 5 | ||||
| -rw-r--r-- | libpam_misc/misc_conv.c | 9 | ||||
| -rw-r--r-- | libpam_misc/pam_misc.pc.in | 2 |
4 files changed, 21 insertions, 7 deletions
diff --git a/libpam_misc/Makefile.in b/libpam_misc/Makefile.in index 9ce0691e..1629e493 100644 --- a/libpam_misc/Makefile.in +++ b/libpam_misc/Makefile.in @@ -253,6 +253,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCBOOK_RNG = @DOCBOOK_RNG@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -265,11 +266,13 @@ EXEEXT = @EXEEXT@ EXE_CFLAGS = @EXE_CFLAGS@ EXE_LDFLAGS = @EXE_LDFLAGS@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FO2PDF = @FO2PDF@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +HTML_STYLESHEET = @HTML_STYLESHEET@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -301,12 +304,14 @@ LIBSELINUX = @LIBSELINUX@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LOGIND_CFLAGS = @LOGIND_CFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MAN_STYLESHEET = @MAN_STYLESHEET@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ @@ -329,6 +334,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PDF_STYLESHEET = @PDF_STYLESHEET@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -339,12 +345,16 @@ SECUREDIR = @SECUREDIR@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -STRINGPARAM_HMAC = @STRINGPARAM_HMAC@ +STRINGPARAM_PROFILECONDITIONS = @STRINGPARAM_PROFILECONDITIONS@ STRINGPARAM_VENDORDIR = @STRINGPARAM_VENDORDIR@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ TIRPC_CFLAGS = @TIRPC_CFLAGS@ TIRPC_LIBS = @TIRPC_LIBS@ +TXT_STYLESHEET = @TXT_STYLESHEET@ USE_NLS = @USE_NLS@ +VENDOR_SCONFIGDIR = @VENDOR_SCONFIGDIR@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ XGETTEXT = @XGETTEXT@ diff --git a/libpam_misc/help_env.c b/libpam_misc/help_env.c index 601c5f41..b01c9f71 100644 --- a/libpam_misc/help_env.c +++ b/libpam_misc/help_env.c @@ -11,6 +11,7 @@ #include <stdio.h> #include <string.h> #include <security/pam_misc.h> +#include "pam_inline.h" /* * This function should be used to carefully dispose of the copied @@ -25,7 +26,7 @@ char **pam_misc_drop_env(char **dump) for (i=0; dump[i] != NULL; ++i) { D(("dump[%d]=`%s'", i, dump[i])); - _pam_overwrite(dump[i]); + pam_overwrite_string(dump[i]); _pam_drop(dump[i]); } _pam_drop(dump); @@ -77,7 +78,7 @@ int pam_misc_setenv(pam_handle_t *pamh, const char *name if (asprintf(&tmp, "%s=%s", name, value) >= 0) { D(("pam_putt()ing: %s", tmp)); retval = pam_putenv(pamh, tmp); - _pam_overwrite(tmp); /* purge */ + pam_overwrite_string(tmp); /* purge */ _pam_drop(tmp); /* forget */ } else { D(("malloc failure")); diff --git a/libpam_misc/misc_conv.c b/libpam_misc/misc_conv.c index 908ee890..dbcd6aec 100644 --- a/libpam_misc/misc_conv.c +++ b/libpam_misc/misc_conv.c @@ -17,6 +17,7 @@ #include <security/pam_appl.h> #include <security/pam_misc.h> +#include "pam_inline.h" #define INPUTSIZE PAM_MISC_CONV_BUFSIZE /* maximum length of input+1 */ #define CONV_ECHO_ON 1 /* types of echo state */ @@ -185,7 +186,7 @@ static int read_string(int echo, const char *prompt, char **retstr) int rv; if ((rv=read(STDIN_FILENO, line+nc, 1)) != 1) { if (rv < 0) { - _pam_overwrite_n(line, (unsigned int) nc); + pam_overwrite_n(line, (unsigned int) nc); nc = rv; } break; @@ -213,7 +214,7 @@ static int read_string(int echo, const char *prompt, char **retstr) line[nc] = '\0'; } *retstr = strdup(line); - _pam_overwrite(line); + pam_overwrite_array(line); if (!*retstr) { D(("no memory for response string")); nc = -1; @@ -246,7 +247,7 @@ static int read_string(int echo, const char *prompt, char **retstr) D(("the timer appears to have expired")); *retstr = NULL; - _pam_overwrite_n(line, sizeof(line)); + pam_overwrite_array(line); cleanexit: @@ -376,7 +377,7 @@ failed_conversation: switch (msgm[count]->msg_style) { case PAM_PROMPT_ECHO_ON: case PAM_PROMPT_ECHO_OFF: - _pam_overwrite(reply[count].resp); + pam_overwrite_string(reply[count].resp); free(reply[count].resp); break; case PAM_BINARY_PROMPT: diff --git a/libpam_misc/pam_misc.pc.in b/libpam_misc/pam_misc.pc.in index 0c8898cd..c3e03c4f 100644 --- a/libpam_misc/pam_misc.pc.in +++ b/libpam_misc/pam_misc.pc.in @@ -1,3 +1,5 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ |