From aca5e33b006d62d9a7fbf42584f93f94bda9dac4 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 13 Sep 2011 21:34:35 +0200 Subject: s3:libsmb: split cli->secblob into cli->conn.smb1.server.{guid,gss_blob,challenge,workgroup} metze --- source3/libsmb/clientgen.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'source3/libsmb/clientgen.c') diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index 80d99a7b66..05cbb9c80c 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -399,7 +399,6 @@ static void _cli_shutdown(struct cli_state *cli) cli_tdis(cli); } - data_blob_free(&cli->secblob); data_blob_free(&cli->user_session_key); cli_state_disconnect(cli); @@ -568,18 +567,12 @@ uint16_t cli_state_max_requests(struct cli_state *cli) const uint8_t *cli_state_server_challenge(struct cli_state *cli) { - static const uint8_t zero; - - if (cli->secblob.length == 8) - return cli->secblob.data; - } - - return zero; + return cli->conn.smb1.server.challenge; } const DATA_BLOB *cli_state_server_gss_blob(struct cli_state *cli) { - return &cli->secblob; + return &cli->conn.smb1.server.gss_blob; } uint16_t cli_state_security_mode(struct cli_state *cli) -- cgit