Rolled back tree state to 11:59pm 8th November 1997 EST to

remove problems.
Jeremy
(This used to be commit 4a36ac236c2ad634f05efcd0179875d09988614a)

3 files changed, 21 insertions, 77 deletions

diff --git a/source3/include/byteorder.h b/source3/include/byteorder.h
index 46a44bad8c..4d972a5cac 100644
--- a/source3/include/byteorder.h
+++ b/source3/include/byteorder.h
@@ -207,7 +207,7 @@ it also defines lots of intermediate macros, just ignore those :-)
 	DEBUG(5,("%s%04x %s: ", \
              tab_depth(depth), PTR_DIFF(inbuf,base),string)); \
     if (charmode) print_asc(5, (unsigned char*)(outbuf), (len)); else \
-	{ int idx; for (idx = 0; idx < len; idx++) { DEBUG(5,("%02x ", (uint8)((outbuf)[idx]))); } } \
+	{ int idx; for (idx = 0; idx < len; idx++) { DEBUG(5,("%02x ", (outbuf)[idx])); } } \
 	DEBUG(5,("\n"));
 
 #define DBG_RW_PSVAL(charmode,string,depth,base,read,inbuf,outbuf,len) \
@@ -215,7 +215,7 @@ it also defines lots of intermediate macros, just ignore those :-)
 	DEBUG(5,("%s%04x %s: ", \
              tab_depth(depth), PTR_DIFF(inbuf,base),string)); \
     if (charmode) print_asc(5, (unsigned char*)(outbuf), 2*(len)); else \
-	{ int idx; for (idx = 0; idx < len; idx++) { DEBUG(5,("%04x ", (uint16)((outbuf)[idx]))); } } \
+	{ int idx; for (idx = 0; idx < len; idx++) { DEBUG(5,("%04x ", (outbuf)[idx])); } } \
 	DEBUG(5,("\n"));
 
 #define DBG_RW_PIVAL(charmode,string,depth,base,read,inbuf,outbuf,len) \
@@ -223,7 +223,7 @@ it also defines lots of intermediate macros, just ignore those :-)
 	DEBUG(5,("%s%04x %s: ", \
              tab_depth(depth), PTR_DIFF(inbuf,base),string)); \
     if (charmode) print_asc(5, (unsigned char*)(outbuf), 4*(len)); else \
-	{ int idx; for (idx = 0; idx < len; idx++) { DEBUG(5,("%08x ", (uint32)((outbuf)[idx]))); } } \
+	{ int idx; for (idx = 0; idx < len; idx++) { DEBUG(5,("%08x ", (outbuf)[idx])); } } \
 	DEBUG(5,("\n"));
 
 #define DBG_RW_CVAL(string,depth,base,read,inbuf,outbuf) \
