diff options
| author | Jeff Layton <jlayton@redhat.com> | 2007-11-16 23:23:17 +0100 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-11-16 23:23:17 +0100 |
| commit | d6c2e4d02b72d8ae63784bdc57cfa285128de211 (patch) | |
| tree | 4b5d3bcc06a72697413d588e3b87a2b18e619437 /fs | |
| parent | [CIFS] add hostname field to TCP_Server_Info struct (diff) | |
| download | linux-d6c2e4d02b72d8ae63784bdc57cfa285128de211.tar.xz linux-d6c2e4d02b72d8ae63784bdc57cfa285128de211.zip | |
[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')
| -rw-r--r-- | fs/cifs/cifs_spnego.c | 3 | ||||
| -rw-r--r-- | fs/cifs/cifsproto.h | 3 |
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 = { #define MAX_IPV6_ADDR_LEN 42 /* eg FEDC:BA98:7654:3210:FEDC:BA98:7654:3210/60 */ /* get a key struct with a SPNEGO security blob, suitable for session setup */ struct key * -cifs_get_spnego_key(struct cifsSesInfo *sesInfo, const char *hostname) +cifs_get_spnego_key(struct cifsSesInfo *sesInfo) { struct TCP_Server_Info *server = sesInfo->server; char *description, *dp; size_t desc_len; struct key *spnego_key; + const char *hostname = server->hostname; /* BB: come up with better scheme for determining length */ /* 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 */ , extern int small_smb_init_no_tc(const int smb_cmd, const int wct, struct cifsSesInfo *ses, void **request_buf); -extern struct key *cifs_get_spnego_key(struct cifsSesInfo *sesInfo, - const char *hostname); +extern struct key *cifs_get_spnego_key(struct cifsSesInfo *sesInfo); extern int CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, const int stage, const struct nls_table *nls_cp); |