diff options
| author | markm <markm@FreeBSD.org> | 2001-06-04 19:12:08 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2001-06-04 19:12:08 +0000 |
| commit | c5ba97baf9465d5e1545ca07a5bbb988a82c68e5 (patch) | |
| tree | 2495eb28033cfb221f488b0b2f356cdb4bf3d881 | |
| parent | a29bf32a53fc6422fd252b926210c5085102c70d (diff) | |
| download | FreeBSD-src-c5ba97baf9465d5e1545ca07a5bbb988a82c68e5.zip FreeBSD-src-c5ba97baf9465d5e1545ca07a5bbb988a82c68e5.tar.gz | |
Tidy up the options list (and make it more extendable), and add some
extra "standard" options.
| -rw-r--r-- | lib/libpam/libpam/pam_mod_misc.h | 17 | ||||
| -rw-r--r-- | lib/libpam/libpam/pam_std_option.c | 3 | ||||
| -rw-r--r-- | lib/libpam/libpam/security/pam_mod_misc.h | 17 |
3 files changed, 23 insertions, 14 deletions
diff --git a/lib/libpam/libpam/pam_mod_misc.h b/lib/libpam/libpam/pam_mod_misc.h index 8e15fee..ff4dfa5 100644 --- a/lib/libpam/libpam/pam_mod_misc.h +++ b/lib/libpam/libpam/pam_mod_misc.h @@ -32,13 +32,16 @@ #include <sys/cdefs.h> /* Options */ -#define PAM_OPT_DEBUG 0x01 -#define PAM_OPT_NO_WARN 0x02 -#define PAM_OPT_USE_FIRST_PASS 0x04 -#define PAM_OPT_TRY_FIRST_PASS 0x08 -#define PAM_OPT_USE_MAPPED_PASS 0x10 -#define PAM_OPT_ECHO_PASS 0x20 -#define PAM_OPT_AUTH_AS_SELF 0x40 +#define PAM_OPT_DEBUG 0x0001 +#define PAM_OPT_NO_WARN 0x0002 +#define PAM_OPT_USE_FIRST_PASS 0x0004 +#define PAM_OPT_TRY_FIRST_PASS 0x0008 +#define PAM_OPT_USE_MAPPED_PASS 0x0010 +#define PAM_OPT_ECHO_PASS 0x0020 +#define PAM_OPT_AUTH_AS_SELF 0x0040 +#define PAM_OPT_NULLOK 0x0080 +#define PAM_OPT_NO_ANON 0x0100 +#define PAM_OPT_IGNORE 0x0200 __BEGIN_DECLS int pam_get_pass(pam_handle_t *, const char **, const char *, int); diff --git a/lib/libpam/libpam/pam_std_option.c b/lib/libpam/libpam/pam_std_option.c index fb39806..266514e 100644 --- a/lib/libpam/libpam/pam_std_option.c +++ b/lib/libpam/libpam/pam_std_option.c @@ -49,6 +49,9 @@ pam_std_option(int *options, const char *name) { "use_mapped_pass", PAM_OPT_USE_MAPPED_PASS }, { "echo_pass", PAM_OPT_ECHO_PASS }, { "auth_as_self", PAM_OPT_AUTH_AS_SELF }, + { "nullok", PAM_OPT_NULLOK }, + { "no_anon", PAM_OPT_NO_ANON }, + { "ignore", PAM_OPT_IGNORE }, { NULL, 0 } }; struct opttab *p; diff --git a/lib/libpam/libpam/security/pam_mod_misc.h b/lib/libpam/libpam/security/pam_mod_misc.h index 8e15fee..ff4dfa5 100644 --- a/lib/libpam/libpam/security/pam_mod_misc.h +++ b/lib/libpam/libpam/security/pam_mod_misc.h @@ -32,13 +32,16 @@ #include <sys/cdefs.h> /* Options */ -#define PAM_OPT_DEBUG 0x01 -#define PAM_OPT_NO_WARN 0x02 -#define PAM_OPT_USE_FIRST_PASS 0x04 -#define PAM_OPT_TRY_FIRST_PASS 0x08 -#define PAM_OPT_USE_MAPPED_PASS 0x10 -#define PAM_OPT_ECHO_PASS 0x20 -#define PAM_OPT_AUTH_AS_SELF 0x40 +#define PAM_OPT_DEBUG 0x0001 +#define PAM_OPT_NO_WARN 0x0002 +#define PAM_OPT_USE_FIRST_PASS 0x0004 +#define PAM_OPT_TRY_FIRST_PASS 0x0008 +#define PAM_OPT_USE_MAPPED_PASS 0x0010 +#define PAM_OPT_ECHO_PASS 0x0020 +#define PAM_OPT_AUTH_AS_SELF 0x0040 +#define PAM_OPT_NULLOK 0x0080 +#define PAM_OPT_NO_ANON 0x0100 +#define PAM_OPT_IGNORE 0x0200 __BEGIN_DECLS int pam_get_pass(pam_handle_t *, const char **, const char *, int); |
