diff options
author | Tomas Mraz <tm@t8m.info> | 2005-09-21 10:00:58 +0000 |
---|---|---|
committer | Tomas Mraz <tm@t8m.info> | 2005-09-21 10:00:58 +0000 |
commit | be09d6354efcb2571731bdffc47da86f22621ac8 (patch) | |
tree | 82117bfbaadb46495a545ba4f567dc9bddd97c33 /modules/pam_filter/upperLOWER | |
parent | 627a0401899af257f0fb711ad54194e14a75c530 (diff) |
Relevant BUGIDs:
Purpose of commit: new feature
Commit summary:
---------------
Moved functions from pammodutil to libpam.
Diffstat (limited to 'modules/pam_filter/upperLOWER')
-rw-r--r-- | modules/pam_filter/upperLOWER/Makefile.am | 4 | ||||
-rw-r--r-- | modules/pam_filter/upperLOWER/upperLOWER.c | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/modules/pam_filter/upperLOWER/Makefile.am b/modules/pam_filter/upperLOWER/Makefile.am index 4341bcea..d49de828 100644 --- a/modules/pam_filter/upperLOWER/Makefile.am +++ b/modules/pam_filter/upperLOWER/Makefile.am @@ -8,7 +8,7 @@ securelibfilterdir = $(SECUREDIR)/pam_filter AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ - -I$(top_srcdir)/modules/pammodutil/include/ -I.. -AM_LDFLAGS = $(top_builddir)/modules/pammodutil/libpammodutil.la + -I.. +AM_LDFLAGS = -L$(top_builddir)/libpam -lpam securelibfilter_PROGRAMS = upperLOWER diff --git a/modules/pam_filter/upperLOWER/upperLOWER.c b/modules/pam_filter/upperLOWER/upperLOWER.c index d1c10114..314d2fed 100644 --- a/modules/pam_filter/upperLOWER/upperLOWER.c +++ b/modules/pam_filter/upperLOWER/upperLOWER.c @@ -23,7 +23,7 @@ #include "pam_filter.h" #include <security/pam_modules.h> #include <security/_pam_macros.h> -#include <security/_pam_modutil.h> +#include <security/pam_modutil.h> /* ---------------------------------------------------------------- */ @@ -98,27 +98,27 @@ int main(int argc, char **argv UNUSED) /* application errors */ if ( FD_ISSET(APPERR_FILENO,&readers) ) { - int got = _pammodutil_read(APPERR_FILENO, buffer, BUFSIZ); + int got = pam_modutil_read(APPERR_FILENO, buffer, BUFSIZ); if (got <= 0) { break; } else { /* translate to give to real terminal */ if (before_user != NULL) before_user(buffer, got); - if (_pammodutil_write(STDERR_FILENO, buffer, got) != got ) { + if (pam_modutil_write(STDERR_FILENO, buffer, got) != got ) { syslog(LOG_WARNING,"couldn't write %d bytes?!",got); break; } } } else if ( FD_ISSET(APPOUT_FILENO,&readers) ) { /* app output */ - int got = _pammodutil_read(APPOUT_FILENO, buffer, BUFSIZ); + int got = pam_modutil_read(APPOUT_FILENO, buffer, BUFSIZ); if (got <= 0) { break; } else { /* translate to give to real terminal */ if (before_user != NULL) before_user(buffer, got); - if (_pammodutil_write(STDOUT_FILENO, buffer, got) != got ) { + if (pam_modutil_write(STDOUT_FILENO, buffer, got) != got ) { syslog(LOG_WARNING,"couldn't write %d bytes!?",got); break; } @@ -126,7 +126,7 @@ int main(int argc, char **argv UNUSED) } if ( FD_ISSET(STDIN_FILENO, &readers) ) { /* user input */ - int got = _pammodutil_read(STDIN_FILENO, buffer, BUFSIZ); + int got = pam_modutil_read(STDIN_FILENO, buffer, BUFSIZ); if (got < 0) { syslog(LOG_WARNING,"user input junked"); break; @@ -134,7 +134,7 @@ int main(int argc, char **argv UNUSED) /* translate to give to application */ if (before_app != NULL) before_app(buffer, got); - if (_pammodutil_write(APPIN_FILENO, buffer, got) != got ) { + if (pam_modutil_write(APPIN_FILENO, buffer, got) != got ) { syslog(LOG_WARNING,"couldn't pass %d bytes!?",got); break; } |