Attachment #391612 for bug #532514

View | Details | Raw Unified | Return to bug 532514 | Differences between

and this patch

Lines 49-55 struct conf_list { Link Here

(-)a/support/include/conffile.h (-1 / +1 lines)
49	extern char *conf_path;	49	extern char *conf_path;
50		50
51	extern int conf_begin(void);	51	extern int conf_begin(void);
52	extern int conf_decode_base64(u_int8_t , u_int32_t , u_char *);	52	extern int conf_decode_base64(uint8_t , uint32_t , unsigned char *);
53	extern int conf_end(int, int);	53	extern int conf_end(int, int);
54	extern void conf_free_list(struct conf_list *);	54	extern void conf_free_list(struct conf_list *);
55	extern struct sockaddr conf_get_address(char , char *);	55	extern struct sockaddr conf_get_address(char , char *);




/*
 * Radix-64 Encoding.
 */
static const uint8_t bin2asc[]
  = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";

static const uint8_t asc2bin[] =
{
  255, 255, 255, 255, 255, 255, 255, 255,
  255, 255, 255, 255, 255, 255, 255, 255,


static char *conf_addr;

static __inline__ uint8_t
conf_hash(char *s)
{
	uint8_t hash = 0;

	while (*s) {
		hash = ((hash << 1) | (hash >> 7)) ^ tolower (*s);


/* Decode a PEM encoded buffer.  */
int
conf_decode_base64 (uint8_t *out, uint32_t *len, unsigned char *buf)
{
	uint32_t c = 0;
	uint8_t c1, c2, c3, c4;

	while (*buf) {
		if (*buf > 127 || (c1 = asc2bin[*buf]) == 255)
- 

Return to bug 532514

Lines 72-81 TAILQ_HEAD (conf_trans_head, conf_trans) conf_trans_queue; Link Here

(-)a/support/nfs/conffile.c (-8 / +7 lines)
72	/*	72	/*
73	* Radix-64 Encoding.	73	* Radix-64 Encoding.
74	*/	74	*/
75	static const u_int8_t bin2asc[]	75	static const uint8_t bin2asc[]
76	= "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";	76	= "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
77		77
78	static const u_int8_t asc2bin[] =	78	static const uint8_t asc2bin[] =
79	{	79	{
80	255, 255, 255, 255, 255, 255, 255, 255,	80	255, 255, 255, 255, 255, 255, 255, 255,
81	255, 255, 255, 255, 255, 255, 255, 255,	81	255, 255, 255, 255, 255, 255, 255, 255,
Lines 109-118 LIST_HEAD (conf_bindings, conf_binding) conf_bindings[256]; Link Here
109		109
110	static char *conf_addr;	110	static char *conf_addr;
111		111
112	static __inline__ u_int8_t	112	static __inline__ uint8_t
113	conf_hash(char *s)	113	conf_hash(char *s)
114	{	114	{
115	u_int8_t hash = 0;	115	uint8_t hash = 0;
116		116
117	while (*s) {	117	while (*s) {
118	hash = ((hash << 1) \| (hash >> 7)) ^ tolower (*s);	118	hash = ((hash << 1) \| (hash >> 7)) ^ tolower (*s);
Lines 603-612 cleanup: Link Here
603		603
604	/* Decode a PEM encoded buffer. */	604	/* Decode a PEM encoded buffer. */
605	int	605	int
606	conf_decode_base64 (u_int8_t out, u_int32_t len, u_char *buf)	606	conf_decode_base64 (uint8_t out, uint32_t len, unsigned char *buf)
607	{	607	{
608	u_int32_t c = 0;	608	uint32_t c = 0;
609	u_int8_t c1, c2, c3, c4;	609	uint8_t c1, c2, c3, c4;
610		610
611	while (*buf) {	611	while (*buf) {
612	if (buf > 127 \|\| (c1 = asc2bin[buf]) == 255)	612	if (buf > 127 \|\| (c1 = asc2bin[buf]) == 255)
613	-