diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-01-29 22:18:36 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-01-29 22:18:36 +0000 |
| commit | c9c949b92c06c9881051618d64fdccc0ea3ab106 (patch) | |
| tree | b71b85956af2f531092ff1055470062de180c386 /app/xdm/greet.h | |
| parent | 8d9e94c75a1d4651256976d0397da59188e37e5b (diff) | |
xdm 1.1.8.
Diffstat (limited to 'app/xdm/greet.h')
| -rw-r--r-- | app/xdm/greet.h | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/app/xdm/greet.h b/app/xdm/greet.h index ca0d8823c..18f487d6e 100644 --- a/app/xdm/greet.h +++ b/app/xdm/greet.h @@ -31,7 +31,7 @@ from The Open Group. /* * greet.h - interface to xdm's dynamically-loadable modular greeter */ - +#include <pwd.h> #include <X11/Xlib.h> /* @@ -78,10 +78,12 @@ struct dlfuncs { void (*_endgrent)(void); /* no longer used */ #ifdef USESHADOW struct spwd *(*_getspnam)(GETSPNAM_ARGS); +# ifndef QNX4 void (*_endspent)(void); +# endif /* QNX4 doesn't use endspent */ #endif struct passwd *(*_getpwnam)(GETPWNAM_ARGS); -#ifdef linux +#if defined(linux) || defined(__GLIBC__) void (*_endpwent)(void); #endif char *(*_crypt)(CRYPT_ARGS); @@ -160,10 +162,12 @@ extern struct group *(*__xdm_getgrent)(void); extern void (*__xdm_endgrent)(void); #ifdef USESHADOW extern struct spwd *(*__xdm_getspnam)(GETSPNAM_ARGS); +# ifndef QNX4 extern void (*__xdm_endspent)(void); +# endif /* QNX4 doesn't use endspent */ #endif extern struct passwd *(*__xdm_getpwnam)(GETPWNAM_ARGS); -#ifdef linux +#if defined(linux) || defined(__GLIBC__) extern void (*__xdm_endpwent)(void); #endif extern char *(*__xdm_crypt)(CRYPT_ARGS); @@ -199,14 +203,18 @@ extern pam_handle_t **(*__xdm_thepamhp)(void); #define getgrent (*__xdm_getgrent) #define endgrent (*__xdm_endgrent) #ifdef USESHADOW -#define getspnam (*__xdm_getspnam) -#define endspent (*__xdm_endspent) -#endif -#ifdef linux -#define endpwent (*__xdm_endpwent) +# define getspnam (*__xdm_getspnam) +# ifndef QNX4 +# define endspent (*__xdm_endspent) +# endif /* QNX4 doesn't use endspent */ #endif #define getpwnam (*__xdm_getpwnam) +#if defined(linux) || defined(__GLIBC__) +# define endpwent (*__xdm_endpwent) +#endif #define crypt (*__xdm_crypt) -#define thepamhp (*__xdm_thepamhp) +#ifdef USE_PAM +# define thepamhp (*__xdm_thepamhp) +#endif #endif /* GREET_LIB */ |