aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2007-11-16 17:23:17 -0500
committerSteve French <sfrench@us.ibm.com>2007-11-16 17:23:17 -0500
commitd6c2e4d02b72d8ae63784bdc57cfa285128de211 (patch)
tree4b5d3bcc06a72697413d588e3b87a2b18e619437 /fs/cifs
parentc359cf3c61c6ea9f4f461a8bd22023a15d75d9b5 (diff)
[CIFS] have cifs_get_spnego_key get the hostname from TCP_Server_Info
Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/cifs_spnego.c3
-rw-r--r--fs/cifs/cifsproto.h3
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c
index d79eee41e9c5..c466b56e0283 100644
--- a/fs/cifs/cifs_spnego.c
+++ b/fs/cifs/cifs_spnego.c
@@ -73,12 +73,13 @@ struct key_type cifs_spnego_key_type = {
73#define MAX_IPV6_ADDR_LEN 42 /* eg FEDC:BA98:7654:3210:FEDC:BA98:7654:3210/60 */ 73#define MAX_IPV6_ADDR_LEN 42 /* eg FEDC:BA98:7654:3210:FEDC:BA98:7654:3210/60 */
74/* get a key struct with a SPNEGO security blob, suitable for session setup */ 74/* get a key struct with a SPNEGO security blob, suitable for session setup */
75struct key * 75struct key *
76cifs_get_spnego_key(struct cifsSesInfo *sesInfo, const char *hostname) 76cifs_get_spnego_key(struct cifsSesInfo *sesInfo)
77{ 77{
78 struct TCP_Server_Info *server = sesInfo->server; 78 struct TCP_Server_Info *server = sesInfo->server;
79 char *description, *dp; 79 char *description, *dp;
80 size_t desc_len; 80 size_t desc_len;
81 struct key *spnego_key; 81 struct key *spnego_key;
82 const char *hostname = server->hostname;
82 83
83 /* BB: come up with better scheme for determining length */ 84 /* BB: come up with better scheme for determining length */
84 /* length of fields (with semicolons): ver=0xyz ipv4= ipaddress host= 85 /* length of fields (with semicolons): ver=0xyz ipv4= ipaddress host=
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index 0c55dff2add8..3a37c6c67f6f 100644
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -77,8 +77,7 @@ extern void header_assemble(struct smb_hdr *, char /* command */ ,
77extern int small_smb_init_no_tc(const int smb_cmd, const int wct, 77extern int small_smb_init_no_tc(const int smb_cmd, const int wct,
78 struct cifsSesInfo *ses, 78 struct cifsSesInfo *ses,
79 void **request_buf); 79 void **request_buf);
80extern struct key *cifs_get_spnego_key(struct cifsSesInfo *sesInfo, 80extern struct key *cifs_get_spnego_key(struct cifsSesInfo *sesInfo);
81 const char *hostname);
82extern int CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, 81extern int CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses,
83 const int stage, 82 const int stage,
84 const struct nls_table *nls_cp); 83 const struct nls_table *nls_cp);