libnisdb: Avoid deprecated string constant conversion

10 files changed, 81 insertions, 91 deletions

diff --git a/usr/src/lib/libnisdb/db_dictionary.cc b/usr/src/lib/libnisdb/db_dictionary.cc
index d618529a28..a642bb3f09 100644
--- a/usr/src/lib/libnisdb/db_dictionary.cc
+++ b/usr/src/lib/libnisdb/db_dictionary.cc
@@ -26,8 +26,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "db_headers.h"
 #include "db_entry.h"
 #include "db_dictionary.h"
@@ -1509,7 +1507,7 @@ db_dictionary::find_table(char *tab, db_table_desc **where,
 	db			*res;
 	int			lstat;
 	db_status		dstat;
-	char			*myself = "db_dictionary::find_table";
+	const char		*myself = "db_dictionary::find_table";
 
 	res = find_table_noLDAP(tab, where, searchDeferred, doLoad);
 	/* If found, or shouldn't try LDAP, we're done */
@@ -1992,9 +1990,9 @@ DECLMUTEXLOCK(db_standby_list);
 static int
 close_standby_list()
 {
-	db	*database;
-	int	i, ret;
-	char	*myself = "close_standby_list";
+	db		*database;
+	int		i, ret;
+	const char	*myself = "close_standby_list";
 
 	MUTEXLOCK(db_standby_list, "close_standby_list");
 
@@ -2046,8 +2044,8 @@ close_standby_list()
 int
 add_to_standby_list(db* database)
 {
-	int	i;
-	char	*myself = "add_to_standby_list";
+	int		i;
+	const char	*myself = "add_to_standby_list";
 
 	MUTEXLOCK(db_standby_list, "add_to_standby_list");
 
@@ -2239,7 +2237,7 @@ db_dictionary::defer(char *table) {
 	WRITELOCK(this, DB_LOCK_ERROR, "w db_dictionary::defer");
 	db_table_desc	*tbl = find_table_desc(table);
 	int		res;
-	char		*myself = "db_dictionary::defer";
+	const char	*myself = "db_dictionary::defer";
 
 	if (tbl != NULL) {
 		db_table_desc	*clone, *savenext = tbl->next;
diff --git a/usr/src/lib/libnisdb/db_mindex.cc b/usr/src/lib/libnisdb/db_mindex.cc
index 9feb47045e..c3e8c22ea7 100644
--- a/usr/src/lib/libnisdb/db_mindex.cc
+++ b/usr/src/lib/libnisdb/db_mindex.cc
@@ -924,7 +924,7 @@ db_mindex::add(db_query *q, entry_object * obj)
 	bool_t valid;
 	db_index_entry *rp = NULL;
 	db_status rstat;
-	char		*myself = "db_mindex::add";
+	const char	*myself = "db_mindex::add";
 
 	/*
 	 *  The argument q is only NULL when we know that there are
diff --git a/usr/src/lib/libnisdb/db_mindex2.cc b/usr/src/lib/libnisdb/db_mindex2.cc
index eb2553d7eb..bf3d8a82ee 100644
--- a/usr/src/lib/libnisdb/db_mindex2.cc
+++ b/usr/src/lib/libnisdb/db_mindex2.cc
@@ -149,9 +149,9 @@ extern void	db_free_result(db_result *);
 zotypes
 updateMappingObj(__nis_table_mapping_t *t, char **objNameP,
 		bool_t *isMasterP) {
-	zotypes	type = NIS_BOGUS_OBJ;
-	char	*objName = 0;
-	char	*myself = "updateMappingObj";
+	zotypes         type = NIS_BOGUS_OBJ;
+	char            *objName = 0;
+	const char	*myself = "updateMappingObj";
 
 	if (t != 0)
 		objName = t->objName;
@@ -216,7 +216,7 @@ mappingFromObj(nis_object *obj, int *statP) {
 	__nis_table_mapping_t	*t;
 	__nis_buffer_t		b = {0, 0};
 	char			*objPath;
-	char			*myself = "mappingFromObj";
+	const char		*myself = "mappingFromObj";
 
 	if (obj == 0 || obj->zo_data.zo_type == NIS_ENTRY_OBJ)
 		return (0);
@@ -252,7 +252,7 @@ selectMapping(db_table *table, nis_object *obj, db_query *qin,
 	bool_t			doLDAP, asObj;
 	int			stat = LDAP_SUCCESS;
 	char			*objPath = 0, buf[MAXPATHLEN+NIS_MAXNAMELEN+1];
-	char			*myself = "db_mindex::selectMapping";
+	const char		*myself = "db_mindex::selectMapping";
 
 	/*
 	 * If 'table' is NULL, we try to find a mapping for 'obj'.
@@ -454,7 +454,7 @@ db_mindex::updateTableEntry(entry_object *e, int replace, char *tableName,
 	db_result		*dbres;
 	db_query		*qi;
 	nis_object		*oldObj = 0;
-	char			*myself = "db_mindex::updateTableEntry";
+	const char		*myself = "db_mindex::updateTableEntry";
 
 	if (table == 0 || e == 0)
 		return (LDAP_PARAM_ERROR);
@@ -688,7 +688,7 @@ static __nis_table_mapping_t *
 findDirEntryMapping(__nis_table_mapping_t *t, entry_object *e, char **name) {
 	__nis_table_mapping_t	*x;
 	char			*entryName;
-	char			*myself = "findDirEntryMapping";
+	const char			*myself = "findDirEntryMapping";
 	__nis_buffer_t		b = {0, 0};
 
 	if (e == 0 || e->en_cols.en_cols_len != 2 ||
@@ -735,7 +735,7 @@ db_mindex::queryLDAP(db_query *qin, char *dbId, int doAsynch) {
 	nis_attr		attr;
 	nis_object		*dirObj;
 	db_status		dstat;
-	char			*myself = "db_mindex::queryLDAP";
+	const char		*myself = "db_mindex::queryLDAP";
 
 	if (!useLDAPrespository || table == 0)
 		return (LDAP_SUCCESS);
@@ -1173,7 +1173,7 @@ db_mindex::storeObjLDAP(__nis_table_mapping_t *t, nis_object *o) {
 	int		numEa, doUnlock = 0;
 	db		*dbase = 0;
 	db_mindex	*dbm = 0;
-	char		*myself = "db_mindex::storeObjLDAP";
+	const char	*myself = "db_mindex::storeObjLDAP";
 
 	if (t == 0 || o == 0)
 		return (LDAP_SUCCESS);
@@ -1287,7 +1287,7 @@ db_mindex::storeLDAP(db_query *qin, entry_object *obj, nis_object *o,
 	db_query		*q, *qo, **qa;
 	__nis_rule_value_t	*rv = 0;
 	int			stat;
-	char			*myself = "db_mindex::storeLDAP";
+	const char		*myself = "db_mindex::storeLDAP";
 
 	if (!useLDAPrespository || table == 0)
 		return (LDAP_SUCCESS);
diff --git a/usr/src/lib/libnisdb/db_mindex3.cc b/usr/src/lib/libnisdb/db_mindex3.cc
index 85c63c40d8..2c4485576c 100644
--- a/usr/src/lib/libnisdb/db_mindex3.cc
+++ b/usr/src/lib/libnisdb/db_mindex3.cc
@@ -99,7 +99,7 @@ db_mindex::entriesFromLDAP(__nis_table_mapping_t *t, db_query *qin, db_query *q,
 	__entries_from_ldap_arg_t	*arg;
 	int				stat;
 	db_status			dstat;
-	char				*myself = "db_mindex::entriesFromLDAP";
+	const char			*myself = "db_mindex::entriesFromLDAP";
 
 	arg = (__entries_from_ldap_arg_t *)am(myself, sizeof (*arg));
 	if (arg == 0) {
@@ -282,7 +282,7 @@ entriesFromLDAPthread(void *voidarg) {
 
 	/* Lock to prevent removal */
 	(void) __nis_lock_db_table(arg->tableName, 1, 0,
-					"entriesFromLDAPthread");
+					(char *)"entriesFromLDAPthread");
 
 	/*
 	 * It's possible that the db_mindex for the table has changed,
@@ -314,7 +314,7 @@ entriesFromLDAPthread(void *voidarg) {
 	stat = entriesFromLDAPreal(arg);
 
 	(void) __nis_ulock_db_table(arg->tableName, 1, 0,
-					"entriesFromLDAPthread");
+					(char *)"entriesFromLDAPthread");
 
 	freeQuery(arg->q);
 	if (arg->dirObj != 0)
@@ -343,7 +343,7 @@ entriesFromLDAPreal(__entries_from_ldap_arg_t *arg) {
 	bool_t				doEnum;
 	db_status			dstat;
 	struct timeval			start;
-	char				*myself =
+	const char			*myself =
 					"db_mindex::entriesFromLDAPreal";
 
 	if (arg == 0)
@@ -708,9 +708,9 @@ entriesFromLDAPreal(__entries_from_ldap_arg_t *arg) {
 				o.zo_ttl = to->zo_ttl;
 		} else {
 			tc = 0;
-			o.zo_owner = "";
-			o.zo_group = "";
-			o.zo_domain = "";
+			o.zo_owner = (char *)"";
+			o.zo_group = (char *)"";
+			o.zo_domain = (char *)"";
 		}
 
 		o.zo_data.zo_type = NIS_ENTRY_OBJ;
diff --git a/usr/src/lib/libnisdb/db_table.cc b/usr/src/lib/libnisdb/db_table.cc
index 8ac3bf0c3f..29710d6d10 100644
--- a/usr/src/lib/libnisdb/db_table.cc
+++ b/usr/src/lib/libnisdb/db_table.cc
@@ -26,8 +26,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <malloc.h>
 #include <string.h>
@@ -398,7 +396,7 @@ db_table::allocateExpire(long oldSize, long newSize) {
 db_status
 db_table::allocateEnumArray(long oldSize, long newSize) {
 	entry_object	**newEnumArray;
-	char		*myself = "db_table::allocateEnumArray";
+	char	*myself = (char *)"db_table::allocateEnumArray";
 
 	if (enumCount.flag > 0) {
 		if (enumIndex.ptr == 0) {
@@ -558,7 +556,7 @@ db_table::get_entry(entryp where)
 void
 db_table::setEntryExp(entryp where, entry_obj *obj, int initialLoad) {
 	nis_object		*o;
-	char			*myself = "db_table::setEntryExp";
+	char			*myself = (char *)"db_table::setEntryExp";
 
 	/*
 	 * If we don't know what type of object this is yet, we
@@ -601,7 +599,7 @@ db_table::setEntryExp(entryp where, entry_obj *obj, int initialLoad) {
 			if (o != 0) {
 				__nis_buffer_t	b = {0, 0};
 
-				bp2buf(myself, &b, "%s.%s",
+				bp2buf(myself, &b, (char *)"%s.%s",
 					o->zo_name, o->zo_domain);
 				t = getObjMapping(b.buf, 0, 1, 0, 0);
 				sfree(b.buf);
@@ -766,7 +764,7 @@ bool_t
 db_table::configure(char *tablePath) {
 	long		i;
 	struct timeval	now;
-	char		*myself = "db_table::configure";
+	char	*myself = (char *)"db_table::configure";
 
 	(void) gettimeofday(&now, NULL);
 
@@ -951,7 +949,7 @@ db_table::dupEntry(entry_object *obj, entryp loc) {
  */
 void
 db_table::setEnumMode(long enumNum) {
-	char	*myself = "setEnumMode";
+	const char	*myself = "setEnumMode";
 
 	enumMode.flag++;
 	if (enumMode.flag == 1) {
@@ -969,7 +967,7 @@ db_table::setEnumMode(long enumNum) {
 		if (stat != DB_SUCCESS) {
 			enumMode.flag = 0;
 			enumCount.flag = 0;
-			logmsg(MSG_NOTIMECHECK, LOG_ERR,
+			logmsg(MSG_NOTIMECHECK, LOG_ERR, (char *)
 		"%s: No memory for enum check array; entry removal disabled",
 				myself);
 		}
diff --git a/usr/src/lib/libnisdb/ldap_glob.c b/usr/src/lib/libnisdb/ldap_glob.c
index e422336b77..7943ec685f 100644
--- a/usr/src/lib/libnisdb/ldap_glob.c
+++ b/usr/src/lib/libnisdb/ldap_glob.c
@@ -24,8 +24,6 @@
  * All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "ldap_glob.h"
 
 /* These are the local versions we use if the app doesn't provide overrides */
@@ -71,12 +69,12 @@ __local_addUpdate(log_entry_t type, char *name, int numAttr, nis_attr *attr,
 }
 
 int
-__local_lockTransLog(char *msg, int wr, int trylock) {
+__local_lockTransLog(const char *msg, int wr, int trylock) {
 	return (0);
 }
 
 void
-__local_unlockTransLog(char *msg, int wr) {
+__local_unlockTransLog(const char *msg, int wr) {
 }
 
 int
diff --git a/usr/src/lib/libnisdb/ldap_glob.h b/usr/src/lib/libnisdb/ldap_glob.h
index 38a2ed67c2..3f6ca0288b 100644
--- a/usr/src/lib/libnisdb/ldap_glob.h
+++ b/usr/src/lib/libnisdb/ldap_glob.h
@@ -24,8 +24,6 @@
  * All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifndef	_LDAP_GLOB_H
 #define	_LDAP_GLOB_H
 
@@ -61,8 +59,8 @@ extern int		endTransaction(int xid, nis_object *dirObj);
 extern int		addUpdate(log_entry_t type, char *name,
 				int numAttr, nis_attr *attr, nis_object *obj,
 				nis_object *oldDir, uint32_t ttime);
-extern int		lockTransLog(char *msg, int wr, int trylock);
-extern void		unlockTransLog(char *msg, int wr);
+extern int		lockTransLog(const char *msg, int wr, int trylock);
+extern void		unlockTransLog(const char *msg, int wr);
 extern int		__nis_lock_db_table(nis_name name, int readwrite,
 						int *trylock, char *msg);
 extern int		__nis_ulock_db_table(nis_name name, int readwrite,
diff --git a/usr/src/lib/libnisdb/ldap_util.c b/usr/src/lib/libnisdb/ldap_util.c
index 9dfc04085f..6fc00d7493 100644
--- a/usr/src/lib/libnisdb/ldap_util.c
+++ b/usr/src/lib/libnisdb/ldap_util.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <strings.h>
@@ -49,7 +47,7 @@ static pthread_key_t		tsdKey;
  * Log a message to the appropriate place.
  */
 void
-logmsg(int msgtype, int priority, char *fmt, ...) {
+logmsg(int msgtype, int priority, const char *fmt, ...) {
 	va_list		ap;
 	struct timeval	tp;
 
@@ -199,7 +197,7 @@ logError(int priority) {
  * zero bytes is legal, and returns a NULL pointer.
  */
 void *
-am(char *msg, int size) {
+am(const char *msg, int size) {
 	void	*p;
 
 	if (size > 0) {
@@ -227,7 +225,7 @@ am(char *msg, int size) {
  * on a NULL pointer.
  */
 int
-slen(char *str) {
+slen(const char *str) {
 	return ((str != 0) ? strlen(str) : 0);
 }
 
@@ -236,7 +234,7 @@ slen(char *str) {
  * like strdup(), but don't die if 'str' is a NULL pointer.
  */
 char *
-sdup(char *msg, int allocate, char *str) {
+sdup(const char *msg, int allocate, char *str) {
 	char	*s;
 
 	if (!allocate)
@@ -259,7 +257,7 @@ sdup(char *msg, int allocate, char *str) {
  * NULL pointer or two. If deallocate!=0, free() the input strings.
  */
 char *
-scat(char *msg, int deallocate, char *s1, char *s2) {
+scat(const char *msg, int deallocate, char *s1, char *s2) {
 	char	*n;
 	int	l1 = 0, l2 = 0;
 
@@ -437,7 +435,7 @@ scasecmp(char *s, __nis_single_value_t *v) {
  * result to '*buf'.
  */
 int
-vp2buf(char *msg, char **buf, int buflen, char *fmt, va_list ap) {
+vp2buf(const char *msg, char **buf, int buflen, const char *fmt, va_list ap) {
 	char		*newbuf = am(msg, STDBUFSIZE);
 	int		size = 0;
 
@@ -482,7 +480,7 @@ p2buf(char *msg, char *fmt, ...) {
 
 /* sprintf to the specified __nis_buffer_t */
 void
-bp2buf(char *msg, __nis_buffer_t *b, char *fmt, ...) {
+bp2buf(const char *msg, __nis_buffer_t *b, const char *fmt, ...) {
 	va_list	ap;
 
 	va_start(ap, fmt);
@@ -492,7 +490,7 @@ bp2buf(char *msg, __nis_buffer_t *b, char *fmt, ...) {
 
 /* Copy 'buf' to the specified __nis_buffer_t */
 void
-bc2buf(char *msg, void *buf, int len, __nis_buffer_t *b) {
+bc2buf(const char *msg, void *buf, int len, __nis_buffer_t *b) {
 	void	*new;
 
 	/*
@@ -517,7 +515,7 @@ bc2buf(char *msg, void *buf, int len, __nis_buffer_t *b) {
 
 /* Like bc2buf(), but remove any trailing NUL bytes */
 void
-sbc2buf(char *msg, void *buf, int len, __nis_buffer_t *b) {
+sbc2buf(const char *msg, void *buf, int len, __nis_buffer_t *b) {
 	if (buf == 0 || len <= 0 || b == 0)
 		return;
 	/* Snip off trailing NULs */
diff --git a/usr/src/lib/libnisdb/ldap_util.h b/usr/src/lib/libnisdb/ldap_util.h
index 9f72f8f46b..4df2439f31 100644
--- a/usr/src/lib/libnisdb/ldap_util.h
+++ b/usr/src/lib/libnisdb/ldap_util.h
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdarg.h>
 #include <syslog.h>
 
@@ -83,26 +81,27 @@ typedef struct {
 extern unsigned long	numMisaligned;
 
 /* Exported functions */
-void	logmsg(int msgtype, int priority, char *fmt, ...);
+void	logmsg(int msgtype, int priority, const char *fmt, ...);
 void	reportError(int error, char *fmt, ...);
 int	getError(char **message);
 void	clearError(void);
 void	logError(int priority);
-void	*am(char *msg, int size);
-int	slen(char *str);
-char	*sdup(char *msg, int allocate, char *str);
-char	*scat(char *msg, int deallocate, char *s1, char *s2);
+void	*am(const char *msg, int size);
+int	slen(const char *str);
+char	*sdup(const char *msg, int allocate, char *str);
+char	*scat(const char *msg, int deallocate, char *s1, char *s2);
 void	sfree(void *ptr);
 char	lastChar(__nis_single_value_t *v);
 void	*appendString2SingleVal(char *str, __nis_single_value_t *v,
 		int *newLen);
 int	scmp(char *s, __nis_single_value_t *v);
 int	scasecmp(char *s, __nis_single_value_t *v);
-int	vp2buf(char *msg, char **buf, int buflen, char *fmt, va_list ap);
+int	vp2buf(const char *msg, char **buf, int buflen, const char *fmt,
+    va_list ap);
 void	p2buf(char *msg, char *fmt, ...);
-void	bp2buf(char *msg, __nis_buffer_t *b, char *fmt, ...);
-void	bc2buf(char *msg, void *buf, int len, __nis_buffer_t *b);
-void	sbc2buf(char *msg, void *buf, int len, __nis_buffer_t *b);
+void	bp2buf(const char *msg, __nis_buffer_t *b, const char *fmt, ...);
+void	bc2buf(const char *msg, void *buf, int len, __nis_buffer_t *b);
+void	sbc2buf(const char *msg, void *buf, int len, __nis_buffer_t *b);
 void	c2buf(char *msg, void *buf, int len);
 void	sc2buf(char *msg, void *buf, int len);
 void	printbuf(void);
diff --git a/usr/src/lib/libnisdb/nis_db.cc b/usr/src/lib/libnisdb/nis_db.cc
index 9bd80cd86f..9d5b62deb3 100644
--- a/usr/src/lib/libnisdb/nis_db.cc
+++ b/usr/src/lib/libnisdb/nis_db.cc
@@ -61,11 +61,11 @@ db_status		db_table_exists(char *table_name);
  * 'tbl_prototype' is used to create a table that holds a directory.
  */
 static table_col cols[2] = {
-	{"object", TA_BINARY+TA_XDR, 0},
-	{"name", TA_CASE+TA_SEARCHABLE, 0}
+	{(char *)"object", TA_BINARY+TA_XDR, 0},
+	{(char *)"name", TA_CASE+TA_SEARCHABLE, 0}
 };
 
-table_obj tbl_prototype = { "DIRECTORY", 2, ' ', {2, &cols[0]}, NULL };
+table_obj tbl_prototype = { (char *)"DIRECTORY", 2, ' ', {2, &cols[0]}, NULL };
 }
 
 /*
@@ -148,10 +148,10 @@ db_in_dict_file(char *name)
 
 }
 
-char
+const char
 *db_perror(db_status dbstat)
 {
-	char	*str = NULL;
+	const char *str = NULL;
 
 	switch (dbstat) {
 		case DB_SUCCESS:
@@ -451,7 +451,7 @@ db_list_entries(char *table_name, int numattrs, nis_attr *attrname) {
 char *
 entryName(char *msg, char *objName, char **tableP) {
 	char	*name, *table, *dir;
-	char	*myself = "entryName";
+	char	*myself = (char *)"entryName";
 
 	if (msg == 0)
 		msg = myself;
@@ -505,7 +505,7 @@ dbFindObject(char *objName, db_status *statP) {
 	db_mindex	*mindex;
 	nis_object	*o;
 	int		lstat;
-	char		*myself = "dbFindObject";
+	const char	*myself = "dbFindObject";
 
 	if (objName == 0)
 		RETSTAT(0, DB_BADQUERY);
@@ -527,7 +527,7 @@ dbFindObject(char *objName, db_status *statP) {
 	/* If not the root dir, find the directory where the entry lives */
 
 	sfree(table);
-	name = entryName(myself, objName, &table);
+	name = entryName((char *)myself, objName, &table);
 	if (name == 0 || table == 0) {
 		sfree(name);
 		RETSTAT(0, DB_MEMORY_LIMIT);
@@ -548,7 +548,7 @@ dbFindObject(char *objName, db_status *statP) {
 		RETSTAT(0, DB_LOCK_ERROR);
 	}
 
-	attr.zattr_ndx = "name";
+	attr.zattr_ndx = (char *)"name";
 	attr.zattr_val.zattr_val_val = name;
 	attr.zattr_val.zattr_val_len = slen(name) + 1;
 
@@ -611,7 +611,7 @@ nis_object *
 ldapFindObj(__nis_table_mapping_t *t, char *objName, int *statP) {
 	nis_object	*o;
 	int		stat;
-	char		*myself = "ldapFindObj";
+	const char	*myself = "ldapFindObj";
 
 	if (t == 0) {
 		char	*table, tbuf[MAXPATHLEN + NIS_MAXNAMELEN + 1];
@@ -656,7 +656,7 @@ findObj(char *name, db_status *statP, int *lstatP) {
 	nis_object	*o;
 	db_status	stat = DB_SUCCESS;
 	int		lstat = LDAP_SUCCESS;
-	char		*myself = "findObj";
+	const char	*myself = "findObj";
 
 	o = dbFindObject(name, &stat);
 
@@ -695,7 +695,7 @@ dbDeleteObj(char *objName) {
 	db_status	stat;
 	nisdb_obj_del_t	*nod, *tmp;
 	int		xid;
-	char		*myself = "dbDeleteObj";
+	const char	*myself = "dbDeleteObj";
 
 	if (objName == 0)
 		return (DB_SUCCESS);
@@ -737,7 +737,7 @@ dbDeleteObj(char *objName) {
 	nod->objType = o->zo_data.zo_type;
 	nis_destroy_object(o);
 
-	nod->objName = sdup(myself, T, objName);
+	nod->objName = sdup((char *)myself, T, objName);
 	if (nod->objName == 0) {
 		sfree(nod);
 		return (DB_MEMORY_LIMIT);
@@ -772,7 +772,7 @@ dbTouchObj(char *objName) {
 	nis_attr	attr;
 	db_query	*query;
 	db_status	stat;
-	char		*myself = "dbTouchObj";
+	const char	*myself = "dbTouchObj";
 
 	table = internalTableName(objName);
 	if (table == 0)
@@ -789,7 +789,7 @@ dbTouchObj(char *objName) {
 
 	sfree(table);
 	table = 0;
-	ent = entryName(myself, objName, &table);
+	ent = entryName((char *)myself, objName, &table);
 	if (ent == 0 || table == 0) {
 		sfree(ent);
 		return (DB_MEMORY_LIMIT);
@@ -804,7 +804,7 @@ dbTouchObj(char *objName) {
 		return (DB_BADTABLE);
 	}
 
-	attr.zattr_ndx = "name";
+	attr.zattr_ndx = (char *)"name";
 	attr.zattr_val.zattr_val_val = ent;
 	attr.zattr_val.zattr_val_len = slen(ent) + 1;
 
@@ -833,7 +833,7 @@ dbCreateTable(char *intName, nis_object *obj) {
 	table_col	tc[NIS_MAXCOLUMNS+1];
 	table_obj	tobj, *t;
 	int		i;
-	char		*myself = "dbCreateTable";
+	const char	*myself = "dbCreateTable";
 
 	if (intName == 0 || obj == 0)
 		return (DB_BADTABLE);
@@ -879,7 +879,7 @@ dbRefreshObj(char *name, nis_object *o) {
 	db_status	stat;
 	char		*ent, *table, *objTable;
 	int		rstat, isDir = 0, isTable = 0;
-	char		*myself = "refreshObj";
+	const char	*myself = "refreshObj";
 
 	if (o == 0)
 		/* Delete it */
@@ -973,7 +973,7 @@ dbRefreshObj(char *name, nis_object *o) {
 	if (strcmp(ROOTDIRFILE, objTable) == 0) {
 		sfree(objTable);
 
-		rstat = update_root_object(ROOTOBJFILE, o);
+		rstat = update_root_object((char *)ROOTOBJFILE, o);
 		if (rstat == 1)
 			stat = DB_SUCCESS;
 		else
@@ -989,7 +989,7 @@ dbRefreshObj(char *name, nis_object *o) {
 		int		lstat;
 
 		/* Find parent */
-		ent = entryName(myself, objName, &table);
+		ent = entryName((char *)myself, objName, &table);
 		if (ent == 0 || table == 0) {
 			sfree(b.buf);
 			sfree(objTable);
@@ -1018,7 +1018,7 @@ dbRefreshObj(char *name, nis_object *o) {
 		}
 
 		/* Construct suitable nis_attr and entry_object */
-		attr.zattr_ndx = "name";
+		attr.zattr_ndx = (char *)"name";
 		attr.zattr_val.zattr_val_val = ent;
 		attr.zattr_val.zattr_val_len = slen(ent) + 1;
 
@@ -1026,7 +1026,7 @@ dbRefreshObj(char *name, nis_object *o) {
 		ec[1].ec_value.ec_value_val = ent;
 		ec[1].ec_value.ec_value_len = attr.zattr_val.zattr_val_len;
 
-		eo.en_type = "IN_DIRECTORY";
+		eo.en_type = (char *)"IN_DIRECTORY";
 		eo.en_cols.en_cols_val = ec;
 		eo.en_cols.en_cols_len = 2;
 
@@ -1224,7 +1224,7 @@ dbCreateFromLDAP(char *intName, int *ldapStat) {
 	int			lstat, doDestroy;
 	nis_object		*obj = 0;
 	db_status		dstat;
-	char			*myself = "dbCreateFromLDAP";
+	const char		*myself = "dbCreateFromLDAP";
 
 	if (!useLDAPrespository) {
 		if (ldapStat != 0)
@@ -1279,7 +1279,7 @@ loadAllLDAP(int fromLDAP, void *cookie, db_status *dstatP) {
 	db			*dbase;
 	db_table_desc		*tbl = 0;
 	db_mindex		*mindex;
-	char			*myself = "loadAllLDAP";
+	const char		*myself = "loadAllLDAP";
 
 	/*
 	 * If the 'cookie' and '*cookie' are non-NULL, start scanning
@@ -1416,7 +1416,8 @@ loadAllLDAP(int fromLDAP, void *cookie, db_status *dstatP) {
 				ent = 0;
 			} else {
 				objPath = 0;
-				ent = entryName(myself, t->objName, &objPath);
+				ent = entryName((char *)myself, t->objName,
+				    &objPath);
 				if (ent == 0 || objPath == 0) {
 					logmsg(MSG_NOTIMECHECK, LOG_ERR,
 	"%s: Error deriving entry/DB-table names for %s:%s; skipping up-load",
@@ -1474,7 +1475,7 @@ loadAllLDAP(int fromLDAP, void *cookie, db_status *dstatP) {
 				nis_attr	attr;
 				db_query	*q;
 
-				attr.zattr_ndx = "name";
+				attr.zattr_ndx = (char *)"name";
 				attr.zattr_val.zattr_val_val = ent;
 				attr.zattr_val.zattr_val_len = slen(ent) + 1;