diff -ru samba-3.0.25c~/source/include/vfs.h samba-3.0.25c/source/include/vfs.h
--- samba-3.0.25c~/source/include/vfs.h	2007-03-20 15:25:39.000000000 -0700
+++ samba-3.0.25c/source/include/vfs.h	2007-09-07 10:26:19.000000000 -0700
@@ -291,7 +291,7 @@
 							  void *private_data,
 							  struct notify_event *ev),
 					 void *private_data, void *handle_p);
-		int (*chflags)(struct vfs_handle_struct *handle, const char *path, uint flags);
+		int (*chflags)(struct vfs_handle_struct *handle, const char *path, unsigned flags);
 		
 		/* NT ACL operations. */
 		
diff -ru samba-3.0.25c~/source/libsmb/clirap2.c samba-3.0.25c/source/libsmb/clirap2.c
--- samba-3.0.25c~/source/libsmb/clirap2.c	2007-04-09 10:30:58.000000000 -0700
+++ samba-3.0.25c/source/libsmb/clirap2.c	2007-09-07 10:30:34.000000000 -0700
@@ -1616,7 +1616,7 @@
  
 int cli_NetPrintQEnum(struct cli_state *cli,
 		void (*qfn)(const char*,uint16,uint16,uint16,const char*,const char*,const char*,const char*,const char*,uint16,uint16),
-		void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,uint,uint,const char*))
+		void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,unsigned,unsigned,const char*))
 {
   char param[WORDSIZE                         /* api number    */
 	    +sizeof(RAP_NetPrintQEnum_REQ)    /* req string    */
@@ -1719,7 +1719,7 @@
 
 int cli_NetPrintQGetInfo(struct cli_state *cli, const char *printer,
 	void (*qfn)(const char*,uint16,uint16,uint16,const char*,const char*,const char*,const char*,const char*,uint16,uint16),
-	void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,uint,uint,const char*))
+	void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,unsigned,unsigned,const char*))
 {
   char param[WORDSIZE                         /* api number    */
 	    +sizeof(RAP_NetPrintQGetInfo_REQ) /* req string    */
@@ -1888,7 +1888,7 @@
 /****************************************************************************
 call a NetSessionEnum - list workstations with sessions to an SMB server
 ****************************************************************************/
-int cli_NetSessionEnum(struct cli_state *cli, void (*fn)(char *, char *, uint16, uint16, uint16, uint, uint, uint, char *))
+int cli_NetSessionEnum(struct cli_state *cli, void (*fn)(char *, char *, uint16, uint16, uint16, unsigned, unsigned, unsigned, char *))
 {
   char param[WORDSIZE                       /* api number    */
 	    +sizeof(RAP_NetSessionEnum_REQ) /* parm string   */
@@ -1963,7 +1963,7 @@
  Call a NetSessionGetInfo - get information about other session to an SMB server.
 ****************************************************************************/
 
-int cli_NetSessionGetInfo(struct cli_state *cli, const char *workstation, void (*fn)(const char *, const char *, uint16, uint16, uint16, uint, uint, uint, const char *))
+int cli_NetSessionGetInfo(struct cli_state *cli, const char *workstation, void (*fn)(const char *, const char *, uint16, uint16, uint16, unsigned, unsigned, unsigned, const char *))
 {
   char param[WORDSIZE                          /* api number    */
 	    +sizeof(RAP_NetSessionGetInfo_REQ) /* req string    */
diff -ru samba-3.0.25c~/source/modules/vfs_full_audit.c samba-3.0.25c/source/modules/vfs_full_audit.c
--- samba-3.0.25c~/source/modules/vfs_full_audit.c	2007-03-20 15:25:38.000000000 -0700
+++ samba-3.0.25c/source/modules/vfs_full_audit.c	2007-09-07 10:34:09.000000000 -0700
@@ -182,7 +182,7 @@
 					struct notify_event *ev),
 			void *private_data, void *handle_p);
 static int smb_full_audit_chflags(vfs_handle_struct *handle,
-			    const char *path, uint flags);
+			    const char *path, unsigned flags);
 static size_t smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
 				int fd, uint32 security_info,
 				SEC_DESC **ppdesc);
@@ -1438,7 +1438,7 @@
 }
 
 static int smb_full_audit_chflags(vfs_handle_struct *handle,
-			    const char *path, uint flags)
+			    const char *path, unsigned flags)
 {
 	int result;
 
diff -ru samba-3.0.25c~/source/printing/printing.c samba-3.0.25c/source/printing/printing.c
--- samba-3.0.25c~/source/printing/printing.c	2007-02-28 20:54:09.000000000 -0800
+++ samba-3.0.25c/source/printing/printing.c	2007-09-07 10:40:30.000000000 -0700
@@ -960,7 +960,7 @@
 	print_queue_struct *queue = pts->queue;
 	size_t len;
 	size_t i;
-	uint qcount;
+	unsigned qcount;
 
 	if (max_reported_jobs && (max_reported_jobs < pts->qcount))
 		pts->qcount = max_reported_jobs;
diff -ru samba-3.0.25c~/source/rpc_parse/parse_spoolss.c samba-3.0.25c/source/rpc_parse/parse_spoolss.c
--- samba-3.0.25c~/source/rpc_parse/parse_spoolss.c	2007-06-19 10:11:36.000000000 -0700
+++ samba-3.0.25c/source/rpc_parse/parse_spoolss.c	2007-09-07 10:37:28.000000000 -0700
@@ -2406,8 +2406,8 @@
 	
 	if (MARSHALLING(ps)) {
 		/* Ensure the SD is 8 byte aligned in the buffer. */
-		uint start = prs_offset(ps); /* Remember the start position. */
-		uint off_val = 0;
+		unsigned start = prs_offset(ps); /* Remember the start position. */
+		unsigned off_val = 0;
 
 		/* Write a dummy value. */
 		if (!prs_uint32("offset", ps, depth, &off_val))
diff -ru samba-3.0.25c~/source/script/mkproto.sh samba-3.0.25c/source/script/mkproto.sh
--- samba-3.0.25c~/source/script/mkproto.sh	2007-02-28 20:55:02.000000000 -0800
+++ samba-3.0.25c/source/script/mkproto.sh	2007-09-07 10:26:00.000000000 -0700
@@ -25,7 +25,7 @@
 shift
 headertmp="$header.$$.tmp~"
 
-proto_src="`echo $@ | tr ' ' '\n' | sed -e 's/\.o/\.c/g' | sort | uniq | egrep -v 'tdb/|wrapped|modules/getdate'`"
+proto_src="`echo $@ | tr ' ' '\012' | sed -e 's/\.o/\.c/g' | sort | uniq | egrep -v 'tdb/|wrapped|modules/getdate'`"
 
 echo creating $header