diff options
| author | Gerald Carter <jerry@samba.org> | 2006-11-15 05:28:33 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2006-11-15 05:28:33 +0000 |
| commit | 8300310d5e5ca57f0cd7679c9839ce737a3fb40e (patch) | |
| tree | e9cfaa42eebd0c200517344c51bbdd9eba52fd6b /source | |
| parent | fb8355e356d8cd0a3fab9a0f4f8102c38d804489 (diff) | |
| download | samba-8300310d5e5ca57f0cd7679c9839ce737a3fb40e.tar.gz samba-8300310d5e5ca57f0cd7679c9839ce737a3fb40e.tar.xz samba-8300310d5e5ca57f0cd7679c9839ce737a3fb40e.zip | |
r19711: grab the deadtime parameter fix for 3.0.23d
Diffstat (limited to 'source')
| -rw-r--r-- | source/nsswitch/pam_winbind.c | 6 | ||||
| -rw-r--r-- | source/smbd/conn.c | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/source/nsswitch/pam_winbind.c b/source/nsswitch/pam_winbind.c index e2b9c29e8c8..069d15d6464 100644 --- a/source/nsswitch/pam_winbind.c +++ b/source/nsswitch/pam_winbind.c @@ -830,7 +830,6 @@ const char *get_conf_item_string(int argc, int flag) { int i = 0; - char *parm = NULL; const char *parm_opt = NULL; char *key = NULL; @@ -855,9 +854,7 @@ const char *get_conf_item_string(int argc, if ((strncmp(argv[i], item, strlen(item)) == 0)) { char *p; - parm = strdup(argv[i]); - - if ( (p = strchr( parm, '=' )) == NULL) { + if ( (p = strchr( argv[i], '=' )) == NULL) { _pam_log(LOG_INFO, "no \"=\" delimiter for \"%s\" found\n", item); goto out; } @@ -870,7 +867,6 @@ const char *get_conf_item_string(int argc, _pam_log_debug(ctrl, LOG_INFO, "CONFIG file: %s '%s'\n", item, parm_opt); } out: - SAFE_FREE(parm); return parm_opt; } diff --git a/source/smbd/conn.c b/source/smbd/conn.c index d857611c355..c79f7641522 100644 --- a/source/smbd/conn.c +++ b/source/smbd/conn.c @@ -187,6 +187,7 @@ BOOL conn_idle_all(time_t t, int deadtime) /* Update if connection wasn't idle. */ if (conn->lastused != conn->lastused_count) { conn->lastused = t; + conn->lastused_count = t; } /* close dirptrs on connections that are idle */ |