Project

General

Profile

Bug #5910 ยป libnisdb.diff

Andrew Stormont, 2015-05-05 11:31 AM

View differences:

usr/src/lib/libnisdb/nis_parse_ldap_map.c
22 22
/*
23 23
 * Copyright 2001-2003 Sun Microsystems, Inc.  All rights reserved.
24 24
 * Use is subject to license terms.
25
 *
26
 * Copyright 2015 RackTop Systems.
25 27
 */
26 28

  
27
#pragma ident	"%Z%%M%	%I%	%E% SMI"
28

  
29 29
#include <stdio.h>
30 30
#include <string.h>
31 31
#include <stdlib.h>
......
71 71
    bool_t print_mapping);
72 72
extern __yp_domain_context_t ypDomains;
73 73

  
74
/* misc functions */
75
void *s_malloc(size_t size);
76

  
74 77
/*
75 78
 * FUNCTION:	add_mapping_attribute
76 79
 *
usr/src/lib/libnisdb/db_mindex3.cc
21 21
/*
22 22
 * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
23 23
 * Use is subject to license terms.
24
 *
25
 * Copyright 2015 RackTop Systems.
24 26
 */
25 27

  
26 28
#include <sys/types.h>
......
214 216
			logmsg(MSG_NOTIMECHECK, LOG_WARNING,
215 217
			"%s: Error %d creating new thread; using current one",
216 218
				myself, stat);
217
			stat = (int)entriesFromLDAPthread(arg);
219
			stat = entriesFromLDAPreal(arg);
218 220
			return (stat);
219 221
		}
220 222

  
......
257 259
#endif	/* FORCE_SYNCHRONOUS */
258 260
	} else {
259 261
		(void) mutex_unlock(&table->mapping.enumLock);
260
		stat = (int)entriesFromLDAPthread(arg);
262
		stat = entriesFromLDAPreal(arg);
261 263
	}
262 264

  
263 265
	return (stat);
......
320 322
	if (arg->dirObj != 0)
321 323
		nis_destroy_object(arg->dirObj);
322 324
	sfree(arg);
323
	return ((void *)stat);
325
	return (NULL);
324 326
}
325 327

  
326 328
}
usr/src/lib/libnisdb/db_table.cc
24 24
 *
25 25
 * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
26 26
 * Use is subject to license terms.
27
 *
28
 * Copyright 2015 RackTop Systems.
27 29
 */
28 30

  
29 31
#include <stdio.h>
......
74 76
	(void) memcpy(&maxTimeT, b, sizeof (time_t));
75 77

  
76 78
	if (maxTimeT < 1)
77
		maxTimeT = ~(1<<((8*sizeof (maxTimeT))-1));
79
		maxTimeT = ~(1L<<((8*sizeof (maxTimeT))-1));
78 80
}
79 81
#pragma init(__setMaxTimeT)
80 82
}
usr/src/lib/libnisdb/nis_db.cc
23 23
 *
24 24
 * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
25 25
 * Use is subject to license terms.
26
 *
27
 * Copyright 2015 RackTop Systems.
26 28
 */
27 29

  
28 30

  
......
144 146
bool_t
145 147
db_in_dict_file(char *name)
146 148
{
147
	return ((bool_t) InUseDictionary->find_table_desc(name));
149
	return (InUseDictionary->find_table_desc(name) != NULL);
148 150

  
149 151
}
150 152

  
    (1-1/1)