--------------------- PatchSet 1303 Date: 2001/01/13 22:10:55 Author: hno Branch: compactsentry Tag: (none) Log: Updated to the new hash structure Members: src/auth/ntlm/auth_ntlm.h:1.3->1.3.2.1 Index: squid/src/auth/ntlm/auth_ntlm.h =================================================================== RCS file: /cvsroot/squid-sf//squid/src/auth/ntlm/auth_ntlm.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 --- squid/src/auth/ntlm/auth_ntlm.h 11 Jan 2001 00:05:18 -0000 1.3 +++ squid/src/auth/ntlm/auth_ntlm.h 13 Jan 2001 22:10:55 -0000 1.3.2.1 @@ -9,6 +9,12 @@ #define DefaultAuthenticateChildrenMax 32 /* 32 processes */ /* Generic */ +typedef struct _ntlm_user ntlm_user_t; +typedef struct _ntlm_hash_user_pointer ntlm_hash_user_pointer; +typedef struct _ntlm_request ntlm_request_t; +typedef struct _ntlm_helper_state_t ntlm_helper_state_t; +typedef struct _auth_ntlm_config auth_ntlm_config; + typedef struct { void *data; auth_user_request_t *auth_user_request; @@ -21,6 +27,13 @@ dlink_list proxy_auth_list; }; +struct _ntlm_hash_user_pointer { + hash_link hash; /* must be first */ + char *ntlmhash; /* the NTLM hash key */ + auth_user_t *auth_user; /* User for this hash */ + dlink_node link; /* other NTLM hashes for this user */ +}; + struct _ntlm_request { /* what negotiate string did the client use? */ char *ntlmnegotiate; @@ -49,11 +62,6 @@ time_t challengelifetime; }; -typedef struct _ntlm_user ntlm_user_t; -typedef struct _ntlm_request ntlm_request_t; -typedef struct _ntlm_helper_state_t ntlm_helper_state_t; -typedef struct _auth_ntlm_config auth_ntlm_config; - extern MemPool *ntlm_helper_state_pool; extern MemPool *ntlm_user_pool; extern MemPool *ntlm_request_pool;