diff options
author | Damien Miller <djm@mindrot.org> | 2006-07-24 14:51:00 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-07-24 14:51:00 +1000 |
commit | b8fe89c4d97ea9a5d7efb2c60108b8a7644f6a49 (patch) | |
tree | 60e9457b39b992a0bf19488f5e92d57d35b6fdb5 /auth-pam.c | |
parent | d8337c5e609b3bafda0008aef2636d6f17c622ef (diff) |
- (djm) [acss.c auth-krb5.c auth-options.c auth-pam.c auth-shadow.c]
[canohost.c channels.c cipher-acss.c defines.h dns.c gss-genr.c]
[gss-serv-krb5.c gss-serv.c log.h loginrec.c logintest.c readconf.c]
[servconf.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rand-helper.c]
[ssh.c sshconnect.c sshd.c openbsd-compat/bindresvport.c]
[openbsd-compat/bsd-arc4random.c openbsd-compat/bsd-misc.c]
[openbsd-compat/getrrsetbyname.c openbsd-compat/glob.c]
[openbsd-compat/mktemp.c openbsd-compat/port-linux.c]
[openbsd-compat/port-tun.c openbsd-compat/readpassphrase.c]
[openbsd-compat/setproctitle.c openbsd-compat/xmmap.c]
make the portable tree compile again - sprinkle unistd.h and string.h
back in. Don't redefine __unused, as it turned out to be used in
headers on Linux, and replace its use in auth-pam.c with ARGSUSED
Diffstat (limited to 'auth-pam.c')
-rw-r--r-- | auth-pam.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/auth-pam.c b/auth-pam.c index cb8754ec7..6ce9db12b 100644 --- a/auth-pam.c +++ b/auth-pam.c | |||
@@ -54,6 +54,8 @@ | |||
54 | 54 | ||
55 | #include <errno.h> | 55 | #include <errno.h> |
56 | #include <signal.h> | 56 | #include <signal.h> |
57 | #include <string.h> | ||
58 | #include <unistd.h> | ||
57 | 59 | ||
58 | #ifdef USE_PAM | 60 | #ifdef USE_PAM |
59 | #if defined(HAVE_SECURITY_PAM_APPL_H) | 61 | #if defined(HAVE_SECURITY_PAM_APPL_H) |
@@ -152,14 +154,16 @@ sshpam_sigchld_handler(int sig) | |||
152 | fatal("PAM: authentication thread exited uncleanly"); | 154 | fatal("PAM: authentication thread exited uncleanly"); |
153 | } | 155 | } |
154 | 156 | ||
157 | /* ARGSUSED */ | ||
155 | static void | 158 | static void |
156 | pthread_exit(void *value __unused) | 159 | pthread_exit(void *value) |
157 | { | 160 | { |
158 | _exit(0); | 161 | _exit(0); |
159 | } | 162 | } |
160 | 163 | ||
164 | /* ARGSUSED */ | ||
161 | static int | 165 | static int |
162 | pthread_create(sp_pthread_t *thread, const void *attr __unused, | 166 | pthread_create(sp_pthread_t *thread, const void *attr, |
163 | void *(*thread_start)(void *), void *arg) | 167 | void *(*thread_start)(void *), void *arg) |
164 | { | 168 | { |
165 | pid_t pid; | 169 | pid_t pid; |
@@ -191,8 +195,9 @@ pthread_cancel(sp_pthread_t thread) | |||
191 | return (kill(thread, SIGTERM)); | 195 | return (kill(thread, SIGTERM)); |
192 | } | 196 | } |
193 | 197 | ||
198 | /* ARGSUSED */ | ||
194 | static int | 199 | static int |
195 | pthread_join(sp_pthread_t thread, void **value __unused) | 200 | pthread_join(sp_pthread_t thread, void **value) |
196 | { | 201 | { |
197 | int status; | 202 | int status; |
198 | 203 | ||