summaryrefslogtreecommitdiff
path: root/source3/smbd/password.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-03-24 10:53:06 +1100
committerAndrew Tridgell <tridge@samba.org>2009-03-24 10:53:06 +1100
commit0e3339a46b1747156f35d136dbbc93b503b85b1c (patch)
tree783aafc4b94db5ba1be889cbe4b44363dfee5d54 /source3/smbd/password.c
parent7f113904eba5361d963075bcea7e36fd98ca34aa (diff)
parent36b957b5b7a1f70e39eeef224820739f24b999c9 (diff)
downloadsamba-0e3339a46b1747156f35d136dbbc93b503b85b1c.tar.gz
samba-0e3339a46b1747156f35d136dbbc93b503b85b1c.tar.bz2
samba-0e3339a46b1747156f35d136dbbc93b503b85b1c.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/smbd/password.c')
-rw-r--r--source3/smbd/password.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 15d120a79c..076965e783 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -298,11 +298,13 @@ int register_existing_vuid(uint16 vuid,
vuser->server_info->unix_name);
}
- if (srv_is_signing_negotiated() && !vuser->server_info->guest &&
- !srv_signing_started()) {
+ if (srv_is_signing_negotiated(smbd_server_conn) &&
+ !vuser->server_info->guest) {
/* Try and turn on server signing on the first non-guest
* sessionsetup. */
- srv_set_signing(vuser->server_info->user_session_key, response_blob);
+ srv_set_signing(smbd_server_conn,
+ vuser->server_info->user_session_key,
+ response_blob);
}
/* fill in the current_user_info struct */