[dovecot-cvs] dovecot/src/lib-ntlm ntlm-encrypt.c, 1.7, 1.8 ntlm-message.c, 1.7, 1.8 ntlm-message.h, 1.1, 1.2 ntlm.h, 1.3, 1.4

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-ntlm
In directory talvi:/tmp/cvs-serv27808/src/lib-ntlm

Modified Files:
	ntlm-encrypt.c ntlm-message.c ntlm-message.h ntlm.h 
Log Message:
Added "bool" type and changed all ints that were used as booleans to bool.



Index: ntlm-encrypt.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-ntlm/ntlm-encrypt.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ntlm-encrypt.c	8 Oct 2004 17:51:49 -0000	1.7
+++ ntlm-encrypt.c	13 Jan 2006 20:26:19 -0000	1.8
@@ -21,7 +21,7 @@
 #include <ctype.h>
 
 static unsigned char *
-t_unicode_str(const char *src, int ucase, size_t *size)
+t_unicode_str(const char *src, bool ucase, size_t *size)
 {
 	buffer_t *wstr;
 

Index: ntlm-message.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-ntlm/ntlm-message.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ntlm-message.c	11 Nov 2004 17:45:04 -0000	1.7
+++ ntlm-message.c	13 Jan 2006 20:26:19 -0000	1.8
@@ -22,7 +22,7 @@
 #include <ctype.h>
 
 const char * __ntlmssp_t_str(const void *message, struct ntlmssp_buffer *buffer,
-			     int unicode)
+			     bool unicode)
 {
 	unsigned int len = read_le16(&buffer->length);
 	const char *p = ((char *) message) + read_le32(&buffer->offset);
@@ -42,7 +42,7 @@
 }
 
 static unsigned int append_string(buffer_t *buf, const char *str, 
-				  int ucase, int unicode)
+				  bool ucase, bool unicode)
 {
 	unsigned int length = 0;
 
@@ -200,52 +200,52 @@
 	return 1;
 }
 
-int ntlmssp_check_request(const struct ntlmssp_request *request,
-			  size_t data_size, const char **error)
+bool ntlmssp_check_request(const struct ntlmssp_request *request,
+			   size_t data_size, const char **error)
 {
 	uint32_t flags;
 
 	if (data_size < sizeof(struct ntlmssp_request)) {
 		*error = "request too short";
-		return 0;
+		return FALSE;
 	}
 
 	if (read_le64(&request->magic) != NTLMSSP_MAGIC) {
 		*error = "signature mismatch";
-		return 0;
+		return FALSE;
 	}
 
 	if (read_le32(&request->type) != NTLMSSP_MSG_TYPE1) {
 		*error = "message type mismatch";
-		return 0;
+		return FALSE;
 	}
 
 	flags = read_le32(&request->flags);
 
 	if ((flags & NTLMSSP_NEGOTIATE_NTLM) == 0) {
 		*error = "client doesn't advertise NTLM support";
-		return 0;
+		return FALSE;
 	}
 
-	return 1;
+	return TRUE;
 }
 
-int ntlmssp_check_response(const struct ntlmssp_response *response,
-			   size_t data_size, const char **error)
+bool ntlmssp_check_response(const struct ntlmssp_response *response,
+			    size_t data_size, const char **error)
 {
 	if (data_size < sizeof(struct ntlmssp_response)) {
 		*error = "response too short";
-		return 0;
+		return FALSE;
 	}
 
 	if (read_le64(&response->magic) != NTLMSSP_MAGIC) {
 		*error = "signature mismatch";
-		return 0;
+		return FALSE;
 	}
 
 	if (read_le32(&response->type) != NTLMSSP_MSG_TYPE3) {
 		*error = "message type mismatch";
-		return 0;
+		return FALSE;
 	}
 
 	if (!ntlmssp_check_buffer(&response->lm_response, data_size, error) ||
@@ -253,7 +253,7 @@
 	    !ntlmssp_check_buffer(&response->domain, data_size, error) ||
 	    !ntlmssp_check_buffer(&response->user, data_size, error) ||
 	    !ntlmssp_check_buffer(&response->workstation, data_size, error))
-		return 0;
+		return FALSE;
 
-	return 1;
+	return TRUE;
 }

Index: ntlm-message.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-ntlm/ntlm-message.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ntlm-message.h	28 Jul 2004 15:39:30 -0000	1.1
+++ ntlm-message.h	13 Jan 2006 20:26:19 -0000	1.2
@@ -5,9 +5,9 @@
 ntlmssp_create_challenge(pool_t pool, const struct ntlmssp_request *request,
 			 size_t *size);
 
-int ntlmssp_check_request(const struct ntlmssp_request *request,
-			  size_t data_size, const char **error);
-int ntlmssp_check_response(const struct ntlmssp_response *response,
+bool ntlmssp_check_request(const struct ntlmssp_request *request,
 			   size_t data_size, const char **error);
+bool ntlmssp_check_response(const struct ntlmssp_response *response,
+			    size_t data_size, const char **error);
 
 #endif	/* __NTLM_MESSAGE_H__ */

Index: ntlm.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-ntlm/ntlm.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ntlm.h	22 Oct 2004 13:34:08 -0000	1.3
+++ ntlm.h	13 Jan 2006 20:26:19 -0000	1.4
@@ -31,6 +31,6 @@
 
 const char * __ntlmssp_t_str(const void *message,
 			     struct ntlmssp_buffer *buffer,
-			     int unicode);
+			     bool unicode);
 
 #endif