Remove the explicit TALLOC_CTX * from cli_struct.

Make us very explicit about how long a talloc ctx
should last.
Jeremy.
(This used to be commit ba9e2be2b5a59684e854609f9d82ea1633448c62)

2 files changed, 7 insertions, 3 deletions

diff --git a/source3/include/client.h b/source3/include/client.h
index dd8bb0dba9..c601e1a91c 100644
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -135,7 +135,10 @@ struct cli_state {
 	uint32 posix_capabilities;
 	bool dfsroot;
 
-	TALLOC_CTX *mem_ctx;
+#if 0
+	TALLOC_CTX *longterm_mem_ctx;
+	TALLOC_CTX *call_mem_ctx;
+#endif
 
 	smb_sign_info sign_info;
 
@@ -170,8 +173,8 @@ typedef struct file_info {
 	struct timespec mtime_ts;
 	struct timespec atime_ts;
 	struct timespec ctime_ts;
-	pstring name;
-	pstring dir;
+	char name[1024];
+	char dir[1024]; /* Should use allocated PATH_MAX here.... */
 	char short_name[13*3]; /* the *3 is to cope with multi-byte */
 } file_info;
 
diff --git a/source3/include/smb.h b/source3/include/smb.h
index be339f2e38..f85c7344bc 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -79,6 +79,7 @@ enum smb_read_errors {
 	SMB_READ_ERROR,
 	SMB_WRITE_ERROR, /* This error code can go into the client smb_rw_error. */
 	SMB_READ_BAD_SIG,
+	SMB_NO_MEMORY,
 	SMB_DO_NOT_DO_TDIS /* cli_close_connection() check for this when smbfs wants to keep tree connected */
 };