Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d6c2e4d02b72d8ae63784bdc57cfa285128de211
Commit:     d6c2e4d02b72d8ae63784bdc57cfa285128de211
Parent:     c359cf3c61c6ea9f4f461a8bd22023a15d75d9b5
Author:     Jeff Layton <[EMAIL PROTECTED]>
AuthorDate: Fri Nov 16 22:23:17 2007 +0000
Committer:  Steve French <[EMAIL PROTECTED]>
CommitDate: Fri Nov 16 22:23:17 2007 +0000

    [CIFS] have cifs_get_spnego_key get the hostname from TCP_Server_Info
    
    Signed-off-by: Jeff Layton <[EMAIL PROTECTED]>
    Signed-off-by: Steve French <[EMAIL PROTECTED]>
---
 fs/cifs/cifs_spnego.c |    3 ++-
 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 d79eee4..c466b56 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 0c55dff..3a37c6c 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);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to