#ifdef HAVE_PWD_H
# include <pwd.h>
#endif
+#ifdef HAVE_AIX_SECURITY
+# include <userpw.h>
+#endif
#include <lber.h>
const struct berval *cred );
#endif
+#ifdef SLAPD_CRYPT
static int chk_crypt(
const struct pw_scheme *scheme,
const struct berval *passwd,
const struct berval *cred );
+#if defined( HAVE_GETPWNAM ) && defined( HAVE_PW_PASSWD )
static int chk_unix(
const struct pw_scheme *scheme,
const struct berval *passwd,
const struct berval *cred );
+#endif
+#endif
/* password hash routines */
const struct pw_scheme *scheme,
const struct berval *passwd );
+#ifdef SLAPD_CRYPT
static struct berval *hash_crypt(
const struct pw_scheme *scheme,
const struct berval *passwd );
+#endif
static const struct pw_scheme pw_schemes[] =
#ifdef SLAPD_CRYPT
{ {sizeof("{CRYPT}")-1, "{CRYPT}"}, chk_crypt, hash_crypt },
-#endif
-# if defined( HAVE_GETSPNAM ) \
- || ( defined( HAVE_GETPWNAM ) && defined( HAVE_PW_PASSWD ) )
+# if defined( HAVE_GETPWNAM ) && defined( HAVE_PW_PASSWD )
{ {sizeof("{UNIX}")-1, "{UNIX}"}, chk_unix, NULL },
+# endif
#endif
#ifdef SLAPD_CLEARTEXT
return strcmp( passwd->bv_val, cr ) ? 1 : 0;
}
-# if defined( HAVE_GETSPNAM ) \
- || ( defined( HAVE_GETPWNAM ) && defined( HAVE_PW_PASSWD ) )
+# if defined( HAVE_GETPWNAM ) && defined( HAVE_PW_PASSWD )
static int chk_unix(
const struct pw_scheme *sc,
const struct berval * passwd,
return -1; /* passwd must behave like a string */
}
-# ifdef HAVE_GETSPNAM
{
- struct spwd *spwd = getspnam(passwd->bv_val);
+ struct passwd *pwd = getpwnam(passwd->bv_val);
- if(spwd == NULL) {
+ if(pwd == NULL) {
return -1; /* not found */
}
- pw = spwd->sp_pwdp;
+ pw = pwd->pw_passwd;
}
-
-# else
+# ifdef HAVE_GETSPNAM
{
- struct passwd *pwd = getpwnam(passwd->bv_val);
+ struct spwd *spwd = getspnam(passwd->bv_val);
- if(pwd == NULL) {
- return -1; /* not found */
+ if(spwd != NULL) {
+ pw = spwd->sp_pwdp;
}
+ }
+# endif
+# ifdef HAVE_AIX_SECURITY
+ {
+ struct userpw *upw = getuserpw(passwd->bv_val);
- pw = pwd->pw_passwd;
+ if (upw != NULL) {
+ pw = upw->upw_passwd;
+ }
}
# endif