Solaris utmp problems

[Brandon Hume]

> The login code is heaps cleaner now.

The prototype for login() in bsd-login.h and the actual declaration don't
appear to agree:

.h contains:

#  if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
#   include <utmpx.h>
void login(struct utmp *utp, struct utmpx *utx);
#   else /* defined(HAVE_UTMPX_H) && defined(USE_UTMPX) */
void login(struct utmp *utp);
#  endif /* defined(HAVE_UTMPX_H) && defined(USE_UTMPX) */

While .c has:

#if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
void login(struct utmpx *utx)
#else /* defined(HAVE_UTMPX_H) && defined(USE_UTMPX) */
void login(struct utmp *utp)
#endif /* defined(HAVE_UTMPX_H) && defined(USE_UTMPX) */

And... just as a note... the code for dealing with utmpx and utmp in
bsd-login seems almost like two separate functions interleaved with #ifdefs.
Might it be useful to separate them out as two functions chosen with a fewer
number of #ifs?

-- 
Brandon Hume    - hume -> BOFH.Halifax.NS.Ca, http://WWW.BOFH.Halifax.NS.Ca/
                       -> Solaris Snob and general NOCMonkey