diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-02-11 10:26:05 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-02-11 10:26:05 -0800 |
| commit | 37f80c7716759ed066af68011a35459706e70262 (patch) | |
| tree | 02ee2631117946dba42b6fa0a6d3aca10f83cb47 | |
| parent | ee19d5f4352135a9044a238112738dc66ec50b46 (diff) | |
unifdef QNX4
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | greeter/greet.c | 4 | ||||
| -rw-r--r-- | greeter/verify.c | 5 | ||||
| -rw-r--r-- | include/greet.h | 6 | ||||
| -rw-r--r-- | xdm/session.c | 4 |
4 files changed, 0 insertions, 19 deletions
diff --git a/greeter/greet.c b/greeter/greet.c index 36a9510..5ee4213 100644 --- a/greeter/greet.c +++ b/greeter/greet.c @@ -121,9 +121,7 @@ struct group *(*__xdm_getgrent)(void) = NULL; void (*__xdm_endgrent)(void) = NULL; # ifdef HAVE_GETSPNAM struct spwd *(*__xdm_getspnam)(GETSPNAM_ARGS) = NULL; -# ifndef QNX4 void (*__xdm_endspent)(void) = NULL; -# endif /* QNX4 doesn't use endspent */ # endif struct passwd *(*__xdm_getpwnam)(GETPWNAM_ARGS) = NULL; # if defined(linux) || defined(__GLIBC__) @@ -458,9 +456,7 @@ greet_user_rtn GreetUser( __xdm_endgrent = dlfuncs->_endgrent; # ifdef HAVE_GETSPNAM __xdm_getspnam = dlfuncs->_getspnam; -# ifndef QNX4 __xdm_endspent = dlfuncs->_endspent; -# endif /* QNX4 doesn't use endspent */ # endif __xdm_getpwnam = dlfuncs->_getpwnam; # if defined(linux) || defined(__GLIBC__) diff --git a/greeter/verify.c b/greeter/verify.c index 100a3e2..600fb1d 100644 --- a/greeter/verify.c +++ b/greeter/verify.c @@ -53,9 +53,6 @@ from The Open Group. #include "greet.h" -#ifdef QNX4 -extern char *crypt(const char *, const char *); -#endif static const char *envvars[] = { "TZ", /* SYSV and SVR4, but never hurts */ @@ -352,9 +349,7 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify) } else { user_pass = sp->sp_pwdp; } -# ifndef QNX4 endspent(); -# endif /* QNX4 doesn't need endspent() to end shadow passwd ops */ # endif /* HAVE_GETSPNAM */ crypted_pass = crypt (greet->password, user_pass); if ((crypted_pass == NULL) diff --git a/include/greet.h b/include/greet.h index 60288ab..4bee187 100644 --- a/include/greet.h +++ b/include/greet.h @@ -76,9 +76,7 @@ struct dlfuncs { void (*_endgrent)(void); /* no longer used */ #ifdef HAVE_GETSPNAM struct spwd *(*_getspnam)(GETSPNAM_ARGS); -# ifndef QNX4 void (*_endspent)(void); -# endif /* QNX4 doesn't use endspent */ #endif struct passwd *(*_getpwnam)(GETPWNAM_ARGS); #if defined(linux) || defined(__GLIBC__) @@ -160,9 +158,7 @@ extern struct group *(*__xdm_getgrent)(void); extern void (*__xdm_endgrent)(void); # ifdef HAVE_GETSPNAM 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); # if defined(linux) || defined(__GLIBC__) @@ -202,9 +198,7 @@ extern pam_handle_t **(*__xdm_thepamhp)(void); # define endgrent (*__xdm_endgrent) # ifdef HAVE_GETSPNAM # 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__) diff --git a/xdm/session.c b/xdm/session.c index a8aa429..39019f2 100644 --- a/xdm/session.c +++ b/xdm/session.c @@ -199,9 +199,7 @@ static struct dlfuncs dlfuncs = { endgrent, #ifdef HAVE_GETSPNAM getspnam, -# ifndef QNX4 endspent, -# endif /* QNX4 doesn't use endspent */ #endif getpwnam, #if defined(linux) || defined(__GLIBC__) @@ -633,13 +631,11 @@ StartClient ( return (0); } # endif -# ifndef QNX4 if (initgroups (name, verify->gid) < 0) { LogError ("initgroups for \"%s\" failed: %s\n", name, _SysErrorMsg (errno)); return (0); } -# endif /* QNX4 doesn't support multi-groups, no initgroups() */ #endif /* !HAVE_SETUSERCONTEXT */ #ifdef USE_PAM |