diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-09-02 19:45:54 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-10-26 20:02:15 -0400 |
| commit | 0b1a949b7c1ce09136d3e4098b68a733d7bb32e2 (patch) | |
| tree | e7afc9b307579f15e5e571914df840a18fe2f58c /greeter | |
| parent | b6309b26edd477f45dd34b6d746eb2ac1e3fe9fc (diff) | |
config: use AC_CHECK_FUNCS for mkstemp, getifaddrs and getspnam
Using AC_CHECK_FUNCS defines HAVE_xxx macro in config.h following
a consistent naming convention.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Diffstat (limited to 'greeter')
| -rw-r--r-- | greeter/greet.c | 4 | ||||
| -rw-r--r-- | greeter/verify.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/greeter/greet.c b/greeter/greet.c index 6e29b05..d8ebb41 100644 --- a/greeter/greet.c +++ b/greeter/greet.c @@ -119,7 +119,7 @@ void (*__xdm_LogOutOfMem)(const char * fmt, ...) = NULL; void (*__xdm_setgrent)(void) = NULL; struct group *(*__xdm_getgrent)(void) = NULL; void (*__xdm_endgrent)(void) = NULL; -# ifdef USESHADOW +# ifdef HAVE_GETSPNAM struct spwd *(*__xdm_getspnam)(GETSPNAM_ARGS) = NULL; # ifndef QNX4 void (*__xdm_endspent)(void) = NULL; @@ -460,7 +460,7 @@ greet_user_rtn GreetUser( __xdm_setgrent = dlfuncs->_setgrent; __xdm_getgrent = dlfuncs->_getgrent; __xdm_endgrent = dlfuncs->_endgrent; -# ifdef USESHADOW +# ifdef HAVE_GETSPNAM __xdm_getspnam = dlfuncs->_getspnam; # ifndef QNX4 __xdm_endspent = dlfuncs->_endspent; diff --git a/greeter/verify.c b/greeter/verify.c index 6e3f14b..dee035a 100644 --- a/greeter/verify.c +++ b/greeter/verify.c @@ -43,7 +43,7 @@ from The Open Group. #if defined(USE_PAM) # include <security/pam_appl.h> # include <stdlib.h> -#elif defined(USESHADOW) +#elif defined(HAVE_GETSPNAM) # include <shadow.h> # include <errno.h> #elif defined(USE_BSDAUTH) @@ -326,7 +326,7 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify) { struct passwd *p; # ifndef USE_PAM -# ifdef USESHADOW +# ifdef HAVE_GETSPNAM struct spwd *sp; # endif char *user_pass = NULL; @@ -450,7 +450,7 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify) } } # endif -# ifdef USESHADOW +# ifdef HAVE_GETSPNAM errno = 0; sp = getspnam(greet->name); if (sp == NULL) { @@ -461,7 +461,7 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify) # ifndef QNX4 endspent(); # endif /* QNX4 doesn't need endspent() to end shadow passwd ops */ -# endif /* USESHADOW */ +# endif /* HAVE_GETSPNAM */ # if defined(ultrix) || defined(__ultrix__) if (authenticate_user(p, greet->password, NULL) < 0) # else |