diff options
| author | Kenjiro Tsuji <Kenjiro.Tsuji@Sun.COM> | 2009-01-16 11:59:37 -0800 |
|---|---|---|
| committer | Kenjiro Tsuji <Kenjiro.Tsuji@Sun.COM> | 2009-01-16 11:59:37 -0800 |
| commit | b9175c69691c8949bec97fb8f689b7d1efdb05bb (patch) | |
| tree | 9c9b02d762f4cb6afa112bd1505698f027b3fbdf /usr/src/lib/libpam/pam_framework.c | |
| parent | 65c8f1c0a342917e5c22dcf2b006e6307631ed67 (diff) | |
| download | illumos-gate-b9175c69691c8949bec97fb8f689b7d1efdb05bb.tar.gz | |
6783069 libc must not use defread internally
Diffstat (limited to 'usr/src/lib/libpam/pam_framework.c')
| -rw-r--r-- | usr/src/lib/libpam/pam_framework.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/usr/src/lib/libpam/pam_framework.c b/usr/src/lib/libpam/pam_framework.c index 520dbc3f42..6544326585 100644 --- a/usr/src/lib/libpam/pam_framework.c +++ b/usr/src/lib/libpam/pam_framework.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -197,7 +197,9 @@ pam_trace_cname(pam_handle_t *pamh) static void pam_settrace() { - if (defopen(PAM_DEBUG) == 0) { + void *defp; + + if ((defp = defopen_r(PAM_DEBUG)) != NULL) { char *arg; int code; int facility = LOG_AUTH; @@ -205,23 +207,23 @@ pam_settrace() pam_debug = PAM_DEBUG_DEFAULT; log_priority = LOG_DEBUG; - (void) defcntl(DC_SETFLAGS, DC_CASE); - if ((arg = defread(LOG_PRIORITY)) != NULL) { + (void) defcntl_r(DC_SETFLAGS, DC_CASE, defp); + if ((arg = defread_r(LOG_PRIORITY, defp)) != NULL) { code = (int)strtol(arg, NULL, 10); if ((code & ~LOG_PRIMASK) == 0) { log_priority = code; } } - if ((arg = defread(LOG_FACILITY)) != NULL) { + if ((arg = defread_r(LOG_FACILITY, defp)) != NULL) { code = (int)strtol(arg, NULL, 10); if (code < LOG_NFACILITIES) { facility = code << 3; } } - if ((arg = defread(DEBUG_FLAGS)) != NULL) { + if ((arg = defread_r(DEBUG_FLAGS, defp)) != NULL) { pam_debug = (int)strtol(arg, NULL, 0); } - (void) defopen(NULL); /* close */ + defclose_r(defp); log_priority |= facility; } |