Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6c2e4d0 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

[CIFS] have cifs_get_spnego_key get the hostname from TCP_Server_Info 



Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent c359cf3c

fs/cifs/cifs_spnego.c

+2 −1
Original line number Diff line number Diff line
@@ -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=

fs/cifs/cifsproto.h

+1 −2
Original line number Diff line number Diff line
@@ -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);