svn commit: samba r19771 - in branches/SAMBA_3_0_24/source: groupdb smbd

[jerry at samba.org]

Author: jerry
Date: 2006-11-18 16:48:44 +0000 (Sat, 18 Nov 2006)
New Revision: 19771

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19771

Log:
more compile fixes....have to tackle the DLIST_XXX macros next
Modified:
   branches/SAMBA_3_0_24/source/groupdb/mapping.h
   branches/SAMBA_3_0_24/source/smbd/reply.c
   branches/SAMBA_3_0_24/source/smbd/service.c


Changeset:
Modified: branches/SAMBA_3_0_24/source/groupdb/mapping.h
===================================================================
--- branches/SAMBA_3_0_24/source/groupdb/mapping.h	2006-11-18 16:38:33 UTC (rev 19770)
+++ branches/SAMBA_3_0_24/source/groupdb/mapping.h	2006-11-18 16:48:44 UTC (rev 19771)
@@ -11,7 +11,7 @@
 #define MEMBEROF_PREFIX "MEMBEROF/"
 
 /* internal prototypes */
-BOOL enum_group_mapping(const DOM_SID *domsid, enum lsa_SidType sid_name_use, GROUP_MAP **pp_rmap,
+BOOL enum_group_mapping(const DOM_SID *domsid, enum SID_NAME_USE sid_name_use, GROUP_MAP **pp_rmap,
 			size_t *p_num_entries, BOOL unix_only);
 BOOL group_map_remove(const DOM_SID *sid);
 BOOL init_group_mapping(void);

Modified: branches/SAMBA_3_0_24/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0_24/source/smbd/reply.c	2006-11-18 16:38:33 UTC (rev 19770)
+++ branches/SAMBA_3_0_24/source/smbd/reply.c	2006-11-18 16:48:44 UTC (rev 19771)
@@ -132,13 +132,22 @@
 					break;
 			}
 		} else {
-			switch(next_mb_char_size(s)) {
+			size_t siz;
+			/* Get the size of the next MB character. */
+			next_codepoint(s,&siz);
+			switch(siz) {
+				case 5:
+					*d++ = *s++;
+					/*fall through*/
 				case 4:
 					*d++ = *s++;
+					/*fall through*/
 				case 3:
 					*d++ = *s++;
+					/*fall through*/
 				case 2:
 					*d++ = *s++;
+					/*fall through*/
 				case 1:
 					*d++ = *s++;
 					break;
@@ -266,7 +275,13 @@
 			}
 			*d++ = *s++;
 		} else {
-			switch(next_mb_char_size(s)) {
+			size_t siz;
+			/* Get the size of the next MB character. */
+			next_codepoint(s,&siz);
+			switch(siz) {
+				case 5:
+					*d++ = *s++;
+					/*fall through*/
 				case 4:
 					*d++ = *s++;
 					/*fall through*/
@@ -374,7 +389,13 @@
 		if (!(*s & 0x80)) {
 			*d++ = *s++;
 		} else {
-			switch(next_mb_char_size(s)) {
+			size_t siz;
+			/* Get the size of the next MB character. */
+			next_codepoint(s,&siz);
+			switch(siz) {
+				case 5:
+					*d++ = *s++;
+					/*fall through*/
 				case 4:
 					*d++ = *s++;
 					/*fall through*/

Modified: branches/SAMBA_3_0_24/source/smbd/service.c
===================================================================
--- branches/SAMBA_3_0_24/source/smbd/service.c	2006-11-18 16:38:33 UTC (rev 19770)
+++ branches/SAMBA_3_0_24/source/smbd/service.c	2006-11-18 16:48:44 UTC (rev 19771)
@@ -95,13 +95,22 @@
 		if (!(*s & 0x80)) {
 			*d++ = *s++;
 		} else {
-			switch(next_mb_char_size(s)) {
+			size_t siz;
+			/* Get the size of the next MB character. */
+			next_codepoint(s,&siz);
+			switch(siz) {
+				case 5:
+					*d++ = *s++;
+					/*fall through*/
 				case 4:
 					*d++ = *s++;
+					/*fall through*/
 				case 3:
 					*d++ = *s++;
+					/*fall through*/
 				case 2:
 					*d++ = *s++;
+					/*fall through*/
 				case 1:
 					*d++ = *s++;
 					break;