20 files changed, 194 insertions, 2647 deletions

diff --git a/source3/lib/account_pol.c b/source3/lib/account_pol.c
index 2e619c0c6b..6f51c916d7 100644
--- a/source3/lib/account_pol.c
+++ b/source3/lib/account_pol.c
@@ -31,7 +31,7 @@ static TDB_CONTEXT *tdb; /* used for driver files */
 BOOL init_account_policy(void)
 {
 	static pid_t local_pid;
-	const char *vstring = "INFO/version";
+	char *vstring = "INFO/version";
 	uint32 version;
 
 	if (tdb && local_pid == sys_getpid())
@@ -67,7 +67,7 @@ BOOL init_account_policy(void)
 
 static const struct {
 	int field;
-	const char *string;
+	char *string;
 } account_policy_names[] = {
 	{AP_MIN_PASSWORD_LEN, "min password length"},
 	{AP_PASSWORD_HISTORY, "password history"},
diff --git a/source3/lib/adt_tree.c b/source3/lib/adt_tree.c
index 0bc224ec23..2c18bb1198 100644
--- a/source3/lib/adt_tree.c
+++ b/source3/lib/adt_tree.c
@@ -325,7 +325,7 @@ done:
  Recursive routine to print out all children of a TREE_NODE
  *************************************************************************/
 
-static void sorted_tree_print_children( TREE_NODE *node, int debug, const char *path )
+static void sorted_tree_print_children( TREE_NODE *node, int debug, char *path )
 {
 	int i;
 	int num_children;
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 3428377d95..04145fd17a 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -30,9 +30,9 @@ static smb_iconv_t conv_handles[NUM_CHARSETS][NUM_CHARSETS];
  Return the name of a charset to give to iconv().
 ****************************************************************************/
 
-static const char *charset_name(charset_t ch)
+static char *charset_name(charset_t ch)
 {
-	const char *ret = NULL;
+	char *ret = NULL;
 
 	if (ch == CH_UCS2) ret = "UCS-2LE";
 	else if (ch == CH_UNIX) ret = lp_unix_charset();
@@ -75,8 +75,8 @@ void init_iconv(void)
 
 	for (c1=0;c1<NUM_CHARSETS;c1++) {
 		for (c2=0;c2<NUM_CHARSETS;c2++) {
-			const char *n1 = charset_name((charset_t)c1);
-			const char *n2 = charset_name((charset_t)c2);
+			char *n1 = charset_name((charset_t)c1);
+			char *n2 = charset_name((charset_t)c2);
 			if (conv_handles[c1][c2] &&
 			    strcmp(n1, conv_handles[c1][c2]->from_name) == 0 &&
 			    strcmp(n2, conv_handles[c1][c2]->to_name) == 0)
@@ -140,7 +140,7 @@ size_t convert_string(charset_t from, charset_t to,
 	o_len=destlen;
 	retval = smb_iconv(descriptor,  &inbuf, &i_len, &outbuf, &o_len);
 	if(retval==-1) {
-	    	const char *reason="unknown error";
+	    	char *reason="unknown error";
 		switch(errno) {
 			case EINVAL:
 				reason="Incomplete multibyte sequence";
@@ -215,7 +215,7 @@ convert:
 			   &inbuf, &i_len,
 			   &outbuf, &o_len);
 	if(retval == -1) 		{
-	    	const char *reason="unknown error";
+	    	char *reason="unknown error";
 		switch(errno) {
 			case EINVAL:
 				reason="Incomplete multibyte sequence";
diff --git a/source3/lib/domain_namemap.c b/source3/lib/domain_namemap.c
deleted file mode 100644
index 988f5e5d65..0000000000
--- a/source3/lib/domain_namemap.c
+++ /dev/null
@@ -1,1317 +0,0 @@
-/* 
-   Unix SMB/Netbios implementation.
-   Version 1.9.
-   Groupname handling
-   Copyright (C) Jeremy Allison 1998.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-/* 
- * UNIX gid and Local or Domain SID resolution.  This module resolves
- * only those entries in the map files, it is *NOT* responsible for
- * resolving UNIX groups not listed: that is an entirely different
- * matter, altogether...
- */
-
-/*
- *
- *
-
- format of the file is:
-
- unixname	NT Group name
- unixname	Domain Admins (well-known Domain Group)
- unixname	DOMAIN_NAME\NT Group name
- unixname	OTHER_DOMAIN_NAME\NT Group name
- unixname	DOMAIN_NAME\Domain Admins (well-known Domain Group)
- ....
-
- if the DOMAIN_NAME\ component is left off, then your own domain is assumed.
-
- *
- *
- */
-
-
-#include "includes.h"
-extern int DEBUGLEVEL;
-
-extern fstring global_myworkgroup;
-extern DOM_SID global_member_sid;
-extern fstring global_sam_name;
-extern DOM_SID global_sam_sid;
-extern DOM_SID global_sid_S_1_5_20;
-
-/*******************************************************************
- converts UNIX uid to an NT User RID. NOTE: IS SOMETHING SPECIFIC TO SAMBA
- ********************************************************************/
-static uid_t pwdb_user_rid_to_uid(uint32 user_rid)
-{
-	return ((user_rid & (~RID_TYPE_USER))- 1000)/RID_MULTIPLIER;
-}
-
-/*******************************************************************
- converts NT Group RID to a UNIX uid. NOTE: IS SOMETHING SPECIFIC TO SAMBA
- ********************************************************************/
-static uint32 pwdb_group_rid_to_gid(uint32 group_rid)
-{
-	return ((group_rid & (~RID_TYPE_GROUP))- 1000)/RID_MULTIPLIER;
-}
-
-/*******************************************************************
- converts NT Alias RID to a UNIX uid. NOTE: IS SOMETHING SPECIFIC TO SAMBA
- ********************************************************************/
-static uint32 pwdb_alias_rid_to_gid(uint32 alias_rid)
-{
-	return ((alias_rid & (~RID_TYPE_ALIAS))- 1000)/RID_MULTIPLIER;
-}
-
-/*******************************************************************
- converts NT Group RID to a UNIX uid. NOTE: IS SOMETHING SPECIFIC TO SAMBA
- ********************************************************************/
-static uint32 pwdb_gid_to_group_rid(uint32 gid)
-{
-	uint32 grp_rid = ((((gid)*RID_MULTIPLIER) + 1000) | RID_TYPE_GROUP);
-	return grp_rid;
-}
-
-/******************************************************************
- converts UNIX gid to an NT Alias RID. NOTE: IS SOMETHING SPECIFIC TO SAMBA
- ********************************************************************/
-static uint32 pwdb_gid_to_alias_rid(uint32 gid)
-{
-	uint32 alias_rid = ((((gid)*RID_MULTIPLIER) + 1000) | RID_TYPE_ALIAS);
-	return alias_rid;
-}
-
-/*******************************************************************
- converts UNIX uid to an NT User RID. NOTE: IS SOMETHING SPECIFIC TO SAMBA
- ********************************************************************/
-static uint32 pwdb_uid_to_user_rid(uint32 uid)
-{
-	uint32 user_rid = ((((uid)*RID_MULTIPLIER) + 1000) | RID_TYPE_USER);
-	return user_rid;
-}
-
-/******************************************************************
- converts SID + SID_NAME_USE type to a UNIX id.  the Domain SID is,
- and can only be, our own SID.
- ********************************************************************/
-static BOOL pwdb_sam_sid_to_unixid(DOM_SID *sid, uint8 type, uint32 *id)
-{
-	DOM_SID tmp_sid;
-	uint32 rid;
-
-	sid_copy(&tmp_sid, sid);
-	sid_split_rid(&tmp_sid, &rid);
-	if (!sid_equal(&global_sam_sid, &tmp_sid))
-	{
-		return False;
-	}
-
-	switch (type)
-	{
-		case SID_NAME_USER:
-		{
-			*id = pwdb_user_rid_to_uid(rid);
-			return True;
-		}
-		case SID_NAME_ALIAS:
-		{
-			*id = pwdb_alias_rid_to_gid(rid);
-			return True;
-		}
-		case SID_NAME_DOM_GRP:
-		case SID_NAME_WKN_GRP:
-		{
-			*id = pwdb_group_rid_to_gid(rid);
-			return True;
-		}
-	}
-	return False;
-}
-
-/******************************************************************
- converts UNIX gid + SID_NAME_USE type to a SID.  the Domain SID is,
- and can only be, our own SID.
- ********************************************************************/
-static BOOL pwdb_unixid_to_sam_sid(uint32 id, uint8 type, DOM_SID *sid)
-{
-	sid_copy(sid, &global_sam_sid);
-	switch (type)
-	{
-		case SID_NAME_USER:
-		{
-			sid_append_rid(sid, pwdb_uid_to_user_rid(id));
-			return True;
-		}
-		case SID_NAME_ALIAS:
-		{
-			sid_append_rid(sid, pwdb_gid_to_alias_rid(id));
-			return True;
-		}
-		case SID_NAME_DOM_GRP:
-		case SID_NAME_WKN_GRP:
-		{
-			sid_append_rid(sid, pwdb_gid_to_group_rid(id));
-			return True;
-		}
-	}
-	return False;
-}
-
-/*******************************************************************
- Decides if a RID is a well known RID.
- ********************************************************************/
-static BOOL pwdb_rid_is_well_known(uint32 rid)
-{
-	return (rid < 1000);
-}
-
-/*******************************************************************
- determines a rid's type.  NOTE: THIS IS SOMETHING SPECIFIC TO SAMBA
- ********************************************************************/
-static uint32 pwdb_rid_type(uint32 rid)
-{
-	/* lkcl i understand that NT attaches an enumeration to a RID
-	 * such that it can be identified as either a user, group etc
-	 * type: SID_ENUM_TYPE.
-	 */
-	if (pwdb_rid_is_well_known(rid))
-	{
-		/*
-		 * The only well known user RIDs are DOMAIN_USER_RID_ADMIN
-		 * and DOMAIN_USER_RID_GUEST.
-		 */
-		if (rid == DOMAIN_USER_RID_ADMIN || rid == DOMAIN_USER_RID_GUEST)
-		{
-			return RID_TYPE_USER;
-		}
-		if (DOMAIN_GROUP_RID_ADMINS <= rid && rid <= DOMAIN_GROUP_RID_GUESTS)
-		{
-			return RID_TYPE_GROUP;
-		}
-		if (BUILTIN_ALIAS_RID_ADMINS <= rid && rid <= BUILTIN_ALIAS_RID_REPLICATOR)
-		{
-			return RID_TYPE_ALIAS;
-		}
-	}
-	return (rid & RID_TYPE_MASK);
-}
-
-/*******************************************************************
- checks whether rid is a user rid.  NOTE: THIS IS SOMETHING SPECIFIC TO SAMBA
- ********************************************************************/
-BOOL pwdb_rid_is_user(uint32 rid)
-{
-	return pwdb_rid_type(rid) == RID_TYPE_USER;
-}
-
-/**************************************************************************
- Groupname map functionality. The code loads a groupname map file and
- (currently) loads it into a linked list. This is slow and memory
- hungry, but can be changed into a more efficient storage format
- if the demands on it become excessive.
-***************************************************************************/
-
-typedef struct name_map
-{
-	ubi_slNode next;
-	DOM_NAME_MAP grp;
-
-} name_map_entry;
-
-static ubi_slList groupname_map_list;
-static ubi_slList aliasname_map_list;
-static ubi_slList ntusrname_map_list;
-
-static void delete_name_entry(name_map_entry *gmep)
-{
-	if (gmep->grp.nt_name)
-	{
-		free(gmep->grp.nt_name);
-	}
-	if (gmep->grp.nt_domain)
-	{
-		free(gmep->grp.nt_domain);
-	}
-	if (gmep->grp.unix_name)
-	{
-		free(gmep->grp.unix_name);
-	}
-	free((char*)gmep);
-}
-
-/**************************************************************************
- Delete all the entries in the name map list.
-***************************************************************************/
-
-static void delete_map_list(ubi_slList *map_list)
-{
-	name_map_entry *gmep;
-
-	while ((gmep = (name_map_entry *)ubi_slRemHead(map_list )) != NULL)
-	{
-		delete_name_entry(gmep);
-	}
-}
-
-
-/**************************************************************************
- makes a group sid out of a domain sid and a _unix_ gid.
-***************************************************************************/
-static BOOL make_mydomain_sid(DOM_NAME_MAP *grp, DOM_MAP_TYPE type)
-{
-	int ret = False;
-	fstring sid_str;
-
-	if (!map_domain_name_to_sid(&grp->sid, &(grp->nt_domain)))
-	{
-		DEBUG(0,("make_mydomain_sid: unknown domain %s\n",
-			  grp->nt_domain));
-		return False;
-	}
-
-	if (sid_equal(&grp->sid, &global_sid_S_1_5_20))
-	{
-		/*
-		 * only builtin aliases are recognised in S-1-5-20
-		 */
-		DEBUG(10,("make_mydomain_sid: group %s in builtin domain\n",
-		           grp->nt_name));
-
-		if (lookup_builtin_alias_name(grp->nt_name, "BUILTIN", &grp->sid, &grp->type) != 0x0)
-		{
-			DEBUG(0,("unix group %s mapped to an unrecognised BUILTIN domain name %s\n",
-			          grp->unix_name, grp->nt_name));
-			return False;
-		}
-		ret = True;
-	}
-	else if (lookup_wk_user_name(grp->nt_name, grp->nt_domain, &grp->sid, &grp->type) == 0x0)
-	{
-		if (type != DOM_MAP_USER)
-		{
-			DEBUG(0,("well-known NT user %s\\%s listed in wrong map file\n",
-			          grp->nt_domain, grp->nt_name));
-			return False;
-		}
-		ret = True;
-	}
-	else if (lookup_wk_group_name(grp->nt_name, grp->nt_domain, &grp->sid, &grp->type) == 0x0)
-	{
-		if (type != DOM_MAP_DOMAIN)
-		{
-			DEBUG(0,("well-known NT group %s\\%s listed in wrong map file\n",
-			          grp->nt_domain, grp->nt_name));
-			return False;
-		}
-		ret = True;
-	}
-	else
-	{
-		switch (type)
-		{
-			case DOM_MAP_USER:
-			{
-				grp->type = SID_NAME_USER;
-				break;
-			}
-			case DOM_MAP_DOMAIN:
-			{
-				grp->type = SID_NAME_DOM_GRP;
-				break;
-			}
-			case DOM_MAP_LOCAL:
-			{
-				grp->type = SID_NAME_ALIAS;
-				break;
-			}
-		}
-
-		ret = pwdb_unixid_to_sam_sid(grp->unix_id, grp->type, &grp->sid);
-	}
-
-	sid_to_string(sid_str, &grp->sid);
-	DEBUG(10,("nt name %s\\%s gid %d mapped to %s\n",
-	           grp->nt_domain, grp->nt_name, grp->unix_id, sid_str));
-	return ret;
-}
-
-/**************************************************************************
- makes a group sid out of an nt domain, nt group name or a unix group name.
-***************************************************************************/
-static BOOL unix_name_to_nt_name_info(DOM_NAME_MAP *map, DOM_MAP_TYPE type)
-{
-	/*
-	 * Attempt to get the unix gid_t for this name.
-	 */
-
-	DEBUG(5,("unix_name_to_nt_name_info: unix_name:%s\n", map->unix_name));
-
-	if (type == DOM_MAP_USER)
-	{
-		const struct passwd *pwptr = Get_Pwnam(map->unix_name, False);
-		if (pwptr == NULL)
-		{
-			DEBUG(0,("unix_name_to_nt_name_info: Get_Pwnam for user %s\
-failed. Error was %s.\n", map->unix_name, strerror(errno) ));
-			return False;
-		}
-
-		map->unix_id = (uint32)pwptr->pw_uid;
-	}
-	else
-	{
-		struct group *gptr = getgrnam(map->unix_name);
-		if (gptr == NULL)
-		{
-			DEBUG(0,("unix_name_to_nt_name_info: getgrnam for group %s\
-failed. Error was %s.\n", map->unix_name, strerror(errno) ));
-			return False;
-		}
-
-		map->unix_id = (uint32)gptr->gr_gid;
-	}
-
-	DEBUG(5,("unix_name_to_nt_name_info: unix gid:%d\n", map->unix_id));
-
-	/*
-	 * Now map the name to an NT SID+RID.
-	 */
-
-	if (map->nt_domain != NULL && !strequal(map->nt_domain, global_sam_name))
-	{
-		/* Must add client-call lookup code here, to 
-		 * resolve remote domain's sid and the group's rid,
-		 * in that domain.
-		 *
-		 * NOTE: it is _incorrect_ to put code here that assumes
-		 * we are responsible for lookups for foriegn domains' RIDs.
-		 *
-		 * for foriegn domains for which we are *NOT* the PDC, all
-		 * we can be responsible for is the unix gid_t to which
-		 * the foriegn SID+rid maps to, on this _local_ machine.  
-		 * we *CANNOT* make any short-cuts or assumptions about
-		 * RIDs in a foriegn domain.
-		 */
-
-		if (!map_domain_name_to_sid(&map->sid, &(map->nt_domain)))
-		{
-			DEBUG(0,("unix_name_to_nt_name_info: no known sid for %s\n",
-				  map->nt_domain));
-			return False;
-		}
-	}
-
-	return make_mydomain_sid(map, type);
-}
-
-static BOOL make_name_entry(name_map_entry **new_ep,
-		char *nt_domain, char *nt_group, char *unix_group,
-		DOM_MAP_TYPE type)
-{
-	/*
-	 * Create the list entry and add it onto the list.
-	 */
-
-	DEBUG(5,("make_name_entry:%s,%s,%s\n", nt_domain, nt_group, unix_group));
-
-	(*new_ep) = (name_map_entry *)malloc(sizeof(name_map_entry));
-	if ((*new_ep) == NULL)
-	{
-		DEBUG(0,("make_name_entry: malloc fail for name_map_entry.\n"));
-		return False;
-	} 
-
-	ZERO_STRUCTP(*new_ep);
-
-	(*new_ep)->grp.nt_name   = strdup(nt_group  );
-	(*new_ep)->grp.nt_domain = strdup(nt_domain );
-	(*new_ep)->grp.unix_name = strdup(unix_group);
-
-	if ((*new_ep)->grp.nt_name   == NULL ||
-	    (*new_ep)->grp.unix_name == NULL)
-	{
-		DEBUG(0,("make_name_entry: malloc fail for names in name_map_entry.\n"));
-		delete_name_entry((*new_ep));
-		return False;
-	}
-
-	/*
-	 * look up the group names, make the Group-SID and unix gid
-	 */
- 
-	if (!unix_name_to_nt_name_info(&(*new_ep)->grp, type))
-	{
-		delete_name_entry((*new_ep));
-		return False;
-	}
-
-	return True;
-}
-
-/**************************************************************************
- Load a name map file. Sets last accessed timestamp.
-***************************************************************************/
-static ubi_slList *load_name_map(DOM_MAP_TYPE type)
-{
-	static time_t groupmap_file_last_modified = (time_t)0;
-	static time_t aliasmap_file_last_modified = (time_t)0;
-	static time_t ntusrmap_file_last_modified  = (time_t)0;
-	static BOOL initialised_group = False;
-	static BOOL initialised_alias = False;
-	static BOOL initialised_ntusr  = False;
-	char *groupname_map_file = lp_groupname_map();
-	char *aliasname_map_file = lp_aliasname_map();
-	char *ntusrname_map_file = lp_ntusrname_map();
-
-	FILE *fp;
-	char *s;
-	pstring buf;
-	name_map_entry *new_ep;
-
-	time_t *file_last_modified = NULL;
-	int    *initialised = NULL;
-	char   *map_file = NULL;
-	ubi_slList *map_list = NULL;
-
-	switch (type)
-	{
-		case DOM_MAP_DOMAIN:
-		{
-			file_last_modified = &groupmap_file_last_modified;
-			initialised        = &initialised_group;
-			map_file           = groupname_map_file;
-			map_list           = &groupname_map_list;
-
-			break;
-		}
-		case DOM_MAP_LOCAL:
-		{
-			file_last_modified = &aliasmap_file_last_modified;
-			initialised        = &initialised_alias;
-			map_file           = aliasname_map_file;
-			map_list           = &aliasname_map_list;
-
-			break;
-		}
-		case DOM_MAP_USER:
-		{
-			file_last_modified = &ntusrmap_file_last_modified;
-			initialised        = &initialised_ntusr;
-			map_file           = ntusrname_map_file;
-			map_list           = &ntusrname_map_list;
-
-			break;
-		}
-	}
-
-	if (!(*initialised))
-	{
-		DEBUG(10,("initialising map %s\n", map_file));
-		ubi_slInitList(map_list);
-		(*initialised) = True;
-	}
-
-	if (!*map_file)
-	{
-		return map_list;
-	}
-
-	/*
-	 * Load the file.
-	 */
-
-	fp = open_file_if_modified(map_file, "r", file_last_modified);
-	if (!fp)
-	{
-		return map_list;
-	}
-
-	/*
-	 * Throw away any previous list.
-	 */
-	delete_map_list(map_list);
-
-	DEBUG(4,("load_name_map: Scanning name map %s\n",map_file));
-
-	while ((s = fgets_slash(buf, sizeof(buf), fp)) != NULL)
-	{
-		pstring unixname;
-		pstring nt_name;
-		fstring nt_domain;
-		fstring ntname;
-		char *p;
-
-		DEBUG(10,("Read line |%s|\n", s));
-
-		memset(nt_name, 0, sizeof(nt_name));
-
-		if (!*s || strchr("#;",*s))
-			continue;
-
-		if (!next_token(&s,unixname, "\t\n\r=", sizeof(unixname)))
-			continue;
-
-		if (!next_token(&s,nt_name, "\t\n\r=", sizeof(nt_name)))
-			continue;
-
-		trim_string(unixname, " ", " ");
-		trim_string(nt_name, " ", " ");
-
-		if (!*nt_name)
-			continue;
-
-		if (!*unixname)
-			continue;
-
-		p = strchr(nt_name, '\\');
-
-		if (p == NULL)
-		{
-			memset(nt_domain, 0, sizeof(nt_domain));
-			fstrcpy(ntname, nt_name);
-		}
-		else
-		{
-			*p = 0;
-			p++;
-			fstrcpy(nt_domain, nt_name);
-			fstrcpy(ntname , p);
-		}
-
-		if (make_name_entry(&new_ep, nt_domain, ntname, unixname, type))
-		{
-			ubi_slAddTail(map_list, (ubi_slNode *)new_ep);
-			DEBUG(5,("unixname = %s, ntname = %s\\%s type = %d\n",
-				  new_ep->grp.unix_name,
-			          new_ep->grp.nt_domain,
-			          new_ep->grp.nt_name,
-			          new_ep->grp.type));
-		}
-	}
-
-	DEBUG(10,("load_name_map: Added %ld entries to name map.\n",
-	           ubi_slCount(map_list)));
-
-	fclose(fp);
-
-	return map_list;
-}
-
-static void copy_grp_map_entry(DOM_NAME_MAP *grp, const DOM_NAME_MAP *from)
-{
-	sid_copy(&grp->sid, &from->sid);
-	grp->unix_id   = from->unix_id;
-	grp->nt_name   = from->nt_name;
-	grp->nt_domain = from->nt_domain;
-	grp->unix_name = from->unix_name;
-	grp->type      = from->type;
-}
-
-#if 0
-/***********************************************************
- Lookup unix name.
-************************************************************/
-static BOOL map_unixname(DOM_MAP_TYPE type,
-		char *unixname, DOM_NAME_MAP *grp_info)
-{
-	name_map_entry *gmep;
-	ubi_slList *map_list;
-
-	/*
-	 * Initialise and load if not already loaded.
-	 */
-	map_list = load_name_map(type);
-
-	for (gmep = (name_map_entry *)ubi_slFirst(map_list);
-	     gmep != NULL;
-	     gmep = (name_map_entry *)ubi_slNext(gmep ))
-	{
-		if (strequal(gmep->grp.unix_name, unixname))
-		{
-			copy_grp_map_entry(grp_info, &gmep->grp);
-			DEBUG(7,("map_unixname: Mapping unix name %s to nt group %s.\n",
-			       gmep->grp.unix_name, gmep->grp.nt_name ));
-			return True;
-		}
-	}
-
-	return False;
-}
-
-#endif
-
-/***********************************************************
- Lookup nt name.
-************************************************************/
-static BOOL map_ntname(DOM_MAP_TYPE type, char *ntname, char *ntdomain,
-				DOM_NAME_MAP *grp_info)
-{
-	name_map_entry *gmep;
-	ubi_slList *map_list;
-
-	/*
-	 * Initialise and load if not already loaded.
-	 */
-	map_list = load_name_map(type);
-
-	for (gmep = (name_map_entry *)ubi_slFirst(map_list);
-	     gmep != NULL;
-	     gmep = (name_map_entry *)ubi_slNext(gmep ))
-	{
-		if (strequal(gmep->grp.nt_name  , ntname) &&
-		    strequal(gmep->grp.nt_domain, ntdomain))
-		{
-			copy_grp_map_entry(grp_info, &gmep->grp);
-			DEBUG(7,("map_ntname: Mapping unix name %s to nt name %s.\n",
-			       gmep->grp.unix_name, gmep->grp.nt_name ));
-			return True;
-		}
-	}
-
-	return False;
-}
-
-
-/***********************************************************
- Lookup by SID
-************************************************************/
-static BOOL map_sid(DOM_MAP_TYPE type,
-		DOM_SID *psid, DOM_NAME_MAP *grp_info)
-{
-	name_map_entry *gmep;
-	ubi_slList *map_list;
-
-	/*
-	 * Initialise and load if not already loaded.
-	 */
-	map_list = load_name_map(type);
-
-	for (gmep = (name_map_entry *)ubi_slFirst(map_list);
-	     gmep != NULL;
-	     gmep = (name_map_entry *)ubi_slNext(gmep ))
-	{
-		if (sid_equal(&gmep->grp.sid, psid))
-		{
-			copy_grp_map_entry(grp_info, &gmep->grp);
-			DEBUG(7,("map_sid: Mapping unix name %s to nt name %s.\n",
-			       gmep->grp.unix_name, gmep->grp.nt_name ));
-			return True;
-		}
-	}
-
-	return False;
-}
-
-/***********************************************************
- Lookup by gid_t.
-************************************************************/
-static BOOL map_unixid(DOM_MAP_TYPE type, uint32 unix_id, DOM_NAME_MAP *grp_info)
-{
-	name_map_entry *gmep;
-	ubi_slList *map_list;
-
-	/*
-	 * Initialise and load if not already loaded.
-	 */
-	map_list = load_name_map(type);
-
-	for (gmep = (name_map_entry *)ubi_slFirst(map_list);
-	     gmep != NULL;
-	     gmep = (name_map_entry *)ubi_slNext(gmep ))
-	{
-		fstring sid_str;
-		sid_to_string(sid_str, &gmep->grp.sid);
-		DEBUG(10,("map_unixid: enum entry unix group %s %d nt %s %s\n",
-			       gmep->grp.unix_name, gmep->grp.unix_id, gmep->grp.nt_name, sid_str));
-		if (gmep->grp.unix_id == unix_id)
-		{
-			copy_grp_map_entry(grp_info, &gmep->grp);
-			DEBUG(7,("map_unixid: Mapping unix name %s to nt name %s type %d\n",
-			       gmep->grp.unix_name, gmep->grp.nt_name, gmep->grp.type));
-			return True;
-		}
-	}
-
-	return False;
-}
-
-/***********************************************************
- *
- * Call four functions to resolve unix group ids and either
- * local group SIDs or domain group SIDs listed in the local group
- * or domain group map files.
- *
- * Note that it is *NOT* the responsibility of these functions to
- * resolve entries that are not in the map files.
- *
- * Any SID can be in the map files (i.e from any Domain).
- *
- ***********************************************************/
-
-#if 0
-
-/***********************************************************
- Lookup a UNIX Group entry by name.
-************************************************************/
-BOOL map_unix_group_name(char *group_name, DOM_NAME_MAP *grp_info)
-{
-	return map_unixname(DOM_MAP_DOMAIN, group_name, grp_info);
-}
-
-/***********************************************************
- Lookup a UNIX Alias entry by name.
-************************************************************/
-BOOL map_unix_alias_name(char *alias_name, DOM_NAME_MAP *grp_info)
-{
-	return map_unixname(DOM_MAP_LOCAL, alias_name, grp_info);
-}
-
-/***********************************************************
- Lookup an Alias name entry 
-************************************************************/
-BOOL map_nt_alias_name(char *ntalias_name, char *nt_domain, DOM_NAME_MAP *grp_info)
-{
-	return map_ntname(DOM_MAP_LOCAL, ntalias_name, nt_domain, grp_info);
-}
-
-/***********************************************************
- Lookup a Group entry
-************************************************************/
-BOOL map_nt_group_name(char *ntgroup_name, char *nt_domain, DOM_NAME_MAP *grp_info)
-{
-	return map_ntname(DOM_MAP_DOMAIN, ntgroup_name, nt_domain, grp_info);
-}
-
-#endif
-
-/***********************************************************
- Lookup a Username entry by name.
-************************************************************/
-static BOOL map_nt_username(char *nt_name, char *nt_domain, DOM_NAME_MAP *grp_info)
-{
-	return map_ntname(DOM_MAP_USER, nt_name, nt_domain, grp_info);
-}
-
-/***********************************************************
- Lookup a Username entry by SID.
-************************************************************/
-static BOOL map_username_sid(DOM_SID *sid, DOM_NAME_MAP *grp_info)
-{
-	return map_sid(DOM_MAP_USER, sid, grp_info);
-}
-
-/***********************************************************
- Lookup a Username SID entry by uid.
-************************************************************/
-static BOOL map_username_uid(uid_t gid, DOM_NAME_MAP *grp_info)
-{
-	return map_unixid(DOM_MAP_USER, (uint32)gid, grp_info);
-}
-
-/***********************************************************
- Lookup an Alias SID entry by name.
-************************************************************/
-BOOL map_alias_sid(DOM_SID *psid, DOM_NAME_MAP *grp_info)
-{
-	return map_sid(DOM_MAP_LOCAL, psid, grp_info);
-}
-
-/***********************************************************
- Lookup a Group entry by sid.
-************************************************************/
-BOOL map_group_sid(DOM_SID *psid, DOM_NAME_MAP *grp_info)
-{
-	return map_sid(DOM_MAP_DOMAIN, psid, grp_info);
-}
-
-/***********************************************************
- Lookup an Alias SID entry by gid_t.
-************************************************************/
-static BOOL map_alias_gid(gid_t gid, DOM_NAME_MAP *grp_info)
-{
-	return map_unixid(DOM_MAP_LOCAL, (uint32)gid, grp_info);
-}
-
-/***********************************************************
- Lookup a Group SID entry by gid_t.
-************************************************************/
-static BOOL map_group_gid( gid_t gid, DOM_NAME_MAP *grp_info)
-{
-	return map_unixid(DOM_MAP_DOMAIN, (uint32)gid, grp_info);
-}
-
-
-/************************************************************************
- Routine to look up User details by UNIX name
-*************************************************************************/
-BOOL lookupsmbpwnam(const char *unix_usr_name, DOM_NAME_MAP *grp)
-{
-	uid_t uid;
-	DEBUG(10,("lookupsmbpwnam: unix user name %s\n", unix_usr_name));
-	if (nametouid(unix_usr_name, &uid))
-	{
-		return lookupsmbpwuid(uid, grp);
-	}
-	else
-	{
-		return False;
-	}
-}
-
-/************************************************************************
- Routine to look up a remote nt name
-*************************************************************************/
-static BOOL lookup_remote_ntname(const char *ntname, DOM_SID *sid, uint8 *type)
-{
-	struct cli_state cli;
-	POLICY_HND lsa_pol;
-	fstring srv_name;
-	extern struct ntuser_creds *usr_creds;
-	struct ntuser_creds usr;
-
-	BOOL res3 = True;
-	BOOL res4 = True;
-	uint32 num_sids;
-	DOM_SID *sids;
-	uint8 *types;
-	char *names[1];
-
-	usr_creds = &usr;
-
-	ZERO_STRUCT(usr);
-	pwd_set_nullpwd(&usr.pwd);
-
-	DEBUG(5,("lookup_remote_ntname: %s\n", ntname));
-
-	if (!cli_connect_serverlist(&cli, lp_passwordserver()))
-	{
-		return False;
-	}
-
-	names[0] = ntname;
-
-	fstrcpy(srv_name, "\\\\");
-	fstrcat(srv_name, cli.desthost);
-	strupper(srv_name);
-
-	/* lookup domain controller; receive a policy handle */
-	res3 = res3 ? lsa_open_policy( srv_name,
-				&lsa_pol, True) : False;
-
-	/* send lsa lookup sids call */
-	res4 = res3 ? lsa_lookup_names( &lsa_pol,
-				       1, names, 
-				       &sids, &types, &num_sids) : False;
-
-	res3 = res3 ? lsa_close(&lsa_pol) : False;
-
-	if (res4 && res3 && sids != NULL && types != NULL)
-	{
-		sid_copy(sid, &sids[0]);
-		*type = types[0];
-	}
-	else
-	{
-		res3 = False;
-	}
-	if (types != NULL)
-	{
-		free(types);
-	}
-	
-	if (sids != NULL)
-	{
-		free(sids);
-	}
-	
-	return res3 && res4;
-}
-
-/************************************************************************
- Routine to look up a remote nt name
-*************************************************************************/
-static BOOL get_sid_and_type(const char *fullntname, uint8 expected_type,
-				DOM_NAME_MAP *gmep)
-{
-	/*
-	 * check with the PDC to see if it owns the name.  if so,
-	 * the SID is resolved with the PDC database.
-	 */
-
-	if (lp_server_role() == ROLE_DOMAIN_MEMBER)
-	{
-		if (lookup_remote_ntname(fullntname, &gmep->sid, &gmep->type))
-		{
-			if (sid_front_equal(&gmep->sid, &global_member_sid) &&
-			    strequal(gmep->nt_domain, global_myworkgroup) &&
-			    gmep->type == expected_type)
-			{
-				return True;
-			}
-			return False;
-		}
-	}
-
-	/*
-	 * ... otherwise, it's one of ours.  map the sid ourselves,
-	 * which can only happen in our own SAM database.
-	 */
-
-	if (!strequal(gmep->nt_domain, global_sam_name))
-	{
-		return False;
-	}
-	if (!pwdb_unixid_to_sam_sid(gmep->unix_id, gmep->type, &gmep->sid))
-	{
-		return False;
-	}
-
-	return True;
-}
-
-/*
- * used by lookup functions below
- */
-
-static fstring nt_name;
-static fstring unix_name;
-static fstring nt_domain;
-
-/*************************************************************************
- looks up a uid, returns User Information.  
-*************************************************************************/
-BOOL lookupsmbpwuid(uid_t uid, DOM_NAME_MAP *gmep)
-{
-	DEBUG(10,("lookupsmbpwuid: unix uid %d\n", uid));
-	if (map_username_uid(uid, gmep))
-	{
-		return True;
-	}
-#if 0
-	if (lp_server_role() != ROLE_DOMAIN_NONE)
-#endif
-	{
-		gmep->nt_name   = nt_name;
-		gmep->unix_name = unix_name;
-		gmep->nt_domain = nt_domain;
-
-		gmep->unix_id = (uint32)uid;
-
-		/*
-		 * ok, assume it's one of ours.  then double-check it
-		 * if we are a member of a domain
-		 */
-
-		gmep->type = SID_NAME_USER;
-		fstrcpy(gmep->nt_name, uidtoname(uid));
-		fstrcpy(gmep->unix_name, gmep->nt_name);
-
-		/*
-		 * here we should do a LsaLookupNames() call
-		 * to check the status of the name with the PDC.
-		 * if the PDC know nothing of the name, it's ours.
-		 */
-
-		if (lp_server_role() == ROLE_DOMAIN_MEMBER)
-		{
-#if 0
-			lsa_lookup_names(global_myworkgroup, gmep->nt_name, &gmep->sid...);
-#endif
-		}
-
-		/*
-		 * ok, it's one of ours.
-		 */
-
-		gmep->nt_domain = global_sam_name;
-		pwdb_unixid_to_sam_sid(gmep->unix_id, gmep->type, &gmep->sid);
-
-		return True;
-	}
-
-	/* oops. */
-
-	return False;
-}
-
-/*************************************************************************
- looks up by NT name, returns User Information.  
-*************************************************************************/
-BOOL lookupsmbpwntnam(const char *fullntname, DOM_NAME_MAP *gmep)
-{
-	DEBUG(10,("lookupsmbpwntnam: nt user name %s\n", fullntname));
-
-	if (!split_domain_name(fullntname, nt_domain, nt_name))
-	{
-		return False;
-	}
-
-	if (map_nt_username(nt_name, nt_domain, gmep))
-	{
-		return True;
-	}
-	if (lp_server_role() != ROLE_DOMAIN_NONE)
-	{
-		uid_t uid;
-		gmep->nt_name   = nt_name;
-		gmep->unix_name = unix_name;
-		gmep->nt_domain = nt_domain;
-
-		/*
-		 * ok, it's one of ours.  we therefore "create" an nt user named
-		 * after the unix user.  this is the point where "appliance mode"
-		 * should get its teeth in, as unix users won't really exist,
-		 * they will only be numbers...
-		 */
-
-		gmep->type = SID_NAME_USER;
-		fstrcpy(gmep->unix_name, gmep->nt_name);
-		if (!nametouid(gmep->unix_name, &uid))
-		{
-			return False;
-		}
-		gmep->unix_id = (uint32)uid;
-
-		return get_sid_and_type(fullntname, gmep->type, gmep);
-	}
-
-	/* oops. */
-
-	return False;
-}
-
-/*************************************************************************
- looks up by RID, returns User Information.  
-*************************************************************************/
-BOOL lookupsmbpwsid(DOM_SID *sid, DOM_NAME_MAP *gmep)
-{
-	fstring sid_str;
-	sid_to_string(sid_str, sid);
-	DEBUG(10,("lookupsmbpwsid: nt sid %s\n", sid_str));
-
-	if (map_username_sid(sid, gmep))
-	{
-		return True;
-	}
-	if (lp_server_role() != ROLE_DOMAIN_NONE)
-	{
-		gmep->nt_name   = nt_name;
-		gmep->unix_name = unix_name;
-		gmep->nt_domain = nt_domain;
-
-		/*
-		 * here we should do a LsaLookupNames() call
-		 * to check the status of the name with the PDC.
-		 * if the PDC know nothing of the name, it's ours.
-		 */
-
-		if (lp_server_role() == ROLE_DOMAIN_MEMBER)
-		{
-#if 0
-			if (lookup_remote_sid(global_myworkgroup, gmep->sid, gmep->nt_name, gmep->nt_domain...);
-#endif
-		}
-
-		/*
-		 * ok, it's one of ours.  we therefore "create" an nt user named
-		 * after the unix user.  this is the point where "appliance mode"
-		 * should get its teeth in, as unix users won't really exist,
-		 * they will only be numbers...
-		 */
-
-		gmep->type = SID_NAME_USER;
-		sid_copy(&gmep->sid, sid);
-		if (!pwdb_sam_sid_to_unixid(&gmep->sid, gmep->type, &gmep->unix_id))
-		{
-			return False;
-		}
-		fstrcpy(gmep->nt_name, uidtoname((uid_t)gmep->unix_id));
-		fstrcpy(gmep->unix_name, gmep->nt_name);
-		gmep->nt_domain = global_sam_name;
-
-		return True;
-	}
-
-	/* oops. */
-
-	return False;
-}
-
-/************************************************************************
- Routine to look up group / alias / well-known group RID by UNIX name
-*************************************************************************/
-BOOL lookupsmbgrpnam(const char *unix_grp_name, DOM_NAME_MAP *grp)
-{
-	gid_t gid;
-	DEBUG(10,("lookupsmbgrpnam: unix user group %s\n", unix_grp_name));
-	if (nametogid(unix_grp_name, &gid))
-	{
-		return lookupsmbgrpgid(gid, grp);
-	}
-	else
-	{
-		return False;
-	}
-}
-
-/*************************************************************************
- looks up a SID, returns name map entry
-*************************************************************************/
-BOOL lookupsmbgrpsid(DOM_SID *sid, DOM_NAME_MAP *gmep)
-{
-	fstring sid_str;
-	sid_to_string(sid_str, sid);
-	DEBUG(10,("lookupsmbgrpsid: nt sid %s\n", sid_str));
-
-	if (map_alias_sid(sid, gmep))
-	{
-		return True;
-	}
-	if (map_group_sid(sid, gmep))
-	{
-		return True;
-	}
-	if (lp_server_role() != ROLE_DOMAIN_NONE)
-	{
-		gmep->nt_name   = nt_name;
-		gmep->unix_name = unix_name;
-		gmep->nt_domain = nt_domain;
-
-		/*
-		 * here we should do a LsaLookupNames() call
-		 * to check the status of the name with the PDC.
-		 * if the PDC know nothing of the name, it's ours.
-		 */
-
-		if (lp_server_role() == ROLE_DOMAIN_MEMBER)
-		{
-#if 0
-			lsa_lookup_sids(global_myworkgroup, gmep->sid, gmep->nt_name, gmep->nt_domain...);
-#endif
-		}
-
-		/*
-		 * ok, it's one of ours.  we therefore "create" an nt group or
-		 * alias name named after the unix group.  this is the point
-		 * where "appliance mode" should get its teeth in, as unix
-		 * groups won't really exist, they will only be numbers...
-		 */
-
-		/* name is not explicitly mapped
-		 * with map files or the PDC
-		 * so we are responsible for it...
-		 */
-
-		if (lp_server_role() == ROLE_DOMAIN_MEMBER)
-		{
-		 	/* ... as a LOCAL group. */
-			gmep->type = SID_NAME_ALIAS;
-		}
-		else
-		{
-		 	/* ... as a DOMAIN group. */
-			gmep->type = SID_NAME_DOM_GRP;
-		}
-
-		sid_copy(&gmep->sid, sid);
-		if (!pwdb_sam_sid_to_unixid(&gmep->sid, gmep->type, &gmep->unix_id))
-		{
-			return False;
-		}
-		fstrcpy(gmep->nt_name, gidtoname((gid_t)gmep->unix_id));
-		fstrcpy(gmep->unix_name, gmep->nt_name);
-		gmep->nt_domain = global_sam_name;
-
-		return True;
-	}
-
-	/* oops */
-	return False;
-}
-
-/*************************************************************************
- looks up a gid, returns RID and type local, domain or well-known domain group
-*************************************************************************/
-BOOL lookupsmbgrpgid(gid_t gid, DOM_NAME_MAP *gmep)
-{
-	DEBUG(10,("lookupsmbgrpgid: unix gid %d\n", (int)gid));
-	if (map_alias_gid(gid, gmep))
-	{
-		return True;
-	}
-	if (map_group_gid(gid, gmep))
-	{
-		return True;
-	}
-	if (lp_server_role() != ROLE_DOMAIN_NONE)
-	{
-		gmep->nt_name   = nt_name;
-		gmep->unix_name = unix_name;
-		gmep->nt_domain = nt_domain;
-
-		gmep->unix_id = (uint32)gid;
-
-		/*
-		 * here we should do a LsaLookupNames() call
-		 * to check the status of the name with the PDC.
-		 * if the PDC know nothing of the name, it's ours.
-		 */
-
-		if (lp_server_role() == ROLE_DOMAIN_MEMBER)
-		{
-#if 0
-			if (lsa_lookup_names(global_myworkgroup, gmep->nt_name, &gmep->sid...);
-			{
-				return True;
-			}
-#endif
-		}
-
-		/*
-		 * ok, it's one of ours.  we therefore "create" an nt group or
-		 * alias name named after the unix group.  this is the point
-		 * where "appliance mode" should get its teeth in, as unix
-		 * groups won't really exist, they will only be numbers...
-		 */
-
-		/* name is not explicitly mapped
-		 * with map files or the PDC
-		 * so we are responsible for it...
-		 */
-
-		if (lp_server_role() == ROLE_DOMAIN_MEMBER)
-		{
-		 	/* ... as a LOCAL group. */
-			gmep->type = SID_NAME_ALIAS;
-		}
-		else
-		{
-		 	/* ... as a DOMAIN group. */
-			gmep->type = SID_NAME_DOM_GRP;
-		}
-		fstrcpy(gmep->nt_name, gidtoname(gid));
-		fstrcpy(gmep->unix_name, gmep->nt_name);
-
-		return get_sid_and_type(gmep->nt_name, gmep->type, gmep);
-	}
-
-	/* oops */
-	return False;
-}
-
diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c
index d0748456f9..a872f1331c 100644
--- a/source3/lib/gencache.c
+++ b/source3/lib/gencache.c
@@ -91,8 +91,8 @@ BOOL gencache_shutdown(void)
 
 
 /**
- * Set an entry in the cache file. If there's no such
- * one, then add it.
+ * Add one entry to the cache file.
+ * (it part of tridge's proposed API)
  *
  * @param key string that represents a key of this entry
  * @param value text representation value being cached
@@ -102,7 +102,7 @@ BOOL gencache_shutdown(void)
  *         false on the attempt's failure
  **/
  
-BOOL gencache_set(const char *keystr, const char *value, time_t timeout)
+BOOL gencache_add(const char *keystr, const char *value, time_t timeout)
 {
 	int ret;
 	TDB_DATA keybuf, databuf;
@@ -122,7 +122,7 @@ BOOL gencache_set(const char *keystr, const char *value, time_t timeout)
 	           = %s (%d seconds %s)\n", keybuf.dptr, value, ctime(&timeout),
 	           (int)(timeout - time(NULL)), timeout > time(NULL) ? "ahead" : "in the past"));
 		
-	ret = tdb_store(cache, keybuf, databuf, 0);
+	ret = tdb_store(cache, keybuf, databuf, TDB_INSERT);
 	SAFE_FREE(valstr);
 	SAFE_FREE(keybuf.dptr);
 	SAFE_FREE(databuf.dptr);
@@ -133,6 +133,7 @@ BOOL gencache_set(const char *keystr, const char *value, time_t timeout)
 
 /**
  * Set existing entry to the cache file.
+ * (it part of tridge's proposed API)
  *
  * @param key string that represents a key of this entry
  * @param value text representation value being cached
@@ -142,7 +143,7 @@ BOOL gencache_set(const char *keystr, const char *value, time_t timeout)
  *         false on the attempt's failure
  **/
 
-BOOL gencache_set_only(const char *keystr, const char *valstr, time_t timeout)
+BOOL gencache_set(const char *keystr, const char *valstr, time_t timeout)
 {
 	int ret = -1;
 	TDB_DATA keybuf, databuf;
@@ -188,6 +189,7 @@ BOOL gencache_set_only(const char *keystr, const char *valstr, time_t timeout)
 
 /**
  * Delete one entry from the cache file.
+ * (it part of tridge's proposed API)
  *
  * @param key string that represents a key of this entry
  *
@@ -217,10 +219,11 @@ BOOL gencache_del(const char *keystr)
 
 /**
  * Get existing entry from the cache file.
+ * (it part of tridge's proposed API)
  *
  * @param key string that represents a key of this entry
  * @param value buffer that is allocated and filled with the entry value
- *        buffer's disposing must be done outside
+ *        buffer's disposing is done outside
  * @param timeout pointer to a time_t that is filled with entry's
  *        timeout
  *
@@ -269,14 +272,12 @@ BOOL gencache_get(const char *keystr, char **valstr, time_t *timeout)
  *
  * @param fn pointer to the function that will be supplied with each single
  *        matching cache entry (key, value and timeout) as an arguments
- * @param data void pointer to an arbitrary data that is passed directly to the fn
- *        function on each call
  * @param keystr_pattern pattern the existing entries' keys are matched to
  *
  **/
 
-void gencache_iterate(void (*fn)(const char* key, const char *value, time_t timeout, void* dptr),
-                      void* data, const char* keystr_pattern)
+void gencache_iterate(void (*fn)(const char* key, const char *value, time_t timeout),
+                      const char* keystr_pattern)
 {
 	TDB_LIST_NODE *node, *first_node;
 	TDB_DATA databuf;
@@ -288,7 +289,7 @@ void gencache_iterate(void (*fn)(const char* key, const char *value, time_t time
 
 	if (!gencache_init()) return;
 
-	DEBUG(5, ("Searching cache keys with pattern %s\n", keystr_pattern));
+	DEBUG(5, ("Searching cache keys with pattern %s", keystr_pattern));
 	node = tdb_search_keys(cache, keystr_pattern);
 	first_node = node;
 	
@@ -313,7 +314,7 @@ void gencache_iterate(void (*fn)(const char* key, const char *value, time_t time
 		
 		DEBUG(10, ("Calling function with arguments (key = %s, value = %s, timeout = %s)\n",
 		           keystr, valstr, ctime(&timeout)));
-		fn(keystr, valstr, timeout, data);
+		fn(keystr, valstr, timeout);
 		
 		SAFE_FREE(valstr);
 		SAFE_FREE(entry);
@@ -322,4 +323,3 @@ void gencache_iterate(void (*fn)(const char* key, const char *value, time_t time
 	
 	tdb_search_list_free(first_node);
 }
-
diff --git a/source3/lib/genparser.c b/source3/lib/genparser.c
deleted file mode 100644
index 9fa9dbd33b..0000000000
--- a/source3/lib/genparser.c
+++ /dev/null
@@ -1,775 +0,0 @@
-/*
-   Copyright (C) Andrew Tridgell <genstruct@tridgell.net> 2002
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-/*
-  automatic marshalling/unmarshalling system for C structures
-*/
-
-#include "includes.h"
-
-/* see if a range of memory is all zero. Used to prevent dumping of zero elements */
-static int all_zero(const char *ptr, unsigned size)
-{
-	int i;
-	if (!ptr) return 1;
-	for (i=0;i<size;i++) {
-		if (ptr[i]) return 0;
-	}
-	return 1;
-}
-
-/* encode a buffer of bytes into a escaped string */
-static char *encode_bytes(const char *ptr, unsigned len)
-{
-	const char *hexdig = "0123456789abcdef";
-	char *ret, *p;
-	unsigned i;
-	ret = malloc(len*3 + 1); /* worst case size */
-	if (!ret) return NULL;
-	for (p=ret,i=0;i<len;i++) {
-		if (isalnum(ptr[i]) || isspace(ptr[i]) ||
-		    (ispunct(ptr[i]) && !strchr("\\{}", ptr[i]))) {
-			*p++ = ptr[i];
-		} else {
-			unsigned char c = *(unsigned char *)(ptr+i);
-			if (c == 0 && all_zero(ptr+i, len-i)) break;
-			p[0] = '\\';
-			p[1] = hexdig[c>>4];
-			p[2] = hexdig[c&0xF];
-			p += 3;
-		}
-	}
-
-	*p = 0;
-
-	return ret;
-}
-
-/* decode an escaped string from encode_bytes() into a buffer */
-static char *decode_bytes(const char *s, unsigned *len) 
-{
-	char *ret, *p;
-	unsigned i;
-	ret = calloc(1, strlen(s)+1); /* worst case length */
-
-	if (*s == '{') s++;
-
-	for (p=ret,i=0;s[i];i++) {
-		if (s[i] == '}') {
-			break;
-		} else if (s[i] == '\\') {
-			unsigned v;
-			if (sscanf(&s[i+1], "%02x", &v) != 1 || v > 255) {
-				free(ret);
-				return NULL;
-			}
-			*(unsigned char *)p = v;
-			p++;
-			i += 2;
-		} else {
-			*p++ = s[i];
-		}
-	}
-	*p = 0;
-
-	(*len) = (unsigned)(p - ret);
-	
-	return ret;
-}
-
-/* the add*() functions deal with adding things to a struct
-   parse_string */
-
-/* allocate more space if needed */
-static int addgen_alloc(struct parse_string *p, int n)
-{
-	if (p->length + n <= p->allocated) return 0;
-	p->allocated = p->length + n + 200;
-	p->s = realloc(p->s, p->allocated);
-	if (!p->s) {
-		errno = ENOMEM;
-		return -1;
-	}
-	return 0;
-}
-
-/* add a character to the buffer */
-static int addchar(struct parse_string *p, char c)
-{
-	if (addgen_alloc(p, 2) != 0) {
-		return -1;
-	}
-	p->s[p->length++] = c;
-	p->s[p->length] = 0;
-	return 0;
-}
-
-/* add a string to the buffer */
-int addstr(struct parse_string *p, const char *s)
-{
-	int len = strlen(s);
-	if (addgen_alloc(p, len+1) != 0) {
-		return -1;
-	}
-	memcpy(p->s + p->length, s, len+1);
-	p->length += len;
-	return 0;
-}
-
-/* add a string to the buffer with a tab prefix */
-static int addtabbed(struct parse_string *p, const char *s, unsigned indent)
-{
-	int len = strlen(s);
-	if (addgen_alloc(p, indent+len+1) != 0) {
-		return -1;
-	}
-	while (indent--) {
-		p->s[p->length++] = '\t';
-	}
-	memcpy(p->s + p->length, s, len+1);
-	p->length += len;
-	return 0;
-}
-
-/* note! this can only be used for results up to 60 chars wide! */
-int addshort(struct parse_string *p, const char *fmt, ...)
-{
-	char buf[60];
-	int n;
-	va_list ap;
-	va_start(ap, fmt);
-	n = vsnprintf(buf, sizeof(buf), fmt, ap);
-	va_end(ap);
-	if (addgen_alloc(p, n + 1) != 0) {
-		return -1;
-	}
-	if (n != 0) {
-		memcpy(p->s + p->length, buf, n);
-	}
-	p->length += n;
-	p->s[p->length] = 0;
-	return 0;
-}
-
-/* 
-   this is here to make it easier for people to write dump functions 
-   for their own types
- */
-int gen_addgen(struct parse_string *p, const char *fmt, ...)
-{
-	char *buf = NULL;
-	int n;
-	va_list ap;
-	va_start(ap, fmt);
-	n = vasprintf(&buf, fmt, ap);
-	va_end(ap);
-	if (addgen_alloc(p, n + 1) != 0) {
-		if (buf) free(buf);
-		return -1;
-	}
-	if (n != 0) {
-		memcpy(p->s + p->length, buf, n);
-	}
-	p->length += n;
-	p->s[p->length] = 0;
-	if (buf) free(buf);
-	return 0;
-}
-
-/* dump a enumerated type */
-int gen_dump_enum(const struct enum_struct *einfo,
-		  struct parse_string *p, 
-		  const char *ptr,
-		  unsigned indent)
-{
-	unsigned v = *(unsigned *)ptr;
-	int i;
-	for (i=0;einfo[i].name;i++) {
-		if (v == einfo[i].value) {
-			addstr(p, einfo[i].name);
-			return 0;
-		}
-	}
-	/* hmm, maybe we should just fail? */
-	return gen_dump_unsigned(p, ptr, indent);
-}
-
-/* dump a single non-array element, hanlding struct and enum */
-static int gen_dump_one(struct parse_string *p, 
-			 const struct parse_struct *pinfo,
-			 const char *ptr,
-			 unsigned indent)
-{
-	if (pinfo->dump_fn == gen_dump_char && pinfo->ptr_count == 1) {
-		char *s = encode_bytes(ptr, strlen(ptr));
-		if (addchar(p,'{') ||
-		    addstr(p, s) ||
-		    addstr(p, "}")) {
-			free(s);
-			return -1;
-		}
-		return 0;
-	}
-
-	return pinfo->dump_fn(p, ptr, indent);
-}
-
-/* handle dumping of an array of arbitrary type */
-static int gen_dump_array(struct parse_string *p,
-			  const struct parse_struct *pinfo, 
-			  const char *ptr,
-			  int array_len,
-			  int indent)
-{
-	int i, count=0;
-
-	/* special handling of fixed length strings */
-	if (array_len != 0 && 
-	    pinfo->ptr_count == 0 &&
-	    pinfo->dump_fn == gen_dump_char) {
-		char *s = encode_bytes(ptr, array_len);
-		if (!s) return -1;
-		if (addtabbed(p, pinfo->name, indent) ||
-		    addstr(p, " = {") ||
-		    addstr(p, s) ||
-		    addstr(p, "}\n")) {
-			free(s);
-			return -1;
-		}
-		free(s);
-		return 0;
-	}
-
-	for (i=0;i<array_len;i++) {
-		const char *p2 = ptr;
-		unsigned size = pinfo->size;
-
-		/* generic pointer dereference */
-		if (pinfo->ptr_count) {
-			p2 = *(const char **)ptr;
-			size = sizeof(void *);
-		}
-		
-		if ((count || pinfo->ptr_count) && 
-		    !(pinfo->flags & FLAG_ALWAYS) &&
-		    all_zero(ptr, size)) {
-			ptr += size;
-			continue;
-		}
-		if (count == 0) {
-			if (addtabbed(p, pinfo->name, indent) ||
-			    addshort(p, " = %u:", i)) {
-				return -1;
-			}
-		} else {
-			if (addshort(p, ", %u:", i) != 0) {
-				return -1;
-			}
-		}
-		if (gen_dump_one(p, pinfo, p2, indent) != 0) {
-			return -1;
-		}
-		ptr += size;
-		count++;
-	}
-	if (count) {
-		return addstr(p, "\n");
-	}
-	return 0;
-}
-
-/* find a variable by name in a loaded structure and return its value
-   as an integer. Used to support dynamic arrays */
-static int find_var(const struct parse_struct *pinfo,
-		    const char *data,
-		    const char *var)
-{
-	int i;
-	const char *ptr;
-
-	/* this allows for constant lengths */
-	if (isdigit(*var)) {
-		return atoi(var);
-	}
-
-	for (i=0;pinfo[i].name;i++) {
-		if (strcmp(pinfo[i].name, var) == 0) break;
-	}
-	if (!pinfo[i].name) return -1;
-
-	ptr = data + pinfo[i].offset;
-
-	switch (pinfo[i].size) {
-	case sizeof(int):
-		return *(int *)ptr;
-	case sizeof(char):
-		return *(char *)ptr;
-	}
-
-	return -1;
-}
-
-
-int gen_dump_struct(const struct parse_struct *pinfo,
-		    struct parse_string *p, 
-		    const char *ptr, 
-		    unsigned indent)
-{
-	char *s = gen_dump(pinfo, ptr, indent+1);
-	if (!s) return -1;
-	if (addstr(p, "{\n") || 
-	    addstr(p,s) || 
-	    addtabbed(p,"}", indent)) {
-		free(s);
-		return -1;
-	}
-	free(s);
-	return 0;
-}
-
-static int gen_dump_string(struct parse_string *p,
-			   const struct parse_struct *pinfo, 
-			   const char *data, 
-			   unsigned indent)
-{
-	const char *ptr = *(char **)data;
-	char *s = encode_bytes(ptr, strlen(ptr));
-	if (addtabbed(p, pinfo->name, indent) ||
-	    addstr(p, " = ") ||
-	    addchar(p,'{') ||
-	    addstr(p, s) ||
-	    addstr(p, "}\n")) {
-		free(s);
-		return -1;
-	}
-	return 0;
-}
-
-/* 
-   find the length of a nullterm array
-*/
-static int len_nullterm(const char *ptr, int size, int array_len)
-{
-	int len;
-
-	if (size == 1) {
-		len = strnlen(ptr, array_len);
-	} else {
-		for (len=0;len<array_len;len++) {
-			if (all_zero(ptr+len*size, size)) break;
-		}
-	}
-
-	if (len == 0) len = 1;
-
-	return len;
-}
-
-
-/* the generic dump routine. Scans the parse information for this structure
-   and processes it recursively */
-char *gen_dump(const struct parse_struct *pinfo, 
-	       const char *data, 
-	       unsigned indent)
-{
-	struct parse_string p;
-	int i;
-	
-	p.length = 0;
-	p.allocated = 0;
-	p.s = NULL;
-
-	if (addstr(&p, "") != 0) {
-		return NULL;
-	}
-	
-	for (i=0;pinfo[i].name;i++) {
-		const char *ptr = data + pinfo[i].offset;
-		unsigned size = pinfo[i].size;
-
-		if (pinfo[i].ptr_count) {
-			size = sizeof(void *);
-		}
-
-		/* special handling for array types */
-		if (pinfo[i].array_len) {
-			unsigned len = pinfo[i].array_len;
-			if (pinfo[i].flags & FLAG_NULLTERM) {
-				len = len_nullterm(ptr, size, len);
-			}
-			if (gen_dump_array(&p, &pinfo[i], ptr, 
-					   len, indent)) {
-				goto failed;
-			}
-			continue;
-		}
-
-		/* and dynamically sized arrays */
-		if (pinfo[i].dynamic_len) {
-			int len = find_var(pinfo, data, pinfo[i].dynamic_len);
-			struct parse_struct p2 = pinfo[i];
-			if (len < 0) {
-				goto failed;
-			}
-			if (len > 0) {
-				if (pinfo[i].flags & FLAG_NULLTERM) {
-					len = len_nullterm(*(char **)ptr, 
-							   pinfo[i].size, len);
-				}
-				p2.ptr_count--;
-				p2.dynamic_len = NULL;
-				if (gen_dump_array(&p, &p2, *(char **)ptr, 
-						   len, indent) != 0) {
-					goto failed;
-				}
-			}
-			continue;
-		}
-
-		/* don't dump zero elements */
-		if (!(pinfo[i].flags & FLAG_ALWAYS) && all_zero(ptr, size)) continue;
-
-		/* assume char* is a null terminated string */
-		if (pinfo[i].size == 1 && pinfo[i].ptr_count == 1 &&
-		    pinfo[i].dump_fn == gen_dump_char) {
-			if (gen_dump_string(&p, &pinfo[i], ptr, indent) != 0) {
-				goto failed;
-			}
-			continue;
-		}
-
-		/* generic pointer dereference */
-		if (pinfo[i].ptr_count) {
-			ptr = *(const char **)ptr;
-		}
-
-		if (addtabbed(&p, pinfo[i].name, indent) ||
-		    addstr(&p, " = ") ||
-		    gen_dump_one(&p, &pinfo[i], ptr, indent) ||
-		    addstr(&p, "\n")) {
-			goto failed;
-		}
-	}
-	return p.s;
-
-failed:
-	free(p.s);
-	return NULL;
-}
-
-/* search for a character in a string, skipping over sections within
-   matching braces */
-static char *match_braces(char *s, char c)
-{
-	int depth = 0;
-	while (*s) {
-		switch (*s) {
-		case '}':
-			depth--;
-			break;
-		case '{':
-			depth++;
-			break;
-		}
-		if (depth == 0 && *s == c) {
-			return s;
-		}
-		s++;
-	}
-	return s;
-}
-
-/* parse routine for enumerated types */
-int gen_parse_enum(const struct enum_struct *einfo, 
-		   char *ptr, 
-		   const char *str)
-{
-	unsigned v;
-	int i;
-
-	if (isdigit(*str)) {
-		if (sscanf(str, "%u", &v) != 1) {
-			errno = EINVAL;
-			return -1;
-		}
-		*(unsigned *)ptr = v;
-		return 0;
-	}
-
-	for (i=0;einfo[i].name;i++) {
-		if (strcmp(einfo[i].name, str) == 0) {
-			*(unsigned *)ptr = einfo[i].value;
-			return 0;
-		}
-	}
-
-	/* unknown enum value?? */
-	return -1;
-}
-
-
-/* parse all base types */
-static int gen_parse_base(const struct parse_struct *pinfo, 
-			  char *ptr, 
-			  const char *str)
-{
-	if (pinfo->parse_fn == gen_parse_char && pinfo->ptr_count==1) {
-		unsigned len;
-		char *s = decode_bytes(str, &len);
-		if (!s) return -1;
-		*(char **)ptr = s;
-		return 0;
-	}
-
-	if (pinfo->ptr_count) {
-		struct parse_struct p2 = *pinfo;
-		*(void **)ptr = calloc(1, pinfo->ptr_count>1?sizeof(void *):pinfo->size);
-		if (! *(void **)ptr) {
-			return -1;
-		}
-		ptr = *(char **)ptr;
-		p2.ptr_count--;
-		return gen_parse_base(&p2, ptr, str);
-	}
-
-	return pinfo->parse_fn(ptr, str);
-}
-
-/* parse a generic array */
-static int gen_parse_array(const struct parse_struct *pinfo, 
-			    char *ptr, 
-			    const char *str,
-			    int array_len)
-{
-	char *p, *p2;
-	unsigned size = pinfo->size;
-
-	/* special handling of fixed length strings */
-	if (array_len != 0 && 
-	    pinfo->ptr_count == 0 &&
-	    pinfo->dump_fn == gen_dump_char) {
-		unsigned len = 0;
-		char *s = decode_bytes(str, &len);
-		if (!s) return -1;
-		memset(ptr, 0, array_len);
-		memcpy(ptr, s, len);
-		free(s);
-		return 0;
-	}
-
-	if (pinfo->ptr_count) {
-		size = sizeof(void *);
-	}
-
-	while (*str) {
-		unsigned idx;
-		int done;
-
-		idx = atoi(str);
-		p = strchr(str,':');
-		if (!p) break;
-		p++;
-		p2 = match_braces(p, ',');
-		done = (*p2 != ',');
-		*p2 = 0;
-
-		if (*p == '{') {
-			p++;
-			p[strlen(p)-1] = 0;
-		}
-
-		if (gen_parse_base(pinfo, ptr + idx*size, p) != 0) {
-			return -1;
-		}
-
-		if (done) break;
-		str = p2+1;
-	}
-
-	return 0;
-}
-
-/* parse one element, hanlding dynamic and static arrays */
-static int gen_parse_one(const struct parse_struct *pinfo, 
-			 const char *name, 
-			 char *data, 
-			 const char *str)
-{
-	int i;
-	for (i=0;pinfo[i].name;i++) {
-		if (strcmp(pinfo[i].name, name) == 0) {
-			break;
-		}
-	}
-	if (pinfo[i].name == NULL) {
-		return 0;
-	}
-
-	if (pinfo[i].array_len) {
-		return gen_parse_array(&pinfo[i], data+pinfo[i].offset, 
-				       str, pinfo[i].array_len);
-	}
-
-	if (pinfo[i].dynamic_len) {
-		int len = find_var(pinfo, data, pinfo[i].dynamic_len);
-		if (len < 0) {
-			errno = EINVAL;
-			return -1;
-		}
-		if (len > 0) {
-			unsigned size;
-			struct parse_struct p2 = pinfo[i];
-			char *ptr;
-			size = pinfo[i].ptr_count>1?sizeof(void*):pinfo[i].size;
-			ptr = calloc(len, size);
-			if (!ptr) {
-				errno = ENOMEM;
-				return -1;
-			}
-			*((char **)(data + pinfo[i].offset)) = ptr;
-			p2.ptr_count--;
-			p2.dynamic_len = NULL;
-			return gen_parse_array(&p2, ptr, str, len);
-		}
-		return 0;
-	}
-
-	return gen_parse_base(&pinfo[i], data + pinfo[i].offset, str);
-}
-
-int gen_parse_struct(const struct parse_struct *pinfo, char *ptr, const char *str)
-{
-	return gen_parse(pinfo, ptr, str);
-}
-
-/* the main parse routine */
-int gen_parse(const struct parse_struct *pinfo, char *data, const char *s)
-{
-	char *str, *s0;
-	
-	s0 = strdup(s);
-	str = s0;
-
-	while (*str) {
-		char *p;
-		char *name;
-		char *value;
-
-		/* skip leading whitespace */
-		while (isspace(*str)) str++;
-
-		p = strchr(str, '=');
-		if (!p) break;
-		value = p+1;
-		while (p > str && isspace(*(p-1))) {
-			p--;
-		}
-
-		*p = 0;
-		name = str;
-
-		while (isspace(*value)) value++;
-
-		if (*value == '{') {
-			str = match_braces(value, '}');
-			value++;
-		} else {
-			str = match_braces(value, '\n');
-		}
-
-		*str++ = 0;
-		
-		if (gen_parse_one(pinfo, name, data, value) != 0) {
-			free(s0);
-			return -1;
-		}
-	}
-
-	free(s0);
-	return 0;
-}
-
-
-
-/* for convenience supply some standard dumpers and parsers here */
-
-int gen_parse_char(char *ptr, const char *str)
-{
-	*(unsigned char *)ptr = atoi(str);
-	return 0;
-}
-
-int gen_parse_int(char *ptr, const char *str)
-{
-	*(int *)ptr = atoi(str);
-	return 0;
-}
-
-int gen_parse_unsigned(char *ptr, const char *str)
-{
-	*(unsigned *)ptr = strtoul(str, NULL, 10);
-	return 0;
-}
-
-int gen_parse_time_t(char *ptr, const char *str)
-{
-	*(time_t *)ptr = strtoul(str, NULL, 10);
-	return 0;
-}
-
-int gen_parse_double(char *ptr, const char *str)
-{
-	*(double *)ptr = atof(str);
-	return 0;
-}
-
-int gen_parse_float(char *ptr, const char *str)
-{
-	*(float *)ptr = atof(str);
-	return 0;
-}
-
-int gen_dump_char(struct parse_string *p, const char *ptr, unsigned indent)
-{
-	return addshort(p, "%u", *(unsigned char *)(ptr));
-}
-
-int gen_dump_int(struct parse_string *p, const char *ptr, unsigned indent)
-{
-	return addshort(p, "%d", *(int *)(ptr));
-}
-
-int gen_dump_unsigned(struct parse_string *p, const char *ptr, unsigned indent)
-{
-	return addshort(p, "%u", *(unsigned *)(ptr));
-}
-
-int gen_dump_time_t(struct parse_string *p, const char *ptr, unsigned indent)
-{
-	return addshort(p, "%u", *(time_t *)(ptr));
-}
-
-int gen_dump_double(struct parse_string *p, const char *ptr, unsigned indent)
-{
-	return addshort(p, "%lg", *(double *)(ptr));
-}
-
-int gen_dump_float(struct parse_string *p, const char *ptr, unsigned indent)
-{
-	return addshort(p, "%g", *(float *)(ptr));
-}
diff --git a/source3/lib/genparser_samba.c b/source3/lib/genparser_samba.c
deleted file mode 100644
index 6c700d1094..0000000000
--- a/source3/lib/genparser_samba.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
-   Copyright (C) Andrew Tridgell <genstruct@tridgell.net> 2002
-   Copyright (C) Simo Sorce <idra@samba.org> 2002
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "includes.h"
-#include "genparser_samba.h"
-
-/* PARSE functions */
-
-int gen_parse_uint8(char *ptr, const char *str)
-{
-	*(uint8 *)ptr = atoi(str);
-	return 0;
-}
-
-int gen_parse_uint16(char *ptr, const char *str)
-{
-	*(uint16 *)ptr = atoi(str);
-	return 0;
-}
-
-int gen_parse_uint32(char *ptr, const char *str)
-{
-	*(uint32 *)ptr = strtoul(str, NULL, 10);
-	return 0;
-}
-
-int gen_parse_NTTIME(char *ptr, const char *str)
-{
-	if(sscanf(str, "%u,%u", &(((NTTIME *)(ptr))->high), &(((NTTIME *)(ptr))->low)) != 2) {
-		errno = EINVAL;
-		return -1;
-	}
-	return 0;
-}
-
-int gen_parse_DOM_SID(char *ptr, const char *str)
-{
-	if(!string_to_sid((DOM_SID *)ptr, str)) return -1;
-	return 0;
-}
-
-int gen_parse_SEC_ACCESS(char *ptr, const char *str)
-{
-	((SEC_ACCESS *)ptr)->mask = strtoul(str, NULL, 10);
-	return 0;
-}
-
-int gen_parse_GUID(char *ptr, const char *str)
-{
-	int info[GUID_SIZE];
-	int i;
-	char *sc;
-       	char *p;
-	char *m;
-
-	m = strdup(str);
-	if (!m) return -1;
-	sc = m;
-	
-	memset(info, 0, sizeof(info));
-	for (i = 0; i < GUID_SIZE; i++) {
-		p = strchr(sc, ',');
-		if (p != NULL) p = '\0';
-		info[i] = atoi(sc);
-		if (p != NULL) sc = p + 1;
-	}
-	free(m);
-		
-	for (i = 0; i < GUID_SIZE; i++) {
-		((GUID *)ptr)->info[i] = info[i];
-	}
-		
-	return 0;
-}
-
-int gen_parse_SEC_ACE(char *ptr, const char *str)
-{
-	return gen_parse_struct(pinfo_security_ace_info, ptr, str);
-}
-
-int gen_parse_SEC_ACL(char *ptr, const char *str)
-{
-	return gen_parse_struct(pinfo_security_acl_info, ptr, str);
-}
-
-int gen_parse_SEC_DESC(char *ptr, const char *str)
-{
-	return gen_parse_struct(pinfo_security_descriptor_info, ptr, str);
-}
-
-int gen_parse_LUID_ATTR(char *ptr, const char *str)
-{
-	return gen_parse_struct(pinfo_luid_attr_info, ptr, str);
-}
-
-int gen_parse_LUID(char *ptr, const char *str)
-{
-	if(sscanf(str, "%u,%u", &(((LUID *)(ptr))->high), &(((LUID *)(ptr))->low)) != 2) {
-		errno = EINVAL;
-		return -1;
-	}
-	return 0;
-}
-
-
-
-/* DUMP functions */
-
-int gen_dump_uint8(struct parse_string *p, const char *ptr, unsigned indent)
-{
-	return addshort(p, "%u", *(uint8 *)(ptr));
-}
-
-int gen_dump_uint16(struct parse_string *p, const char *ptr, unsigned indent)
-{
-	return addshort(p, "%u", *(uint16 *)(ptr));
-}
-
-int gen_dump_uint32(struct parse_string *p, const char *ptr, unsigned indent)
-{
-	return addshort(p, "%u", *(uint32 *)(ptr));
-}
-
-int gen_dump_NTTIME(struct parse_string *p, const char *ptr, unsigned indent)
-{
-	uint32 low, high;
-
-	high = ((NTTIME *)(ptr))->high;
-	low = ((NTTIME *)(ptr))->low;
-	return addshort(p, "%u,%u", high, low);
-}
-
-int gen_dump_DOM_SID(struct parse_string *p, const char *ptr, unsigned indent)
-{
-	fstring sidstr;
-
-	sid_to_string(sidstr, (DOM_SID *)ptr);
-	return addstr(p, sidstr);
-}
-
-int gen_dump_SEC_ACCESS(struct parse_string *p, const char *ptr, unsigned indent)
-{
-	return addshort(p, "%u", ((SEC_ACCESS *)ptr)->mask);
-}
-
-int gen_dump_GUID(struct parse_string *p, const char *ptr, unsigned indent)
-{
-	int i, r;
-
-	for (i = 0; i < (GUID_SIZE - 1); i++) {
-		if (!(r = addshort(p, "%d,", ((GUID *)ptr)->info[i]))) return r;
-	}
-	return addshort(p, "%d", ((GUID *)ptr)->info[i]);
-}
-
-int gen_dump_SEC_ACE(struct parse_string *p, const char *ptr, unsigned indent)
-{
-	return gen_dump_struct(pinfo_security_ace_info, p, ptr, indent);
-}
-
-int gen_dump_SEC_ACL(struct parse_string *p, const char *ptr, unsigned indent)
-{
-	return gen_dump_struct(pinfo_security_acl_info, p, ptr, indent);
-}
-
-int gen_dump_SEC_DESC(struct parse_string *p, const char *ptr, unsigned indent)
-{
-	return gen_dump_struct(pinfo_security_descriptor_info, p, ptr, indent);
-}
-
-int gen_dump_LUID_ATTR(struct parse_string *p, const char *ptr, unsigned indent)
-{
-	return gen_dump_struct(pinfo_luid_attr_info, p, ptr, indent);
-}
-
-int gen_dump_LUID(struct parse_string *p, const char *ptr, unsigned indent)
-{
-	uint32 low, high;
-
-	high = ((LUID *)(ptr))->high;
-	low = ((LUID *)(ptr))->low;
-	return addshort(p, "%u,%u", high, low);
-}
-
diff --git a/source3/lib/genrand.c b/source3/lib/genrand.c
index bc9f21c640..fe756169a6 100644
--- a/source3/lib/genrand.c
+++ b/source3/lib/genrand.c
@@ -101,7 +101,7 @@ static void get_random_stream(unsigned char *data, size_t datasize)
  Note that the hash is not initialised.
 *****************************************************************/
 
-static void do_filehash(const char *fname, unsigned char *the_hash)
+static void do_filehash(char *fname, unsigned char *the_hash)
 {
 	unsigned char buf[1011]; /* deliberate weird size */
 	unsigned char tmp_md4[16];
diff --git a/source3/lib/iconv.c b/source3/lib/iconv.c
index 5292e9cf0a..43350d9349 100644
--- a/source3/lib/iconv.c
+++ b/source3/lib/iconv.c
@@ -2,7 +2,6 @@
    Unix SMB/CIFS implementation.
    minimal iconv implementation
    Copyright (C) Andrew Tridgell 2001
-   Copyright (C) Jelmer Vernooij 2002
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,51 +24,31 @@ static size_t ascii_pull(void *,char **, size_t *, char **, size_t *);
 static size_t ascii_push(void *,char **, size_t *, char **, size_t *);
 static size_t  utf8_pull(void *,char **, size_t *, char **, size_t *);
 static size_t  utf8_push(void *,char **, size_t *, char **, size_t *);
+static size_t weird_pull(void *,char **, size_t *, char **, size_t *);
+static size_t weird_push(void *,char **, size_t *, char **, size_t *);
 static size_t ucs2hex_pull(void *,char **, size_t *, char **, size_t *);
 static size_t ucs2hex_push(void *,char **, size_t *, char **, size_t *);
 static size_t iconv_copy(void *,char **, size_t *, char **, size_t *);
 
-static struct charset_functions builtin_functions[] = {
+/*
+  for each charset we have a function that pulls from that charset to 
+  a ucs2 buffer, and a function that pushes to a ucs2 buffer 
+*/
+static struct {
+	char *name;
+	size_t (*pull)(void *, char **inbuf, size_t *inbytesleft,
+		       char **outbuf, size_t *outbytesleft);
+	size_t (*push)(void *, char **inbuf, size_t *inbytesleft,
+		       char **outbuf, size_t *outbytesleft);
+} charsets[] = {
 	{"UCS-2LE",  iconv_copy, iconv_copy},
 	{"UTF8",   utf8_pull,  utf8_push},
 	{"ASCII", ascii_pull, ascii_push},
+	{"WEIRD", weird_pull, weird_push},
 	{"UCS2-HEX", ucs2hex_pull, ucs2hex_push},
 	{NULL, NULL, NULL}
 };
 
-static struct charset_functions *charsets = NULL;
-
-BOOL smb_register_charset(struct charset_functions *funcs) 
-{
-	struct charset_functions *c = charsets;
-
-	DEBUG(5, ("Attempting to register new charset %s\n", funcs->name));
-	/* Check whether we already have this charset... */
-	while(c) {
-		if(!strcasecmp(c->name, funcs->name)){ 
-			DEBUG(2, ("Duplicate charset %s, not registering\n", funcs->name));
-			return False;
-		}
-		c = c->next;
-	}
-
-	funcs->next = funcs->prev = NULL;
-	DEBUG(5, ("Registered charset %s\n", funcs->name));
-	DLIST_ADD(charsets, funcs);
-	return True;
-}
-
-void lazy_initialize_iconv(void)
-{
-	static BOOL initialized = False;
-	int i;
-
-	if (!initialized) {
-		initialized = True;
-		for(i = 0; builtin_functions[i].name; i++) 
-			smb_register_charset(&builtin_functions[i]);
-	}
-}
 
 /* if there was an error then reset the internal state,
    this ensures that we don't have a shift state remaining for
@@ -136,11 +115,7 @@ size_t smb_iconv(smb_iconv_t cd,
 smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode)
 {
 	smb_iconv_t ret;
-	struct charset_functions *from, *to;
-	
-	lazy_initialize_iconv();
-	from = charsets;
-	to = charsets;
+	int from, to;
 
 	ret = (smb_iconv_t)malloc(sizeof(*ret));
 	if (!ret) {
@@ -158,52 +133,48 @@ smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode)
 		return ret;
 	}
 
-	while (from) {
-		if (strcasecmp(from->name, fromcode) == 0) break;
-		from = from->next;
+	for (from=0; charsets[from].name; from++) {
+		if (strcasecmp(charsets[from].name, fromcode) == 0) break;
 	}
-
-	while (to) {
-		if (strcasecmp(to->name, tocode) == 0) break;
-		to = to->next;
+	for (to=0; charsets[to].name; to++) {
+		if (strcasecmp(charsets[to].name, tocode) == 0) break;
 	}
 
 #ifdef HAVE_NATIVE_ICONV
-	if (!from) {
+	if (!charsets[from].name) {
 		ret->pull = sys_iconv;
 		ret->cd_pull = iconv_open("UCS-2LE", fromcode);
 		if (ret->cd_pull == (iconv_t)-1) goto failed;
 	}
-
-	if (!to) {
+	if (!charsets[to].name) {
 		ret->push = sys_iconv;
 		ret->cd_push = iconv_open(tocode, "UCS-2LE");
 		if (ret->cd_push == (iconv_t)-1) goto failed;
 	}
 #else
-	if (!from || !to) {
+	if (!charsets[from].name || !charsets[to].name) {
 		goto failed;
 	}
 #endif
 
 	/* check for conversion to/from ucs2 */
-	if (strcasecmp(fromcode, "UCS-2LE") == 0 && to) {
-		ret->direct = to->push;
+	if (from == 0 && charsets[to].name) {
+		ret->direct = charsets[to].push;
 		return ret;
 	}
-	if (strcasecmp(tocode, "UCS-2LE") == 0 && from) {
-		ret->direct = from->pull;
+	if (to == 0 && charsets[from].name) {
+		ret->direct = charsets[from].pull;
 		return ret;
 	}
 
 #ifdef HAVE_NATIVE_ICONV
-	if (strcasecmp(fromcode, "UCS-2LE") == 0) {
+	if (from == 0) {
 		ret->direct = sys_iconv;
 		ret->cd_direct = ret->cd_push;
 		ret->cd_push = NULL;
 		return ret;
 	}
-	if (strcasecmp(tocode, "UCS-2LE") == 0) {
+	if (to == 0) {
 		ret->direct = sys_iconv;
 		ret->cd_direct = ret->cd_pull;
 		ret->cd_pull = NULL;
@@ -212,8 +183,8 @@ smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode)
 #endif
 
 	/* the general case has to go via a buffer */
-	if (!ret->pull) ret->pull = from->pull;
-	if (!ret->push) ret->push = to->push;
+	if (!ret->pull) ret->pull = charsets[from].pull;
+	if (!ret->push) ret->push = charsets[to].push;
 	return ret;
 
 failed:
@@ -381,6 +352,111 @@ static size_t ucs2hex_push(void *cd, char **inbuf, size_t *inbytesleft,
 }
 
 
+/* the "weird" character set is very useful for testing multi-byte
+   support and finding bugs. Don't use on a production system! 
+*/
+static struct {
+	char from;
+	char *to;
+	int len;
+} weird_table[] = {
+	{'q', "^q^", 3},
+	{'Q', "^Q^", 3},
+	{0, NULL}
+};
+
+static size_t weird_pull(void *cd, char **inbuf, size_t *inbytesleft,
+			 char **outbuf, size_t *outbytesleft)
+{
+	while (*inbytesleft >= 1 && *outbytesleft >= 2) {
+		int i;
+		int done = 0;
+		for (i=0;weird_table[i].from;i++) {
+			if (strncmp((*inbuf), 
+				    weird_table[i].to, 
+				    weird_table[i].len) == 0) {
+				if (*inbytesleft < weird_table[i].len) {
+					DEBUG(0,("ERROR: truncated weird string\n"));
+					/* smb_panic("weird_pull"); */
+
+				} else {
+					(*outbuf)[0] = weird_table[i].from;
+					(*outbuf)[1] = 0;
+					(*inbytesleft)  -= weird_table[i].len;
+					(*outbytesleft) -= 2;
+					(*inbuf)  += weird_table[i].len;
+					(*outbuf) += 2;
+					done = 1;
+					break;
+				}
+			}
+		}
+		if (done) continue;
+		(*outbuf)[0] = (*inbuf)[0];
+		(*outbuf)[1] = 0;
+		(*inbytesleft)  -= 1;
+		(*outbytesleft) -= 2;
+		(*inbuf)  += 1;
+		(*outbuf) += 2;
+	}
+
+	if (*inbytesleft > 0) {
+		errno = E2BIG;
+		return -1;
+	}
+	
+	return 0;
+}
+
+static size_t weird_push(void *cd, char **inbuf, size_t *inbytesleft,
+			 char **outbuf, size_t *outbytesleft)
+{
+	int ir_count=0;
+
+	while (*inbytesleft >= 2 && *outbytesleft >= 1) {
+		int i;
+		int done=0;
+		for (i=0;weird_table[i].from;i++) {
+			if ((*inbuf)[0] == weird_table[i].from &&
+			    (*inbuf)[1] == 0) {
+				if (*outbytesleft < weird_table[i].len) {
+					DEBUG(0,("No room for weird character\n"));
+					/* smb_panic("weird_push"); */
+				} else {
+					memcpy(*outbuf, weird_table[i].to, 
+					       weird_table[i].len);
+					(*inbytesleft)  -= 2;
+					(*outbytesleft) -= weird_table[i].len;
+					(*inbuf)  += 2;
+					(*outbuf) += weird_table[i].len;
+					done = 1;
+					break;
+				}
+			}
+		}
+		if (done) continue;
+
+		(*outbuf)[0] = (*inbuf)[0];
+		if ((*inbuf)[1]) ir_count++;
+		(*inbytesleft)  -= 2;
+		(*outbytesleft) -= 1;
+		(*inbuf)  += 2;
+		(*outbuf) += 1;
+	}
+
+	if (*inbytesleft == 1) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	if (*inbytesleft > 1) {
+		errno = E2BIG;
+		return -1;
+	}
+	
+	return ir_count;
+}
+
 static size_t iconv_copy(void *cd, char **inbuf, size_t *inbytesleft,
 			 char **outbuf, size_t *outbytesleft)
 {
diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 8200b2f8c3..36a23e28ab 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -81,7 +81,7 @@ static void sig_usr1(void)
 
 static void ping_message(int msg_type, pid_t src, void *buf, size_t len)
 {
-	const char *msg = buf ? buf : "none";
+	char *msg = buf ? buf : "none";
 	DEBUG(1,("INFO: Received PING message from PID %u [%s]\n",(unsigned int)src, msg));
 	message_send_pid(src, MSG_PONG, buf, len, True);
 }
diff --git a/source3/lib/module.c b/source3/lib/module.c
deleted file mode 100644
index 5ad6485806..0000000000
--- a/source3/lib/module.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   module loading system
-
-   Copyright (C) Jelmer Vernooij 2002
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "includes.h"
-
-#ifdef HAVE_DLOPEN
-NTSTATUS smb_load_module(const char *module_name)
-{
-	void *handle;
-	init_module_function *init;
-	NTSTATUS nt_status;
-
-	/* Always try to use LAZY symbol resolving; if the plugin has 
-	 * backwards compatibility, there might be symbols in the 
-	 * plugin referencing to old (removed) functions
-	 */
-	handle = sys_dlopen(module_name, RTLD_LAZY);
-
-	if(!handle) {
-		DEBUG(0, ("Error loading module '%s': %s\n", module_name, sys_dlerror()));
-		return NT_STATUS_UNSUCCESSFUL;
-	}
-
-	init = sys_dlsym(handle, "init_module");
-
-	if(!init) {
-		DEBUG(0, ("Error trying to resolve symbol 'init_module' in %s: %s\n", module_name, sys_dlerror()));
-		return NT_STATUS_UNSUCCESSFUL;
-	}
-
-	nt_status = init();
-
-	DEBUG(2, ("Module '%s' loaded\n", module_name));
-
-	return nt_status;
-}
-
-/* Load all modules in list and return number of 
- * modules that has been successfully loaded */
-int smb_load_modules(const char **modules)
-{
-	int i;
-	int success = 0;
-
-	for(i = 0; modules[i]; i++){
-		if(NT_STATUS_IS_OK(smb_load_module(modules[i]))) {
-			success++;
-		}
-	}
-
-	DEBUG(2, ("%d modules successfully loaded\n", success));
-
-	return success;
-}
-
-#else /* HAVE_DLOPEN */
-
-NTSTATUS smb_load_module(const char *module_name)
-{
-	DEBUG(0,("This samba executable has not been build with plugin support"));
-	return NT_STATUS_NOT_SUPPORTED;
-}
-
-int smb_load_modules(const char **modules)
-{
-	DEBUG(0,("This samba executable has not been build with plugin support"));
-	return -1;
-}
-
-#endif /* HAVE_DLOPEN */
diff --git a/source3/lib/pam_errors.c b/source3/lib/pam_errors.c
index 925441fb1d..e1d02151a6 100644
--- a/source3/lib/pam_errors.c
+++ b/source3/lib/pam_errors.c
@@ -28,7 +28,7 @@
 #endif	
 
 /* PAM -> NT_STATUS map */
-static const struct {
+const static struct {
 	int pam_code;
 	NTSTATUS ntstatus;
 } pam_to_nt_status_map[] = {
@@ -58,7 +58,7 @@ static const struct {
 };
 
 /* NT_STATUS -> PAM map */
-static const struct {
+const static struct {
 	NTSTATUS ntstatus;
 	int pam_code;
 } nt_status_to_pam_map[] = {
diff --git a/source3/lib/pidfile.c b/source3/lib/pidfile.c
index 16a12656b3..393fb57994 100644
--- a/source3/lib/pidfile.c
+++ b/source3/lib/pidfile.c
@@ -28,7 +28,7 @@
 
 /* return the pid in a pidfile. return 0 if the process (or pidfile)
    does not exist */
-pid_t pidfile_pid(const char *name)
+pid_t pidfile_pid(char *name)
 {
 	int fd;
 	char pidstr[20];
@@ -69,7 +69,7 @@ pid_t pidfile_pid(const char *name)
 }
 
 /* create a pid file in the pid directory. open it and leave it locked */
-void pidfile_create(const char *name)
+void pidfile_create(char *name)
 {
 	int     fd;
 	char    buf[20];
diff --git a/source3/lib/replace.c b/source3/lib/replace.c
index cd48b8d160..a826de3560 100644
--- a/source3/lib/replace.c
+++ b/source3/lib/replace.c
@@ -427,23 +427,26 @@ char *rep_inet_ntoa(struct in_addr ip)
 
 #ifndef HAVE_TIMEGM
 /*
-  yes, I know this looks insane, but its really needed. The function in the 
-  Linux timegm() manpage does not work on solaris.
+  see the timegm man page on linux
 */
  time_t timegm(struct tm *tm) 
 {
-	struct tm tm2, tm3;
-	time_t t;
-
-	tm2 = *tm;
-
-	t = mktime(&tm2);
-	tm3 = *localtime(&t);
-	tm2 = *tm;
-	tm2.tm_isdst = tm3.tm_isdst;
-	t = mktime(&tm2);
-	t -= TimeDiff(t);
-
-	return t;
+	time_t ret;
+	char *tz;
+	char *tzvar;
+	
+	tz = getenv("TZ");
+	putenv("TZ=");
+	tzset();
+	ret = mktime(tm);
+	if (tz) {
+		asprintf(&tzvar, "TZ=%s", tz);
+		putenv(tzvar);
+		safe_free(tzvar);
+	} else {
+		putenv("TZ");
+	}
+	tzset();
+	return ret;
 }
 #endif
diff --git a/source3/lib/smbpasswd.c b/source3/lib/smbpasswd.c
index 92ae1ffea2..c27af5540b 100644
--- a/source3/lib/smbpasswd.c
+++ b/source3/lib/smbpasswd.c
@@ -60,7 +60,7 @@ BOOL smbpasswd_gethexpwd(char *p, unsigned char *pwd)
 {
 	int i;
 	unsigned char   lonybble, hinybble;
-	const char      *hexchars = "0123456789ABCDEF";
+	char           *hexchars = "0123456789ABCDEF";
 	char           *p1, *p2;
 	
 	if (!p) return (False);
diff --git a/source3/lib/system.c b/source3/lib/system.c
index fed9b117ca..873b8737d5 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -1233,7 +1233,7 @@ int sys_dup2(int oldfd, int newfd)
  Wrapper for Admin Logs.
 ****************************************************************************/
 
-void sys_adminlog(int priority, const char *format_str, ...) 
+void sys_adminlog(int priority, char *format_str, ...)
 {
 	va_list ap;
 	int ret;
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 39c58534cd..0adfe34032 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -676,7 +676,7 @@ smb_ucs2_t *unix_clean_path(const smb_ucs2_t *s)
  Make a dir struct.
 ****************************************************************************/
 
-void make_dir_struct(char *buf, const char *mask, const char *fname,SMB_OFF_T size,int mode,time_t date)
+void make_dir_struct(char *buf,char *mask,char *fname,SMB_OFF_T size,int mode,time_t date)
 {  
 	char *p;
 	pstring mask2;
@@ -1398,7 +1398,7 @@ gid_t nametogid(const char *name)
  Something really nasty happened - panic !
 ********************************************************************/
 
-void smb_panic(const char *why)
+void smb_panic(char *why)
 {
 	char *cmd = lp_panic_action();
 	int result;
@@ -1463,7 +1463,7 @@ char *readdirname(DIR *p)
  of a path matches a (possibly wildcarded) entry in a namelist.
 ********************************************************************/
 
-BOOL is_in_path(const char *name, name_compare_entry *namelist)
+BOOL is_in_path(char *name, name_compare_entry *namelist)
 {
 	pstring last_component;
 	char *p;
@@ -2247,7 +2247,7 @@ BOOL ms_has_wild_w(const smb_ucs2_t *s)
  of the ".." name.
 *******************************************************************/
 
-BOOL mask_match(const char *string, char *pattern, BOOL is_case_sensitive)
+BOOL mask_match(char *string, char *pattern, BOOL is_case_sensitive)
 {
 	fstring p2, s2;
 
diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c
index 824987f189..edd59ae109 100644
--- a/source3/lib/util_sid.c
+++ b/source3/lib/util_sid.c
@@ -79,9 +79,9 @@ NT_USER_TOKEN system_token = {
  Lookup string names for SID types.
 ****************************************************************************/
 
-static const struct {
+const static struct {
 	enum SID_NAME_USE sid_type;
-	const char *string;
+	char *string;
 } sid_name_type[] = {
 	{SID_NAME_USER, "User"},
 	{SID_NAME_DOM_GRP, "Domain Group"},
@@ -181,8 +181,7 @@ NT_USER_TOKEN *get_system_token(void)
 void split_domain_name(const char *fullname, char *domain, char *name)
 {
 	pstring full_name;
-	const char *sep;
-	char *p;
+	char *p, *sep;
 
 	sep = lp_winbind_separator();
 
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index e162e5cd77..2acb20861b 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -43,7 +43,7 @@ BOOL is_a_socket(int fd)
 enum SOCK_OPT_TYPES {OPT_BOOL,OPT_INT,OPT_ON};
 
 typedef struct smb_socket_option {
-	const char *name;
+	char *name;
 	int level;
 	int option;
 	int value;
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index a76278e532..f3fa89b05f 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -576,7 +576,7 @@ size_t strhex_to_str(char *p, size_t len, const char *strhex)
 	size_t i;
 	size_t num_chars = 0;
 	unsigned char   lonybble, hinybble;
-	const char     *hexchars = "0123456789ABCDEF";
+	char           *hexchars = "0123456789ABCDEF";
 	char           *p1 = NULL, *p2 = NULL;
 
 	for (i = 0; i < len && strhex[i] != 0; i++) {
@@ -958,7 +958,7 @@ void split_at_last_component(char *path, char *front, char sep, char *back)
  Write an octal as a string.
 ****************************************************************************/
 
-const char *octal_string(int i)
+char *octal_string(int i)
 {
 	static char ret[64];
 	if (i == -1)
@@ -1367,158 +1367,6 @@ BOOL str_list_substitute(char **list, const char *pattern, const char *insert)
 	return True;
 }
 
-
-#define IPSTR_LIST_SEP	","
-
-/**
- * Add ip string representation to ipstr list. Used also
- * as part of @function ipstr_list_make
- *
- * @param ipstr_list pointer to string containing ip list;
- *        MUST BE already allocated and IS reallocated if necessary
- * @param ipstr_size pointer to current size of ipstr_list (might be changed
- *        as a result of reallocation)
- * @param ip IP address which is to be added to list
- * @return pointer to string appended with new ip and possibly
- *         reallocated to new length
- **/
-
-char* ipstr_list_add(char** ipstr_list, const struct in_addr *ip)
-{
-	char* new_ipstr = NULL;
-	
-	/* arguments checking */
-	if (!ipstr_list || !ip) return NULL;
-
-	/* attempt to convert ip to a string and append colon separator to it */
-	if (*ipstr_list) {
-		asprintf(&new_ipstr, "%s%s%s", *ipstr_list, IPSTR_LIST_SEP,inet_ntoa(*ip));
-		SAFE_FREE(*ipstr_list);
-	} else {
-		asprintf(&new_ipstr, "%s", inet_ntoa(*ip));
-	}
-	*ipstr_list = new_ipstr;
-	return *ipstr_list;
-}
-
-
-/**
- * Allocate and initialise an ipstr list using ip adresses
- * passed as arguments.
- *
- * @param ipstr_list pointer to string meant to be allocated and set
- * @param ip_list array of ip addresses to place in the list
- * @param ip_count number of addresses stored in ip_list
- * @return pointer to allocated ip string
- **/
- 
-char* ipstr_list_make(char** ipstr_list, const struct in_addr* ip_list, int ip_count)
-{
-	int i;
-	
-	/* arguments checking */
-	if (!ip_list && !ipstr_list) return 0;
-
-	*ipstr_list = NULL;
-	
-	/* process ip addresses given as arguments */
-	for (i = 0; i < ip_count; i++)
-		*ipstr_list = ipstr_list_add(ipstr_list, &ip_list[i]);
-	
-	return (*ipstr_list);
-}
-
-
-/**
- * Parse given ip string list into array of ip addresses
- * (as in_addr structures)
- *
- * @param ipstr ip string list to be parsed 
- * @param ip_list pointer to array of ip addresses which is
- *        allocated by this function and must be freed by caller
- * @return number of succesfully parsed addresses
- **/
- 
-int ipstr_list_parse(const char* ipstr_list, struct in_addr** ip_list)
-{
-	fstring token_str;
-	int count;
-
-	if (!ipstr_list || !ip_list) return 0;
-	
-	for (*ip_list = NULL, count = 0;
-	     next_token(&ipstr_list, token_str, IPSTR_LIST_SEP, FSTRING_LEN);
-	     count++) {
-	     
-		struct in_addr addr;
-
-		/* convert single token to ip address */
-		if ( (addr.s_addr = inet_addr(token_str)) == INADDR_NONE )
-			break;
-		
-		/* prepare place for another in_addr structure */
-		*ip_list = Realloc(*ip_list, (count + 1) * sizeof(struct in_addr));
-		if (!*ip_list) return -1;
-		
-		(*ip_list)[count] = addr;
-	}
-	
-	return count;
-}
-
-
-/**
- * Safely free ip string list
- *
- * @param ipstr_list ip string list to be freed
- **/
-
-void ipstr_list_free(char* ipstr_list)
-{
-	SAFE_FREE(ipstr_list);
-}
-
-
-/***********************************************************
- Unescape a URL encoded string, in place.
-***********************************************************/
-
-void rfc1738_unescape(char *buf)
-{
-	char *p=buf;
-
-	while ((p=strchr_m(p,'+')))
-		*p = ' ';
-
-	p = buf;
-
-	while (p && *p && (p=strchr_m(p,'%'))) {
-		int c1 = p[1];
-		int c2 = p[2];
-
-		if (c1 >= '0' && c1 <= '9')
-			c1 = c1 - '0';
-		else if (c1 >= 'A' && c1 <= 'F')
-			c1 = 10 + c1 - 'A';
-		else if (c1 >= 'a' && c1 <= 'f')
-			c1 = 10 + c1 - 'a';
-		else {p++; continue;}
-
-		if (c2 >= '0' && c2 <= '9')
-			c2 = c2 - '0';
-		else if (c2 >= 'A' && c2 <= 'F')
-			c2 = 10 + c2 - 'A';
-		else if (c2 >= 'a' && c2 <= 'f')
-			c2 = 10 + c2 - 'a';
-		else {p++; continue;}
-			
-		*p = (c1<<4) | c2;
-
-		memmove(p+1, p+3, strlen(p+3)+1);
-		p++;
-	}
-}
-
 #ifdef VALGRIND
 size_t valgrind_strlen(const char *s)
 {
@@ -1528,3 +1376,4 @@ size_t valgrind_strlen(const char *s)
 	return count;
 }
 #endif
+