diff --git a/source3/include/proto.h b/source3/include/proto.h
index df7e182848..1724c312db 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -61,14 +61,13 @@ BOOL cli_unlock(struct cli_state *cli, int fnum, uint32 offset, uint32 len, int
 int cli_read(struct cli_state *cli, int fnum, char *buf, uint32 offset, uint16 size);
 int cli_write(struct cli_state *cli, int fnum, char *buf, uint32 offset, uint16 size);
 BOOL cli_negprot(struct cli_state *cli);
-BOOL cli_session_request(struct cli_state *cli,
-			char *called_host_name        , int called_name_type,
-			char  calling_netbios_name[16], int calling_name_type);
+BOOL cli_session_request(struct cli_state *cli, char *host, int name_type,
+			 char *myname);
 BOOL cli_connect(struct cli_state *cli, char *host, struct in_addr *ip);
 BOOL cli_initialise(struct cli_state *cli);
 void cli_shutdown(struct cli_state *cli);
 char *cli_errstr(struct cli_state *cli);
-BOOL cli_error(struct cli_state *cli, uint8 *eclass, uint32 *num);
+void cli_error(struct cli_state *cli, int *eclass, int *num);
 void cli_sockopt(struct cli_state *cli, char *options);
 int cli_setpid(struct cli_state *cli, int pid);
 
@@ -628,17 +627,9 @@ void sync_browse_lists(struct subnet_record *d, struct work_record *work,
 
 /*The following definitions come from  ntclient.c  */
 
-BOOL wksta_trust_account_check(struct in_addr dest_ip, char *dest_host,
-				char *myhostname, char *domain,
-				fstring mach_pwd, fstring new_mach_pwd);
-BOOL do_nt_login(struct in_addr dest_ip, char *dest_host,
-				char *myhostname,
+BOOL do_nt_login(char *desthost, char *myhostname,
 				int Client, int cnum);
 
-/*The following definitions come from  nterr.c  */
-
-char *get_nt_error_msg(uint16 nt_code);
-
 /*The following definitions come from  params.c  */
 
 BOOL pm_process( char *FileName,
@@ -663,6 +654,11 @@ BOOL user_ok(char *user,int snum);
 BOOL authorise_login(int snum,char *user,char *password, int pwlen, 
 		     BOOL *guest,BOOL *force,uint16 vuid);
 BOOL check_hosts_equiv(char *user);
+struct cli_state *server_client(void);
+struct cli_state *server_cryptkey(void);
+BOOL server_validate(char *user, char *domain, 
+		     char *pass, int passlen,
+		     char *ntpass, int ntpasslen);
 
 /*The following definitions come from  pcap.c  */
 
@@ -696,18 +692,6 @@ void status_printjob(int cnum,int snum,int jobid,int status);
 int printjob_encode(int snum, int job);
 void printjob_decode(int jobid, int *snum, int *job);
 
-/*The following definitions come from  pwd_validate.c  */
-
-BOOL server_connect_init(struct cli_state *clnt, char my_netbios_name[16],
-				struct in_addr dest_ip, char *desthost);
-BOOL server_cryptkey(struct cli_state *clnt, char my_netbios_name[16]);
-BOOL server_validate2(struct cli_state *clnt, char *user, char *domain, 
-		     char *pass, int passlen,
-		     char *ntpass, int ntpasslen);
-BOOL server_validate(struct cli_state *clnt, char *user, char *domain, 
-		     char *pass, int passlen,
-		     char *ntpass, int ntpasslen);
-
 /*The following definitions come from  quotas.c  */
 
 BOOL disk_quotas(char *path, int *bsize, int *dfree, int *dsize);
@@ -1057,7 +1041,6 @@ char* wks_io_r_unknown_0(BOOL io, WKS_R_UNKNOWN_0 *r_u, char *q, char *base, int
 
 /*The following definitions come from  server.c  */
 
-struct cli_state *pwd_server_connection(void);
 void  *dflt_sig(void);
 void  killkids(void);
 mode_t unix_mode(int cnum,int dosmode);
@@ -1125,11 +1108,10 @@ void cred_hash2(unsigned char *out,unsigned char *in,unsigned char *key);
 
 /*The following definitions come from  smbencrypt.c  */
 
-void SMBencrypt(uchar *passwd, uchar *c8, uchar p24[24]);
+void SMBencrypt(uchar *passwd, uchar *c8, uchar *p24);
 void E_md4hash(uchar *passwd, uchar *p16);
-void SMBOWFencrypt(char passwd[16], uchar *c8, uchar p24[24]);
-void SMBNTencrypt(uchar *passwd, uchar *c8, uchar p24[24]);
-void nt_lm_owf_gen(char *pwd, char nt_p16[16], char p16[16]);
+void SMBNTencrypt(uchar *passwd, uchar *c8, uchar *p24);
+void nt_lm_owf_gen(char *pwd, char *nt_p16, char *p16);
 
 /*The following definitions come from  smberr.c  */
 
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 687f14b9ca..afa9e3d9b9 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1363,13 +1363,9 @@ struct cli_state {
 	int protocol;
 	int sec_mode;
 	int error;
-	int privileges;
+	int privilages;
 	fstring eff_name;
-
-	fstring full_dest_host_name;
-	char called_netbios_name[16];
-	char calling_netbios_name[16];
-
+	fstring desthost;
 	char cryptkey[8];
 	uint32 sesskey;
 	int serverzone;
@@ -2024,15 +2020,6 @@ char *Strstr(char *s, char *p);
 #define BROWSER_CONSTANT	0xaa55
 
 
-/* NT Flags2 bits - cifs6.txt section 3.1.2 */
-
-#define FLAGS2_LONG_PATH_COMPONENTS   0x0001
-#define FLAGS2_EXTENDED_ATTRIBUTES    0x0002
-#define FLAGS2_DFS_PATHNAMES          0x1000
-#define FLAGS2_READ_PERMIT_NO_EXECUTE 0x2000
-#define FLAGS2_32_BIT_ERROR_CODES     0x4000
-#define FLAGS2_UNICODE_STRINGS        0x8000
-
 /* Capabilities.  see ftp.microsoft.com/developr/drg/cifs/cifs/cifs4.txt */
 
 #define CAP_RAW_MODE         0x0001
@@ -2050,39 +2037,14 @@ char *Strstr(char *s, char *p);
 
 /* protocol types. It assumes that higher protocols include lower protocols
    as subsets */
-enum protocol_types
-{
-	PROTOCOL_NONE,
-	PROTOCOL_CORE,
-	PROTOCOL_COREPLUS,
-	PROTOCOL_LANMAN1,
-	PROTOCOL_LANMAN2,
-	PROTOCOL_NT1
-};
+enum protocol_types {PROTOCOL_NONE,PROTOCOL_CORE,PROTOCOL_COREPLUS,PROTOCOL_LANMAN1,PROTOCOL_LANMAN2,PROTOCOL_NT1};
 
 /* security levels */
-enum security_types
-{
-	SEC_SHARE,
-	SEC_USER,
-	SEC_SERVER
-};
-
-/* bit-masks for security mode.  see cifs6.txt Negprot 4.1.1 server response */
-#define USE_USER_LEVEL_SECURITY 1
-#define USE_CHALLENGE_RESPONSE  2
+enum security_types {SEC_SHARE,SEC_USER,SEC_SERVER};
 
 /* printing types */
-enum printing_types
-{
-	PRINT_BSD,
-	PRINT_SYSV,
-	PRINT_AIX,
-	PRINT_HPUX,
-	PRINT_QNX,
-	PRINT_PLP,
-	PRINT_LPRNG
-};
+enum printing_types {PRINT_BSD,PRINT_SYSV,PRINT_AIX,PRINT_HPUX,
+		     PRINT_QNX,PRINT_PLP,PRINT_LPRNG};
 
 /* Remote architectures we know about. */
 enum remote_arch_types {RA_UNKNOWN, RA_WFWG, RA_OS2, RA_WIN95, RA_WINNT, RA_SAMBA};