sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

r23708: - Add define for WINBIND_WARN_PWD_EXPIRE.

Browse Source 
- Add parameter config_flag to get_config_item_int() and do the same
  check as in get_conf_item_string.
(This used to be commit d1d1baa264587911e1c97b3b35d5ed2bc56bf12b)
This commit is contained in:
Lars Müller 2007-07-04 20:25:29 +00:00 committed by Gerald (Jerry) Carter
parent 2f6b9c1ec4
commit b824a665bb
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source3/nsswitch/pam_winbind.c
View File

@ -264,6 +264,10 @@ static int _pam_parse(const pam_handle_t *pamh, int flags, int argc, const char
ctrl |= WINBIND_TRY_FIRST_PASS_ARG;
}
if (iniparser_getint(d, "global:warn_pwd_expire", 0)) {
ctrl |= WINBIND_WARN_PWD_EXPIRE;
}
config_from_pam:
/* step through arguments */
for (i=argc,v=argv; i-- > 0; ++v) {
@ -1532,10 +1536,15 @@ int get_config_item_int(const pam_handle_t *pamh,
const char **argv,
int ctrl,
dictionary *d,
const char *item)
const char *item,
int config_flag)
{
int i, parm_opt = -1;
if (!(ctrl & config_flag)) {
goto out;
}
/* let the pam opt take precedence over the pam_winbind.conf option */
for (i = 0; i < argc; i++) {
@ -1597,7 +1606,7 @@ int get_warn_pwd_expire_from_config(const pam_handle_t *pamh,
{
int ret;
ret = get_config_item_int(pamh, argc, argv, ctrl, d,
"warn_pwd_expire");
"warn_pwd_expire", WINBIND_WARN_PWD_EXPIRE);
/* no or broken setting */
if (ret <= 0) {
return DEFAULT_DAYS_TO_WARN_BEFORE_PWD_EXPIRES;

1
source3/nsswitch/pam_winbind.h
View File

@ -95,6 +95,7 @@ do { \
#define WINBIND_CONFIG_FILE (1<<10)
#define WINBIND_SILENT (1<<11)
#define WINBIND_DEBUG_STATE (1<<12)
#define WINBIND_WARN_PWD_EXPIRE (1<<13)
/*
* here is the string to inform the user that the new passwords they