summaryrefslogtreecommitdiffstats
path: root/source/smbd/password.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2004-03-27 07:33:59 +0000
committerAndrew Bartlett <abartlet@samba.org>2004-03-27 07:33:59 +0000
commite27b5cbe75d89ec839dafd52dd33101885a4c263 (patch)
tree14d332d623c02300615ee3ed4abe2d02094c04e9 /source/smbd/password.c
parent01fff20e6e0212e9f70a5a66c3e46f7079b342f1 (diff)
downloadsamba-e27b5cbe75d89ec839dafd52dd33101885a4c263.tar.gz
samba-e27b5cbe75d89ec839dafd52dd33101885a4c263.tar.xz
samba-e27b5cbe75d89ec839dafd52dd33101885a4c263.zip
Merge from HEAD the SMB signing patch that I developed a couple of weeks
ago. This patch re-adds support for 'optional' SMB signing. It also ensures that we are much more careful about when we enable signing, particularly with on-the-fly smb.conf reloads. The client code will now attempt to use smb signing by default, and disable it if the server doesn't correctly support it. Andrew Bartlett
Diffstat (limited to 'source/smbd/password.c')
-rw-r--r--source/smbd/password.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/smbd/password.c b/source/smbd/password.c
index 9449113ddc5..ef5d0a97ac7 100644
--- a/source/smbd/password.c
+++ b/source/smbd/password.c
@@ -269,7 +269,7 @@ int register_vuid(auth_serversupplied_info *server_info, DATA_BLOB session_key,
vuser->homes_snum = -1;
}
- if (lp_server_signing() && !vuser->guest && !srv_is_signing_active()) {
+ if (srv_is_signing_negotiated() && !vuser->guest && !srv_signing_started()) {
/* Try and turn on server signing on the first non-guest sessionsetup. */
srv_set_signing(vuser->session_key, response_blob);
}