diff options
| author | lukem <lukem@NetBSD.org> | 2007-07-23 10:41:05 +0000 |
|---|---|---|
| committer | lukem <lukem@NetBSD.org> | 2007-07-23 10:41:05 +0000 |
| commit | f21ab048dadf6cb971b5cf55282ee7bc6a86115e (patch) | |
| tree | 053c033cd8d2d944a47a0ddfa4f470a322556eff /libexec | |
| parent | f92f1237092f643ebb8c299b82df2774b79d23ef (diff) | |
Rename cred_t to ftpd_cred_t; the former causes a nameclash on Solaris.
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ftpd/ftpd.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index 5e9905092be..cc8026797c4 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1,4 +1,4 @@ -/* $NetBSD: ftpd.c,v 1.181 2007/07/22 05:06:45 lukem Exp $ */ +/* $NetBSD: ftpd.c,v 1.182 2007/07/23 10:41:05 lukem Exp $ */ /* * Copyright (c) 1997-2004 The NetBSD Foundation, Inc. @@ -105,7 +105,7 @@ __COPYRIGHT( #if 0 static char sccsid[] = "@(#)ftpd.c 8.5 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: ftpd.c,v 1.181 2007/07/22 05:06:45 lukem Exp $"); +__RCSID("$NetBSD: ftpd.c,v 1.182 2007/07/23 10:41:05 lukem Exp $"); #endif #endif /* not lint */ @@ -3660,18 +3660,17 @@ cprintf(FILE *fd, const char *fmt, ...) */ #define COPY_STRING(s) (s ? strdup(s) : NULL) -struct cred_t { +typedef struct { const char *uname; /* user name */ const char *pass; /* password */ -}; -typedef struct cred_t cred_t; +} ftpd_cred_t; static int auth_conv(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *appdata) { int i; - cred_t *cred = (cred_t *) appdata; + ftpd_cred_t *cred = (ftpd_cred_t *) appdata; struct pam_response *myreply; myreply = calloc(num_msg, sizeof *myreply); @@ -3719,7 +3718,7 @@ auth_pam(struct passwd **ppw, const char *pwstr) const void *item; int rval; int e; - cred_t auth_cred = { (*ppw)->pw_name, pwstr }; + ftpd_cred_t auth_cred = { (*ppw)->pw_name, pwstr }; struct pam_conv conv = { &auth_conv, &auth_cred }; e = pam_start("ftpd", (*ppw)->pw_name, &conv, &pamh); |
