Merge from HEAD:

- NTLMSSP over SPENGO (sesssion-setup-and-x) cleanup and code refactor.
  - also consequential changes to the NTLMSSP and SPNEGO parsing functions
  - and the client code that uses the same functions
 - Add ntlm_auth, a NTLMSSP authentication interface for use by applications
   like Squid and Apache.
  - also consquential changes to use common code for base64 encode/decode.
 - Winbind changes to support ntlm_auth (I don't want this program to need
   to read smb.conf, instead getting all it's details over the pipe).
 - nmbd changes for fstrcat() instead of fstrcpy().

Andrew Bartlett

source/include/ntlmssp.h

@@ -71,9 +71,20 @@ typedef struct ntlmssp_state
 {
 	TALLOC_CTX *mem_ctx;
 	enum NTLMSSP_ROLE role;
-	struct auth_context *auth_context;
-	struct auth_serversupplied_info *server_info;
 	BOOL unicode;
-	char *orig_user;
-	char *orig_domain;
+	char *user;
+	char *domain;
+	char *workstation;
+ 	DATA_BLOB lm_resp;
+	DATA_BLOB nt_resp;
+	DATA_BLOB chal;
+	void *auth_context;
+	const uint8 *(*get_challenge)(struct ntlmssp_state *ntlmssp_state);
+	NTSTATUS (*check_password)(struct ntlmssp_state *ntlmssp_state);
+
+	const char *(*get_global_myname)(void);
+	const char *(*get_domain)(void);
+
+	int server_role;
 } NTLMSSP_STATE;
+