diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2003-01-06 16:07:51 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2003-01-06 16:07:51 +0000 |
| commit | 644f2b7cdc7b03626cfaa28ce0e77dc65d779b01 (patch) | |
| tree | 4e046ed575c1daa1c1da9f3cda1590f860a5ca1c /contrib/openpam/lib | |
| parent | 70e94b0be1607d23eaad7e884a41d166240c4c00 (diff) | |
| download | src-644f2b7cdc7b03626cfaa28ce0e77dc65d779b01.tar.gz src-644f2b7cdc7b03626cfaa28ce0e77dc65d779b01.zip | |
Vendor import of OpenPAM Daffodil.
Notes
Notes:
svn path=/vendor/openpam/dist/; revision=108794
Diffstat (limited to 'contrib/openpam/lib')
| -rw-r--r-- | contrib/openpam/lib/openpam_impl.h | 10 | ||||
| -rw-r--r-- | contrib/openpam/lib/openpam_ttyconv.c | 4 | ||||
| -rw-r--r-- | contrib/openpam/lib/pam_getenv.c | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/contrib/openpam/lib/openpam_impl.h b/contrib/openpam/lib/openpam_impl.h index 96e3b7ba715e..87818b660aa9 100644 --- a/contrib/openpam/lib/openpam_impl.h +++ b/contrib/openpam/lib/openpam_impl.h @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_impl.h#18 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#19 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED @@ -125,15 +125,15 @@ pam_module_t *openpam_dynamic(const char *); #define ENTER() openpam_log(PAM_LOG_DEBUG, "entering") #define RETURNV() openpam_log(PAM_LOG_DEBUG, "returning") #define RETURNC(c) do { \ - if ((c) >= 0 && (c) < PAM_NUM_ERRORS) + if ((c) >= 0 && (c) < PAM_NUM_ERRORS) \ openpam_log(PAM_LOG_DEBUG, "returning %s", _pam_err_name[c]); \ else \ openpam_log(PAM_LOG_DEBUG, "returning %d!", (c)); \ return (c); \ } while (0) -#define RETURNI(n) do { \ - openpam_log(PAM_LOG_DEBUG, "returning %d", (n)); \ - return (n); \ +#define RETURNI(i) do { \ + openpam_log(PAM_LOG_DEBUG, "returning %d", (i)); \ + return (i); \ } while (0) #define RETURNP(p) do { \ if ((p) == NULL) \ diff --git a/contrib/openpam/lib/openpam_ttyconv.c b/contrib/openpam/lib/openpam_ttyconv.c index d3fdde16a4b8..828f359950dd 100644 --- a/contrib/openpam/lib/openpam_ttyconv.c +++ b/contrib/openpam/lib/openpam_ttyconv.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#14 $ + * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#15 $ */ #include <sys/types.h> @@ -89,7 +89,7 @@ prompt(const char *msg) sigaction(SIGALRM, &saved_action, NULL); sigprocmask(SIG_SETMASK, &saved_sigset, NULL); alarm(saved_alarm); - if (timed_out || ferror(stdin)) + if (timed_out || ferror(stdin) || feof(stdin)) return (NULL); /* trim trailing whitespace */ for (len = strlen(buf); len > 0; --len) diff --git a/contrib/openpam/lib/pam_getenv.c b/contrib/openpam/lib/pam_getenv.c index 1b4fd15eea3b..a00c7cf4e404 100644 --- a/contrib/openpam/lib/pam_getenv.c +++ b/contrib/openpam/lib/pam_getenv.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_getenv.c#8 $ + * $P4: //depot/projects/openpam/lib/pam_getenv.c#10 $ */ #include <stdlib.h> @@ -56,12 +56,12 @@ pam_getenv(pam_handle_t *pamh, ENTER(); if (pamh == NULL) - RETURNC(NULL); + RETURNS(NULL); if (name == NULL || strchr(name, '=') != NULL) - RETURNC(NULL); + RETURNS(NULL); if ((i = openpam_findenv(pamh, name, strlen(name))) == -1) - RETURNC(NULL); - RETURNC(strdup(pamh->env[i])); + RETURNS(NULL); + RETURNS(strdup(pamh->env[i])); } /** |