r13338: Remove the experimental pdb modules

(This used to be commit a3bc4f51144bcd711ae1869d60a15d24be6ad992)

6 files changed, 1 insertions, 2339 deletions

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 281d58f23d..f02afc4eb9 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -325,12 +325,9 @@ PASSDB_GET_SET_OBJ = passdb/pdb_get_set.o
 PASSDB_OBJ = $(PASSDB_GET_SET_OBJ) passdb/passdb.o passdb/pdb_interface.o \
 		passdb/util_wellknown.o passdb/util_builtin.o passdb/pdb_compat.o \
 		passdb/util_unixsids.o passdb/lookup_sid.o \
-		passdb/login_cache.o @PDB_STATIC@ passdb/pdb_sql.o \
+		passdb/login_cache.o @PDB_STATIC@ \
 		lib/system_smbd.o lib/account_pol.o lib/privileges.o
 
-XML_OBJ = passdb/pdb_xml.o
-MYSQL_OBJ = passdb/pdb_mysql.o
-PGSQL_OBJ = passdb/pdb_pgsql.o
 DEVEL_HELP_WEIRD_OBJ = modules/weird.o
 CP850_OBJ = modules/CP850.o
 CP437_OBJ = modules/CP437.o
@@ -1226,16 +1223,6 @@ bin/sam.@SHLIBEXT@: $(AUTH_SAM_OBJ:.o=.@PICSUFFIX@)
 	@echo "Building plugin $@"
 	@$(SHLD) $(LDSHFLAGS) -o $@ $(AUTH_SAM_OBJ:.o=.@PICSUFFIX@) @SONAMEFLAG@`basename $@`
 
-bin/mysql.@SHLIBEXT@: $(MYSQL_OBJ:.o=.@PICSUFFIX@)
-	@echo "Building plugin $@"
-	@$(SHLD) $(LDSHFLAGS) -o $@ $(MYSQL_OBJ:.o=.@PICSUFFIX@) @MYSQL_LIBS@ \
-		@SONAMEFLAG@`basename $@`
-
-bin/pgsql.@SHLIBEXT@: $(PGSQL_OBJ:.o=.@PICSUFFIX@)
-	@echo "Building plugin $@"
-	@$(SHLD) $(LDSHFLAGS) -o $@ $(PGSQL_OBJ:.o=.@PICSUFFIX@) @PGSQL_LIBS@ \
-      @SONAMEFLAG@`basename $@`
-
 bin/ldapsam.@SHLIBEXT@: passdb/pdb_ldap.@PICSUFFIX@
 	@echo "Building plugin $@"
 	@$(SHLD) $(LDSHFLAGS) $(LDAP_LIBS) -o $@ passdb/pdb_ldap.@PICSUFFIX@ \
@@ -1281,11 +1268,6 @@ bin/macosxfs.@SHLIBEXT@: $(CHARSET_MACOSXFS_OBJ:.o=.@PICSUFFIX@)
 	@$(SHLD) $(LDSHFLAGS) -o $@ $(CHARSET_MACOSXFS_OBJ:.o=.@PICSUFFIX@) \
 		-framework CoreFoundation @SONAMEFLAG@`basename $@`
 
-bin/xml.@SHLIBEXT@: $(XML_OBJ:.o=.@PICSUFFIX@)
-	@echo "Building plugin $@"
-	@$(SHLD) $(LDSHFLAGS) -o $@ $(XML_OBJ:.o=.@PICSUFFIX@) @XML_LIBS@ \
-		@SONAMEFLAG@`basename $@`
-
 bin/audit.@SHLIBEXT@: $(VFS_AUDIT_OBJ:.o=.@PICSUFFIX@)
 	@echo "Building plugin $@"
 	@$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_AUDIT_OBJ:.o=.@PICSUFFIX@) \
diff --git a/source3/configure.in b/source3/configure.in
index e901e065d2..932a902c8f 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3473,48 +3473,6 @@ AC_ARG_WITH(kcm,
   esac ])
 
 AC_MSG_RESULT($with_kcm_support)
-########################################################
-# Compile experimental passdb backends?
-# (pdb_xml, pdb_mysql, pdb_pgsql)
-AC_MSG_CHECKING(whether to build experimental passdb libraries)
-AC_ARG_WITH(expsam,
-[  --with-expsam=<list>    Include experimental passdb libraries (default=no)]
-[                          Valid choices include (comma separated list): ]
-[                              xml, mysql & pgsql],
-[ expsam_pdb_modules=`echo "$withval" | sed 's/,/ /g'`
-  if test "z$expsam_pdb_modules" = "zyes"; then
-    expsam_pdb_modules="xml mysql pgsql"
-  fi
-  AC_MSG_RESULT($expsam_pdb_modules)
-  for i in $expsam_pdb_modules
-  do 
-    case "$i" in
-    xml|all|yes)
-      ## pdb_xml
-	  AM_PATH_XML2([2.0.0],[default_shared_modules="$default_shared_modules pdb_xml"],[AC_MSG_ERROR([Can't find XML libraries while XML support is requested])])
-      CFLAGS="$CFLAGS $XML_CFLAGS"
-      ;;
-    mysql|all|yes)
-      ## pdb_mysql
-	  AM_PATH_MYSQL([default_shared_modules="$default_shared_modules pdb_mysql"],[AC_MSG_ERROR([Can't find MySQL libraries while MySQL support is requested])])
-      CFLAGS="$CFLAGS $MYSQL_CFLAGS"
-      ;;
-     pgsql|all|yes)
-      ## pdb_pgsql
-      AM_PATH_PGSQL([default_shared_modules="$default_shared_modules pdb_pgsql"],[])
-      CFLAGS="$CFLAGS $PGSQL_CFLAGS"
-      ;;
-    no)
-      ;;
-    *)
-      echo "Unknown module name \"$i\"!  Exiting..."
-      exit 1
-      ;;
-    esac
-  done ],
-  AC_MSG_RESULT(no)
-)
-
 #################################################
 # check for automount support
 AC_MSG_CHECKING(whether to use automount)
@@ -5177,19 +5135,6 @@ AC_ARG_WITH(shared-modules,
 	done
 fi ])
 
-###########################################################################
-## contributed pdb_modules
-
-SMB_MODULE(pdb_xml, passdb/pdb_xml.o, "bin/xml.$SHLIBEXT", PDB,
-		  [ PASSDB_LIBS="$PASSDB_LIBS $XML_LIBS" ] )
-SMB_MODULE(pdb_mysql, passdb/pdb_mysql.o, "bin/mysql.$SHLIBEXT", PDB, 
-		   [ PASSDB_LIBS="$PASSDB_LIBS $MYSQL_LIBS" ]	)
-SMB_MODULE(pdb_pgsql, passdb/pdb_pgsql.o, "bin/pgsql.$SHLIBEXT", PDB, 
-		   [ PASSDB_LIBS="$PASSDB_LIBS $PGSQL_LIBS" ]	)
-
-## end of contributed pdb_modules
-###########################################################################
-
 SMB_MODULE(pdb_ldap, passdb/pdb_ldap.o passdb/pdb_nds.o, "bin/ldapsam.$SHLIBEXT", PDB, 
 		   [ PASSDB_LIBS="$PASSDB_LIBS $LDAP_LIBS" ] )
 SMB_MODULE(pdb_smbpasswd, passdb/pdb_smbpasswd.o, "bin/smbpasswd.$SHLIBEXT", PDB)
diff --git a/source3/passdb/pdb_mysql.c b/source3/passdb/pdb_mysql.c
deleted file mode 100644
index 27675a9cd1..0000000000
--- a/source3/passdb/pdb_mysql.c
+++ /dev/null
@@ -1,509 +0,0 @@
-/*
- * MySQL password backend for samba
- * Copyright (C) Jelmer Vernooij 2002-2004
- * 
- * 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 <mysql/mysql.h>
-
-#define CONFIG_HOST_DEFAULT				"localhost"
-#define CONFIG_USER_DEFAULT				"samba"
-#define CONFIG_PASS_DEFAULT				""
-#define CONFIG_PORT_DEFAULT				"3306"
-#define CONFIG_DB_DEFAULT				"samba"
-
-static int mysqlsam_debug_level = DBGC_ALL;
-
-#undef DBGC_CLASS
-#define DBGC_CLASS mysqlsam_debug_level
-
-typedef struct pdb_mysql_data {
-	MYSQL *handle;
-	MYSQL_RES *pwent;
-	const char *location;
-} pdb_mysql_data;
-
-#define SET_DATA(data,methods) { \
-	if(!methods){ \
-		DEBUG(0, ("invalid methods!\n")); \
-			return NT_STATUS_INVALID_PARAMETER; \
-	} \
-	data = (struct pdb_mysql_data *)methods->private_data; \
-		if(!data || !(data->handle)){ \
-			DEBUG(0, ("invalid handle!\n")); \
-				return NT_STATUS_INVALID_HANDLE; \
-		} \
-}
-
-#define config_value( data, name, default_value ) \
-  lp_parm_const_string( GLOBAL_SECTION_SNUM, (data)->location, name, default_value )
-
-static long xatol(const char *d)
-{
-	if(!d) return 0;
-	return atol(d);
-}
-
-static NTSTATUS row_to_sam_account(MYSQL_RES * r, SAM_ACCOUNT * u)
-{
-	MYSQL_ROW row;
-	pstring temp;
-	unsigned int num_fields;
-	DOM_SID sid;
-
-	num_fields = mysql_num_fields(r);
-	row = mysql_fetch_row(r);
-	if (!row)
-		return NT_STATUS_INVALID_PARAMETER;
-
-	pdb_set_logon_time(u, xatol(row[0]), PDB_SET);
-	pdb_set_logoff_time(u, xatol(row[1]), PDB_SET);
-	pdb_set_kickoff_time(u, xatol(row[2]), PDB_SET);
-	pdb_set_pass_last_set_time(u, xatol(row[3]), PDB_SET);
-	pdb_set_pass_can_change_time(u, xatol(row[4]), PDB_SET);
-	pdb_set_pass_must_change_time(u, xatol(row[5]), PDB_SET);
-	pdb_set_username(u, row[6], PDB_SET);
-	pdb_set_domain(u, row[7], PDB_SET);
-	pdb_set_nt_username(u, row[8], PDB_SET);
-	pdb_set_fullname(u, row[9], PDB_SET);
-	pdb_set_homedir(u, row[10], PDB_SET);
-	pdb_set_dir_drive(u, row[11], PDB_SET);
-	pdb_set_logon_script(u, row[12], PDB_SET);
-	pdb_set_profile_path(u, row[13], PDB_SET);
-	pdb_set_acct_desc(u, row[14], PDB_SET);
-	pdb_set_workstations(u, row[15], PDB_SET);
-	pdb_set_unknown_str(u, row[16], PDB_SET);
-	pdb_set_munged_dial(u, row[17], PDB_SET);
-
-	if(!row[18] || !string_to_sid(&sid, row[18])) {
-		DEBUG(0,("No user SID retrieved from database!\n"));
-	} else {
-		pdb_set_user_sid(u, &sid, PDB_SET);
-	}
-
-	if(row[19]) {
-		string_to_sid(&sid, row[19]);
-		pdb_set_group_sid(u, &sid, PDB_SET);
-	}
-
-	if (pdb_gethexpwd(row[20], temp))
-		pdb_set_lanman_passwd(u, temp, PDB_SET);
-	if (pdb_gethexpwd(row[21], temp))
-		pdb_set_nt_passwd(u, temp, PDB_SET);
-
-	/* Only use plaintext password storage when lanman and nt are
-	 * NOT used */
-	if (!row[20] || !row[21])
-		pdb_set_plaintext_passwd(u, row[22]);
-
-	pdb_set_acct_ctrl(u, xatol(row[23]), PDB_SET);
-	pdb_set_logon_divs(u, xatol(row[24]), PDB_SET);
-	pdb_set_hours_len(u, xatol(row[25]), PDB_SET);
-	pdb_set_bad_password_count(u, xatol(row[26]), PDB_SET);
-	pdb_set_logon_count(u, xatol(row[27]), PDB_SET);
-	pdb_set_unknown_6(u, xatol(row[28]), PDB_SET);
-
-	return NT_STATUS_OK;
-}
-
-static NTSTATUS mysqlsam_setsampwent(struct pdb_methods *methods, BOOL update, uint16 acb_mask)
-{
-	struct pdb_mysql_data *data =
-		(struct pdb_mysql_data *) methods->private_data;
-	char *query;
-	int ret;
-
-	if (!data || !(data->handle)) {
-		DEBUG(0, ("invalid handle!\n"));
-		return NT_STATUS_INVALID_HANDLE;
-	}
-
-	query = sql_account_query_select(NULL, data->location, update, SQL_SEARCH_NONE, NULL);
-
-	ret = mysql_query(data->handle, query);
-	talloc_free(query);
-
-	if (ret) {
-		DEBUG(0,
-			   ("Error executing MySQL query %s\n", mysql_error(data->handle)));
-		return NT_STATUS_UNSUCCESSFUL;
-	}
-
-	data->pwent = mysql_store_result(data->handle);
-
-	if (data->pwent == NULL) {
-		DEBUG(0,
-			("Error storing results: %s\n", mysql_error(data->handle)));
-		return NT_STATUS_UNSUCCESSFUL;
-	}
-	
-	DEBUG(5,
-		("mysqlsam_setsampwent succeeded(%llu results)!\n",
-				mysql_num_rows(data->pwent)));
-	
-	return NT_STATUS_OK;
-}
-
-/***************************************************************
-  End enumeration of the passwd list.
- ****************************************************************/
-
-static void mysqlsam_endsampwent(struct pdb_methods *methods)
-{
-	struct pdb_mysql_data *data =
-		(struct pdb_mysql_data *) methods->private_data;
-
-	if (data == NULL) {
-		DEBUG(0, ("invalid handle!\n"));
-		return;
-	}
-
-	if (data->pwent != NULL)
-		mysql_free_result(data->pwent);
-
-	data->pwent = NULL;
-
-	DEBUG(5, ("mysql_endsampwent called\n"));
-}
-
-/*****************************************************************
-  Get one SAM_ACCOUNT from the list (next in line)
- *****************************************************************/
-
-static NTSTATUS mysqlsam_getsampwent(struct pdb_methods *methods, SAM_ACCOUNT * user)
-{
-	struct pdb_mysql_data *data;
-
-	SET_DATA(data, methods);
-
-	if (data->pwent == NULL) {
-		DEBUG(0, ("invalid pwent\n"));
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	return row_to_sam_account(data->pwent, user);
-}
-
-static NTSTATUS mysqlsam_select_by_field(struct pdb_methods * methods, SAM_ACCOUNT * user,
-						 enum sql_search_field field, const char *sname)
-{
-	char *esc_sname;
-	char *query;
-	NTSTATUS ret;
-	MYSQL_RES *res;
-	int mysql_ret;
-	struct pdb_mysql_data *data;
-	char *tmp_sname;
-	TALLOC_CTX *mem_ctx = talloc_init("mysqlsam_select_by_field");
-
-	SET_DATA(data, methods);
-
-	esc_sname = talloc_array(mem_ctx, char, strlen(sname) * 2 + 1);
-	if (!esc_sname) {
-		talloc_free(mem_ctx);
-		return NT_STATUS_NO_MEMORY; 
-	}
-
-	tmp_sname = talloc_strdup(mem_ctx, sname);
-	
-	/* Escape sname */
-	mysql_real_escape_string(data->handle, esc_sname, tmp_sname,
-							 strlen(tmp_sname));
-
-	talloc_free(tmp_sname);
-
-	if (user == NULL) {
-		DEBUG(0, ("pdb_getsampwnam: SAM_ACCOUNT is NULL.\n"));
-		talloc_free(mem_ctx);
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	query = sql_account_query_select(mem_ctx, data->location, True, field, esc_sname);
-
-	talloc_free(esc_sname);
-
-	DEBUG(5, ("Executing query %s\n", query));
-	
-	mysql_ret = mysql_query(data->handle, query);
-	
-	talloc_free(query);
-	
-	if (mysql_ret) {
-		DEBUG(0,
-			("Error while executing MySQL query %s\n", 
-				mysql_error(data->handle)));
-		talloc_free(mem_ctx);
-		return NT_STATUS_UNSUCCESSFUL;
-	}
-	
-	res = mysql_store_result(data->handle);
-	if (res == NULL) {
-		DEBUG(0,
-			("Error storing results: %s\n", mysql_error(data->handle)));
-		talloc_free(mem_ctx);
-		return NT_STATUS_UNSUCCESSFUL;
-	}
-	
-	ret = row_to_sam_account(res, user);
-	mysql_free_result(res);
-	talloc_free(mem_ctx);
-
-	return ret;
-}
-
-/******************************************************************
-  Lookup a name in the SAM database
- ******************************************************************/
-
-static NTSTATUS mysqlsam_getsampwnam(struct pdb_methods *methods, SAM_ACCOUNT * user,
-					 const char *sname)
-{
-	struct pdb_mysql_data *data;
-
-	SET_DATA(data, methods);
-
-	if (!sname) {
-		DEBUG(0, ("invalid name specified"));
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	return mysqlsam_select_by_field(methods, user,
-			SQL_SEARCH_USER_NAME, sname);
-}
-
-
-/***************************************************************************
-  Search by sid
- **************************************************************************/
-
-static NTSTATUS mysqlsam_getsampwsid(struct pdb_methods *methods, SAM_ACCOUNT * user,
-					 const DOM_SID * sid)
-{
-	struct pdb_mysql_data *data;
-	fstring sid_str;
-
-	SET_DATA(data, methods);
-
-	sid_to_string(sid_str, sid);
-
-	return mysqlsam_select_by_field(methods, user, SQL_SEARCH_USER_SID, sid_str);
-}
-
-/***************************************************************************
-  Delete a SAM_ACCOUNT
- ****************************************************************************/
-
-static NTSTATUS mysqlsam_delete_sam_account(struct pdb_methods *methods,
-							SAM_ACCOUNT * sam_pass)
-{
-	const char *sname = pdb_get_username(sam_pass);
-	char *esc;
-	char *query;
-	int ret;
-	struct pdb_mysql_data *data;
-	char *tmp_sname;
-	TALLOC_CTX *mem_ctx;
-	SET_DATA(data, methods);
-
-	if (!methods) {
-		DEBUG(0, ("invalid methods!\n"));
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	data = (struct pdb_mysql_data *) methods->private_data;
-	if (!data || !(data->handle)) {
-		DEBUG(0, ("invalid handle!\n"));
-		return NT_STATUS_INVALID_HANDLE;
-	}
-
-	if (!sname) {
-		DEBUG(0, ("invalid name specified\n"));
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	mem_ctx = talloc_init("mysqlsam_delete_sam_account");
-	
-	/* Escape sname */
-	esc = talloc_array(mem_ctx, char, strlen(sname) * 2 + 1);
-	if (!esc) {
-		DEBUG(0, ("Can't allocate memory to store escaped name\n"));
-		return NT_STATUS_NO_MEMORY;
-	}
-	
-	tmp_sname = talloc_strdup(mem_ctx, sname);
-	
-	mysql_real_escape_string(data->handle, esc, tmp_sname,
-							 strlen(tmp_sname));
-
-	talloc_free(tmp_sname);
-
-	query = sql_account_query_delete(mem_ctx, data->location, esc);
-
-	talloc_free(esc);
-
-	ret = mysql_query(data->handle, query);
-
-	talloc_free(query);
-
-	if (ret) {
-		DEBUG(0,
-			  ("Error while executing query: %s\n",
-			   mysql_error(data->handle)));
-		talloc_free(mem_ctx);
-		return NT_STATUS_UNSUCCESSFUL;
-	}
-
-	DEBUG(5, ("User '%s' deleted\n", sname));
-	talloc_free(mem_ctx);
-	return NT_STATUS_OK;
-}
-
-static NTSTATUS mysqlsam_replace_sam_account(struct pdb_methods *methods,
-							 const SAM_ACCOUNT * newpwd, char isupdate)
-{
-	struct pdb_mysql_data *data;
-	char *query;
-
-	if (!methods) {
-		DEBUG(0, ("invalid methods!\n"));
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	data = (struct pdb_mysql_data *) methods->private_data;
-
-	if (data == NULL || data->handle == NULL) {
-		DEBUG(0, ("invalid handle!\n"));
-		return NT_STATUS_INVALID_HANDLE;
-	}
-
-	query = sql_account_query_update(NULL, data->location, newpwd, isupdate);
- 	if ( query == NULL ) /* Nothing to update. */
- 		return NT_STATUS_OK;
-	
-	/* Execute the query */
-	if (mysql_query(data->handle, query)) {
-		DEBUG(0,
-			  ("Error executing %s, %s\n", query,
-			   mysql_error(data->handle)));
-		talloc_free(query);
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	talloc_free(query);
-
-	return NT_STATUS_OK;
-}
-
-static NTSTATUS mysqlsam_add_sam_account(struct pdb_methods *methods, SAM_ACCOUNT * newpwd)
-{
-	return mysqlsam_replace_sam_account(methods, newpwd, 0);
-}
-
-static NTSTATUS mysqlsam_update_sam_account(struct pdb_methods *methods,
-							SAM_ACCOUNT * newpwd)
-{
-	return mysqlsam_replace_sam_account(methods, newpwd, 1);
-}
-
-static NTSTATUS mysqlsam_init(struct pdb_context * pdb_context, struct pdb_methods ** pdb_method,
-		 const char *location)
-{
-	NTSTATUS nt_status;
-	struct pdb_mysql_data *data;
-
-	mysqlsam_debug_level = debug_add_class("mysqlsam");
-	if (mysqlsam_debug_level == -1) {
-		mysqlsam_debug_level = DBGC_ALL;
-		DEBUG(0,
-			  ("mysqlsam: Couldn't register custom debugging class!\n"));
-	}
-
-
-	if (!pdb_context) {
-		DEBUG(0, ("invalid pdb_methods specified\n"));
-		return NT_STATUS_UNSUCCESSFUL;
-	}
-
-	if (!NT_STATUS_IS_OK
-		(nt_status = make_pdb_methods(pdb_context->mem_ctx, pdb_method))) {
-		return nt_status;
-	}
-
-	(*pdb_method)->name = "mysqlsam";
-
-	(*pdb_method)->setsampwent = mysqlsam_setsampwent;
-	(*pdb_method)->endsampwent = mysqlsam_endsampwent;
-	(*pdb_method)->getsampwent = mysqlsam_getsampwent;
-	(*pdb_method)->getsampwnam = mysqlsam_getsampwnam;
-	(*pdb_method)->getsampwsid = mysqlsam_getsampwsid;
-	(*pdb_method)->add_sam_account = mysqlsam_add_sam_account;
-	(*pdb_method)->update_sam_account = mysqlsam_update_sam_account;
-	(*pdb_method)->delete_sam_account = mysqlsam_delete_sam_account;
-
-	data = talloc(pdb_context->mem_ctx, struct pdb_mysql_data);
-	(*pdb_method)->private_data = data;
-	data->handle = NULL;
-	data->pwent = NULL;
-
-	if (!location) {
-		DEBUG(0, ("No identifier specified. Check the Samba HOWTO Collection for details\n"));
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	data->location = smb_xstrdup(location);
-
-	DEBUG(1,
-		  ("Connecting to database server, host: %s, user: %s, database: %s, port: %ld\n",
-		   config_value(data, "mysql host", CONFIG_HOST_DEFAULT),
-		   config_value(data, "mysql user", CONFIG_USER_DEFAULT),
-		   config_value(data, "mysql database", CONFIG_DB_DEFAULT),
-		   xatol(config_value(data, "mysql port", CONFIG_PORT_DEFAULT))));
-
-	/* Do the mysql initialization */
-	data->handle = mysql_init(NULL);
-	if (!data->handle) {
-		DEBUG(0, ("Failed to connect to server\n"));
-		return NT_STATUS_UNSUCCESSFUL;
-	}
-
-	if(!sql_account_config_valid(data->location)) {
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-	
-	/* Process correct entry in $HOME/.my.conf */
-	if (!mysql_real_connect(data->handle,
-			config_value(data, "mysql host", CONFIG_HOST_DEFAULT),
-			config_value(data, "mysql user", CONFIG_USER_DEFAULT),
-			config_value(data, "mysql password", CONFIG_PASS_DEFAULT),
-			config_value(data, "mysql database", CONFIG_DB_DEFAULT),
-			xatol(config_value (data, "mysql port", CONFIG_PORT_DEFAULT)), 
-			NULL, 0)) {
-		DEBUG(0,
-			  ("Failed to connect to mysql database: error: %s\n",
-			   mysql_error(data->handle)));
-		return NT_STATUS_UNSUCCESSFUL;
-	}
-	
-	DEBUG(5, ("Connected to mysql db\n"));
-
-	return NT_STATUS_OK;
-}
-
-NTSTATUS pdb_mysql_init(void) 
-{
-	return smb_register_passdb(PASSDB_INTERFACE_VERSION, "mysql", mysqlsam_init);
-}
diff --git a/source3/passdb/pdb_pgsql.c b/source3/passdb/pdb_pgsql.c
deleted file mode 100644
index 196fe8f855..0000000000
--- a/source3/passdb/pdb_pgsql.c
+++ /dev/null
@@ -1,605 +0,0 @@
-/*
- * PostgresSQL password backend for samba
- * Copyright (C) Hamish Friedlander 2003
- * Copyright (C) Jelmer Vernooij 2004
- * 
- * 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 <libpq-fe.h>
-
-#define CONFIG_HOST_DEFAULT				"localhost"
-#define CONFIG_USER_DEFAULT				"samba"
-#define CONFIG_PASS_DEFAULT				""
-#define CONFIG_PORT_DEFAULT				"5432"
-#define CONFIG_DB_DEFAULT				"samba"
-
-/* handles for doing db transactions */
-typedef struct pdb_pgsql_data {
-  PGconn     *master_handle ;
-  PGconn     *handle ;
-
-  PGresult   *pwent  ;
-  long        currow ;
-  const char *db     ;
-  const char *host   ;
-  const char *port   ;
-  const char *user   ;
-  const char *pass   ;
-
-  const char *location ;
-} pdb_pgsql_data ;
-
-struct pdb_context *the_pdb_context;
-
-#define SET_DATA(data,methods) { \
-	if(!methods){ \
-		DEBUG(0, ("invalid methods!\n")); \
-			return NT_STATUS_INVALID_PARAMETER; \
-	} \
-	data = (struct pdb_pgsql_data *)methods->private_data; \
-}
-
-
-#define SET_DATA_QUIET(data,methods) { \
-	if(!methods){ \
-		DEBUG(0, ("invalid methods!\n")); \
-			return ; \
-	} \
-	data = (struct pdb_pgsql_data *)methods->private_data; \
-}
-
-
-#define config_value( data, name, default_value ) \
-  lp_parm_const_string( GLOBAL_SECTION_SNUM, (data)->location, name, default_value )
-
-static PGconn *pgsqlsam_connect( struct pdb_pgsql_data *data )
-{
-  PGconn *handle;
-  
-  DEBUG
-  (
-    1, 
-    (
-      "Connecting to database server, host: %s, user: %s, password: XXXXXX, database: %s, port: %s\n",
-      data->host, data->user, data->db, data->port
-    )
-  ) ;
-  
-  /* Do the pgsql initialization */
-  handle = PQsetdbLogin( 
-                         data->host,
-                         data->port,
-                         NULL,
-                         NULL,
-                         data->db,
-                         data->user,
-                         data->pass
-                       ) ;
-  
-  if ( handle != NULL && PQstatus( handle ) != CONNECTION_OK )
-  {
-    DEBUG( 0, ("Failed to connect to pgsql database: error: %s\n",
-		(handle != NULL ? PQerrorMessage( handle ) : "")) ) ;
-    return NULL;
-  }
-  
-  DEBUG( 5, ("Connected to pgsql database\n") ) ;
-  return handle;
-}
-
-/* The assumption here is that the master process will get connection 0,
- * and all the renaining ones just one connection for their etire life span.
- */
-static PGconn *choose_connection( struct pdb_pgsql_data *data )
-{
-  if ( data->master_handle == NULL )
-  {
-    data->master_handle = pgsqlsam_connect( data );
-    return data->master_handle ;
-  }
-
-  /* Master connection != NULL, so we are just another process. */
-
-  /* If we didn't connect yet, do it now. */
-  if ( data->handle == NULL )
-  {
-    data->handle = pgsqlsam_connect( data );
-  }
-
-  return data->handle ;
-}
-
-static long PQgetlong( PGresult *r, long row, long col )
-{
-  if ( PQgetisnull( r, row, col ) ) return 0 ;
-  
-  return atol( PQgetvalue( r, row,  col ) ) ;
-}
-
-static NTSTATUS row_to_sam_account ( PGresult *r, long row, SAM_ACCOUNT *u )
-{
-  pstring temp ;
-  DOM_SID sid ;
-  unsigned char *hours ;
-  size_t hours_len = 0 ;
-  
-  if ( row >= PQntuples( r ) ) return NT_STATUS_INVALID_PARAMETER ;
-
-  pdb_set_logon_time           ( u, PQgetlong ( r, row,  0 ), PDB_SET ) ;
-  pdb_set_logoff_time          ( u, PQgetlong ( r, row,  1 ), PDB_SET ) ;
-  pdb_set_kickoff_time         ( u, PQgetlong ( r, row,  2 ), PDB_SET ) ;
-  pdb_set_pass_last_set_time   ( u, PQgetlong ( r, row,  3 ), PDB_SET ) ;
-  pdb_set_pass_can_change_time ( u, PQgetlong ( r, row,  4 ), PDB_SET ) ;
-  pdb_set_pass_must_change_time( u, PQgetlong ( r, row,  5 ), PDB_SET ) ;
-  pdb_set_username             ( u, PQgetvalue( r, row,  6 ), PDB_SET ) ;
-  pdb_set_domain               ( u, PQgetvalue( r, row,  7 ), PDB_SET ) ;
-  pdb_set_nt_username          ( u, PQgetvalue( r, row,  8 ), PDB_SET ) ;
-  pdb_set_fullname             ( u, PQgetvalue( r, row,  9 ), PDB_SET ) ;
-  pdb_set_homedir              ( u, PQgetvalue( r, row, 10 ), PDB_SET ) ;
-  pdb_set_dir_drive            ( u, PQgetvalue( r, row, 11 ), PDB_SET ) ;
-  pdb_set_logon_script         ( u, PQgetvalue( r, row, 12 ), PDB_SET ) ;
-  pdb_set_profile_path         ( u, PQgetvalue( r, row, 13 ), PDB_SET ) ;
-  pdb_set_acct_desc            ( u, PQgetvalue( r, row, 14 ), PDB_SET ) ;
-  pdb_set_workstations         ( u, PQgetvalue( r, row, 15 ), PDB_SET ) ;
-  pdb_set_unknown_str          ( u, PQgetvalue( r, row, 16 ), PDB_SET ) ;
-  pdb_set_munged_dial          ( u, PQgetvalue( r, row, 17 ), PDB_SET ) ;
-  
-  pdb_set_acct_ctrl            ( u, PQgetlong ( r, row, 23 ), PDB_SET ) ;
-  pdb_set_logon_divs           ( u, PQgetlong ( r, row, 24 ), PDB_SET ) ;
-  pdb_set_hours_len            ( u, PQgetlong ( r, row, 25 ), PDB_SET ) ;
-  pdb_set_bad_password_count   ( u, PQgetlong ( r, row, 26 ), PDB_SET ) ;
-  pdb_set_logon_count          ( u, PQgetlong ( r, row, 27 ), PDB_SET ) ;
-  pdb_set_unknown_6            ( u, PQgetlong ( r, row, 28 ), PDB_SET ) ;
-  hours = PQgetvalue ( r, row,  29 );
-  if ( hours != NULL ) {
-    hours = PQunescapeBytea ( hours, &hours_len ) ;
-    if ( hours_len > 0 )
-       pdb_set_hours            ( u, hours, PDB_SET ) ;
-    free ( hours );
-  }
-  
-  if ( !PQgetisnull( r, row, 18 ) ) {
-    string_to_sid( &sid, PQgetvalue( r, row, 18 ) ) ;
-    pdb_set_user_sid ( u, &sid, PDB_SET ) ;
-  }
-
-  if ( !PQgetisnull( r, row, 19 ) ) {
-    string_to_sid( &sid, PQgetvalue( r, row, 19 ) ) ;
-    pdb_set_group_sid( u, &sid, PDB_SET ) ;
-  }
-  
-  if ( pdb_gethexpwd( PQgetvalue( r, row, 20 ), temp ), PDB_SET ) pdb_set_lanman_passwd( u, temp, PDB_SET ) ;
-  if ( pdb_gethexpwd( PQgetvalue( r, row, 21 ), temp ), PDB_SET ) pdb_set_nt_passwd    ( u, temp, PDB_SET ) ;
-  
-  /* Only use plaintext password storage when lanman and nt are NOT used */
-  if ( PQgetisnull( r, row, 20 ) || PQgetisnull( r, row, 21 ) ) pdb_set_plaintext_passwd( u, PQgetvalue( r, row, 22 ) ) ;
-  
-  return NT_STATUS_OK ;
-}
-
-static NTSTATUS pgsqlsam_setsampwent(struct pdb_methods *methods, BOOL update, uint16 acb_mask)
-{
-  struct pdb_pgsql_data *data ;
-  PGconn *handle ;
-  char *query ;
-  NTSTATUS retval ;
-  
-  SET_DATA( data, methods ) ;
-
-  /* Connect to the DB. */
-  handle = choose_connection( data );
-  if ( handle == NULL )
-    return NT_STATUS_UNSUCCESSFUL ;
-  DEBUG( 5, ("CONNECTING pgsqlsam_setsampwent\n") ) ;
-  
-  query = sql_account_query_select(NULL, data->location, update, SQL_SEARCH_NONE, NULL);
-  
-  /* Do it */
-  DEBUG( 5, ("Executing query %s\n", query) ) ;
-  data->pwent  = PQexec( handle, query ) ;
-  data->currow = 0 ;
-  
-  /* Result? */
-  if ( data->pwent == NULL )
-  {
-    DEBUG( 0, ("Error executing %s, %s\n", query, PQerrorMessage( handle ) ) ) ;
-    retval = NT_STATUS_UNSUCCESSFUL ;
-  }
-  else if ( PQresultStatus( data->pwent ) != PGRES_TUPLES_OK )
-  {
-    DEBUG( 0, ("Error executing %s, %s\n", query, PQresultErrorMessage( data->pwent ) ) ) ;
-    retval = NT_STATUS_UNSUCCESSFUL ;
-  }
-  else
-  {
-    DEBUG( 5, ("pgsqlsam_setsampwent succeeded(%d results)!\n", PQntuples(data->pwent)) ) ;
-    retval = NT_STATUS_OK ;
-  }
-
-  talloc_free(query);
-  return retval ;
-}
-
-/***************************************************************
-  End enumeration of the passwd list.
- ****************************************************************/
-
-static void pgsqlsam_endsampwent(struct pdb_methods *methods)
-{
-  struct pdb_pgsql_data *data ; 
-    
-  SET_DATA_QUIET( data, methods ) ;
-  
-  if (data->pwent != NULL)
-  {
-    PQclear( data->pwent ) ;
-  }
-  
-  data->pwent  = NULL ;
-  data->currow = 0 ;
-  
-  DEBUG( 5, ("pgsql_endsampwent called\n") ) ;
-}
-
-/*****************************************************************
-  Get one SAM_ACCOUNT from the list (next in line)
- *****************************************************************/
-
-static NTSTATUS pgsqlsam_getsampwent( struct pdb_methods *methods, SAM_ACCOUNT *user )
-{
-  struct pdb_pgsql_data *data;
-  NTSTATUS retval ;
-  
-  SET_DATA( data, methods ) ;
-  
-  if ( data->pwent == NULL )
-  {
-    DEBUG( 0, ("invalid pwent\n") ) ;
-    return NT_STATUS_INVALID_PARAMETER ;
-  }
-  
-  retval = row_to_sam_account( data->pwent, data->currow, user ) ;
-  data->currow++ ;
-  
-  return retval ;
-}
-
-static NTSTATUS pgsqlsam_select_by_field ( struct pdb_methods *methods, SAM_ACCOUNT *user, enum sql_search_field field, const char *sname )
-{
-  struct pdb_pgsql_data *data ;
-  PGconn *handle ;
-  
-  char *esc ;
-  char *query ;
-  
-  PGresult *result ;
-  NTSTATUS retval ;
-
-  SET_DATA(data, methods);
-
-  if ( user == NULL )
-  {
-    DEBUG( 0, ("pdb_getsampwnam: SAM_ACCOUNT is NULL.\n") ) ;
-    return NT_STATUS_INVALID_PARAMETER;
-  }
-  
-  DEBUG( 5, ("pgsqlsam_select_by_field: getting data where %d = %s(nonescaped)\n", field, sname) ) ;
-  
-  /* Escape sname */
-  esc = talloc_array(NULL, char, strlen(sname) * 2 + 1);
-  if ( !esc )
-  {
-    DEBUG(0, ("Can't allocate memory to store escaped name\n"));
-    return NT_STATUS_NO_MEMORY; 
-  }
-  
-  //tmp_sname = smb_xstrdup(sname);
-  PQescapeString( esc, sname, strlen(sname) ) ;
-
-  /* Connect to the DB. */
-  handle = choose_connection( data );
-  if ( handle == NULL )
-    return NT_STATUS_UNSUCCESSFUL ;
-  
-  query = sql_account_query_select(NULL, data->location, True, field, esc);
-  
-  /* Do it */
-  DEBUG( 5, ("Executing query %s\n", query) ) ;
-  result = PQexec( handle, query ) ;
-  
-  /* Result? */
-  if ( result == NULL )
-  {
-    DEBUG( 0, ("Error executing %s, %s\n", query, PQerrorMessage( handle ) ) ) ;
-    retval = NT_STATUS_UNSUCCESSFUL ;
-  }
-  else if ( PQresultStatus( result ) != PGRES_TUPLES_OK )
-  {
-    DEBUG( 0, ("Error executing %s, %s\n", query, PQresultErrorMessage( result ) ) ) ;
-    retval = NT_STATUS_UNSUCCESSFUL ;
-  }
-  else
-  {
-    retval = row_to_sam_account( result, 0, user ) ;
-  }
-  
-  talloc_free( esc   ) ;
-  talloc_free( query ) ;
- 
-  if ( result != NULL )
-    PQclear( result ) ;
-  
-  return retval ;
-}
-
-/******************************************************************
-  Lookup a name in the SAM database
- ******************************************************************/
-
-static NTSTATUS pgsqlsam_getsampwnam ( struct pdb_methods *methods, SAM_ACCOUNT *user, const char *sname )
-{
-  struct pdb_pgsql_data *data;
-  size_t i, l;
-  char *lowercasename;
-  NTSTATUS result;
-  
-  SET_DATA(data, methods);
-  
-  if ( !sname )
-  {
-    DEBUG( 0, ("invalid name specified") ) ;
-    return NT_STATUS_INVALID_PARAMETER;
-  }
-
-  lowercasename = smb_xstrdup(sname);
-  l = strlen(lowercasename);
-  for(i = 0; i < l; i++) {
-    lowercasename[i] = tolower_ascii(lowercasename[i]);
-  }
-  
-  result = pgsqlsam_select_by_field( methods, user, SQL_SEARCH_USER_NAME, lowercasename ) ;
-
-  SAFE_FREE( lowercasename ) ;
-
-  return result;
-}
-
-
-/***************************************************************************
-  Search by sid
- **************************************************************************/
-
-static NTSTATUS pgsqlsam_getsampwsid ( struct pdb_methods *methods, SAM_ACCOUNT *user, const DOM_SID *sid )
-{
-  struct pdb_pgsql_data *data;
-  fstring sid_str;
-  
-  SET_DATA( data, methods ) ;
-  
-  sid_to_string( sid_str, sid ) ;
-  
-  return pgsqlsam_select_by_field( methods, user, SQL_SEARCH_USER_SID, sid_str ) ;
-}
-
-/***************************************************************************
-  Delete a SAM_ACCOUNT
- ****************************************************************************/
-
-static NTSTATUS pgsqlsam_delete_sam_account( struct pdb_methods *methods, SAM_ACCOUNT *sam_pass )
-{
-  struct pdb_pgsql_data *data ;
-  PGconn *handle ;
-  
-  const char *sname = pdb_get_username( sam_pass ) ;
-  char *esc ;
-  char *query ;
-  
-  PGresult *result ;
-  NTSTATUS retval ;
-  
-  SET_DATA(data, methods);
-  
-  if ( !sname )
-  {
-    DEBUG( 0, ("invalid name specified\n") ) ;
-    return NT_STATUS_INVALID_PARAMETER ;
-  }
-  
-  /* Escape sname */
-  esc = talloc_array(NULL, char, strlen(sname) * 2 + 1);
-  if ( !esc )
-  {
-    DEBUG(0, ("Can't allocate memory to store escaped name\n"));
-    return NT_STATUS_NO_MEMORY;
-  }
-  
-  PQescapeString( esc, sname, strlen(sname) ) ;
-
-  /* Connect to the DB. */
-  handle = choose_connection( data );
-  if ( handle == NULL )
-    return NT_STATUS_UNSUCCESSFUL ;
-  
-  query = sql_account_query_delete(NULL, data->location, esc);
-  
-  /* Do it */
-  result = PQexec( handle, query ) ;
-  
-  if ( result == NULL )
-  {
-    DEBUG( 0, ("Error executing %s, %s\n", query, PQerrorMessage( handle ) ) ) ;
-    retval = NT_STATUS_UNSUCCESSFUL ;
-  }
-  else if ( PQresultStatus( result ) != PGRES_COMMAND_OK )
-  {
-    DEBUG( 0, ("Error executing %s, %s\n", query, PQresultErrorMessage( result ) ) ) ;
-    retval = NT_STATUS_UNSUCCESSFUL ;
-  }
-  else
-  {
-    DEBUG( 5, ("User '%s' deleted\n", sname) ) ;
-    retval = NT_STATUS_OK ;
-  }
-  
-  if ( result != NULL )
-    PQclear( result ) ;
-  talloc_free( esc ) ;
-  talloc_free( query ) ;
-  
-  return retval ;
-}
-
-static NTSTATUS pgsqlsam_replace_sam_account( struct pdb_methods *methods, const SAM_ACCOUNT *newpwd, char isupdate )
-{
-  struct pdb_pgsql_data *data ;
-  PGconn *handle ;
-  char *query;
-  PGresult *result ;
-  NTSTATUS retval ;
-  
-  if ( !methods )
-  {
-    DEBUG( 0, ("invalid methods!\n") ) ;
-    return NT_STATUS_INVALID_PARAMETER ;
-  }
-  
-  data = (struct pdb_pgsql_data *) methods->private_data ;
-  
-  if ( data == NULL || handle == NULL )
-  {
-    DEBUG( 0, ("invalid handle!\n") ) ;
-    return NT_STATUS_INVALID_HANDLE ;
-  }
-
-  query = sql_account_query_update(NULL, data->location, newpwd, isupdate);
-  if ( query == NULL ) /* Nothing to update. */
-    return NT_STATUS_OK;
-
-  /* Connect to the DB. */
-  handle = choose_connection( data );
-  if ( handle == NULL )
-    return NT_STATUS_UNSUCCESSFUL ;
-
-  result = PQexec( handle, query ) ;
-  
-  /* Execute the query */
-  if ( result == NULL )
-  {
-    DEBUG( 0, ("Error executing %s, %s\n", query, PQerrorMessage( handle ) ) ) ;
-    retval = NT_STATUS_INVALID_PARAMETER;
-  }
-  else if ( PQresultStatus( result ) != PGRES_COMMAND_OK )
-  {
-    DEBUG( 0, ("Error executing %s, %s\n", query, PQresultErrorMessage( result ) ) ) ;
-    retval = NT_STATUS_INVALID_PARAMETER;
-  }
-  else
-  {
-    retval = NT_STATUS_OK;
-  }
-  if ( result != NULL )
-    PQclear( result ) ;
-  talloc_free(query);
-  
-  return retval;
-}
-
-static NTSTATUS pgsqlsam_add_sam_account ( struct pdb_methods *methods, SAM_ACCOUNT *newpwd )
-{
-  return pgsqlsam_replace_sam_account( methods, newpwd, 0 ) ;
-}
-
-static NTSTATUS pgsqlsam_update_sam_account ( struct pdb_methods *methods, SAM_ACCOUNT *newpwd )
-{
-  return pgsqlsam_replace_sam_account( methods, newpwd, 1 ) ;
-}
-
-static NTSTATUS pgsqlsam_init ( struct pdb_context *pdb_context, struct pdb_methods **pdb_method, const char *location )
-{
-  NTSTATUS nt_status ;
-  struct pdb_pgsql_data *data ;
-  
-  if ( !pdb_context )
-  {
-    DEBUG( 0, ("invalid pdb_methods specified\n") ) ;
-    return NT_STATUS_UNSUCCESSFUL;
-  }
-  
-  the_pdb_context = pdb_context;
-
-  if (!NT_STATUS_IS_OK
-    (nt_status = make_pdb_methods(pdb_context->mem_ctx, pdb_method))) {
-    return nt_status;
-  }
-  
-  (*pdb_method)->name               = "pgsqlsam" ;
-  
-  (*pdb_method)->setsampwent        = pgsqlsam_setsampwent ;
-  (*pdb_method)->endsampwent        = pgsqlsam_endsampwent ;
-  (*pdb_method)->getsampwent        = pgsqlsam_getsampwent ;
-  (*pdb_method)->getsampwnam        = pgsqlsam_getsampwnam ;
-  (*pdb_method)->getsampwsid        = pgsqlsam_getsampwsid ;
-  (*pdb_method)->add_sam_account    = pgsqlsam_add_sam_account ;
-  (*pdb_method)->update_sam_account = pgsqlsam_update_sam_account ;
-  (*pdb_method)->delete_sam_account = pgsqlsam_delete_sam_account ;
-  
-  data = talloc( pdb_context->mem_ctx, struct pdb_pgsql_data ) ;
-  (*pdb_method)->private_data = data ;
-
-  data->master_handle = NULL;
-  data->handle = NULL;
-  data->pwent  = NULL ;
-
-  if ( !location )
-  {
-    DEBUG( 0, ("No identifier specified. Check the Samba HOWTO Collection for details\n") ) ;
-    return NT_STATUS_INVALID_PARAMETER;
-  }
-
-  data->location = smb_xstrdup( location ) ;
-
-  if(!sql_account_config_valid(data->location)) {
-          return NT_STATUS_INVALID_PARAMETER;
-  }
-
-  DEBUG
-  (
-    1,
-    (
-	"Database server parameters: host: %s, user: %s, password: XXXX, database: %s, port: %s\n",
-	config_value( data, "pgsql host"    , CONFIG_HOST_DEFAULT ),
-	config_value( data, "pgsql user"    , CONFIG_USER_DEFAULT ),
-	config_value( data, "pgsql database", CONFIG_DB_DEFAULT   ),
-	config_value( data, "pgsql port"    , CONFIG_PORT_DEFAULT )
-    )
-  ) ;
-
-  /* Save the parameters. */
-  data->db   = config_value( data, "pgsql database", CONFIG_DB_DEFAULT   );
-  data->host = config_value( data, "pgsql host"    , CONFIG_HOST_DEFAULT );
-  data->port = config_value( data, "pgsql port"    , CONFIG_PORT_DEFAULT );
-  data->user = config_value( data, "pgsql user"    , CONFIG_USER_DEFAULT );
-  data->pass = config_value( data, "pgsql password", CONFIG_PASS_DEFAULT );
-
-  DEBUG( 5, ("Pgsql module intialized\n") ) ;
-  return NT_STATUS_OK;
-}
-
-NTSTATUS pdb_pgsql_init(void) 
-{
-  return smb_register_passdb( PASSDB_INTERFACE_VERSION, "pgsql", pgsqlsam_init ) ;
-}
diff --git a/source3/passdb/pdb_sql.c b/source3/passdb/pdb_sql.c
deleted file mode 100644
index f4f6e0112a..0000000000
--- a/source3/passdb/pdb_sql.c
+++ /dev/null
@@ -1,571 +0,0 @@
-/*
- * Common PDB SQL backend functions
- * Copyright (C) Jelmer Vernooij 2003-2004
- * 
- * 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"
-
-#define CONFIG_TABLE_DEFAULT				"user"
-#define CONFIG_LOGON_TIME_DEFAULT			"logon_time"
-#define CONFIG_LOGOFF_TIME_DEFAULT			"logoff_time"
-#define CONFIG_KICKOFF_TIME_DEFAULT			"kickoff_time"
-#define CONFIG_PASS_LAST_SET_TIME_DEFAULT		"pass_last_set_time"
-#define CONFIG_PASS_CAN_CHANGE_TIME_DEFAULT		"pass_can_change_time"
-#define CONFIG_PASS_MUST_CHANGE_TIME_DEFAULT 		"pass_must_change_time"
-#define CONFIG_USERNAME_DEFAULT 			"username"
-#define CONFIG_DOMAIN_DEFAULT				"domain"
-#define CONFIG_NT_USERNAME_DEFAULT  			"nt_username"
-#define CONFIG_FULLNAME_DEFAULT				"nt_fullname"
-#define CONFIG_HOME_DIR_DEFAULT				"home_dir"
-#define CONFIG_DIR_DRIVE_DEFAULT			"dir_drive"
-#define CONFIG_LOGON_SCRIPT_DEFAULT			"logon_script"
-#define CONFIG_PROFILE_PATH_DEFAULT			"profile_path"
-#define CONFIG_ACCT_DESC_DEFAULT			"acct_desc"
-#define CONFIG_WORKSTATIONS_DEFAULT			"workstations"
-#define CONFIG_UNKNOWN_STR_DEFAULT			"unknown_str"
-#define CONFIG_MUNGED_DIAL_DEFAULT			"munged_dial"
-#define CONFIG_USER_SID_DEFAULT				"user_sid"
-#define CONFIG_GROUP_SID_DEFAULT			"group_sid"
-#define CONFIG_LM_PW_DEFAULT				"lm_pw"
-#define CONFIG_NT_PW_DEFAULT				"nt_pw"
-#define CONFIG_PLAIN_PW_DEFAULT				"NULL"
-#define CONFIG_ACCT_CTRL_DEFAULT			"acct_ctrl"
-#define CONFIG_LOGON_DIVS_DEFAULT			"logon_divs"
-#define CONFIG_HOURS_LEN_DEFAULT			"hours_len"
-#define CONFIG_BAD_PASSWORD_COUNT_DEFAULT		"bad_password_count"
-#define CONFIG_LOGON_COUNT_DEFAULT			"logon_count"
-#define CONFIG_UNKNOWN_6_DEFAULT			"unknown_6"
-#define CONFIG_LOGON_HOURS				"logon_hours"
-
-/* Used to construct insert and update queries */
-
-typedef struct pdb_sql_query {
-	char update;
-	char *part1;
-	char *part2;
-} pdb_sql_query;
-
-static void pdb_sql_int_field(struct pdb_sql_query *q, const char *name, int value)
-{
-	if (!name || strchr(name, '\''))
-		return;                 /* This field shouldn't be set by us */
-
-	if (q->update) {
-		q->part1 =
-			talloc_asprintf_append(q->part1,
-								   "%s = %d,", name, value);
-	} else {
-		q->part1 =
-			talloc_asprintf_append(q->part1, "%s,", name);
-		q->part2 =
-			talloc_asprintf_append(q->part2, "%d,", value);
-	}
-}
-
-char *sql_escape_string(TALLOC_CTX *mem_ctx, const char *unesc)
-{
-	char *esc = talloc_array(mem_ctx, char, strlen(unesc) * 2 + 3);
-	size_t pos_unesc = 0, pos_esc = 0;
-
-	for(pos_unesc = 0; unesc[pos_unesc]; pos_unesc++) {
-		switch(unesc[pos_unesc]) {
-		case '\\':
-		case '\'':
-		case '"':
-			esc[pos_esc] = '\\'; pos_esc++;
-		default:
-			esc[pos_esc] = unesc[pos_unesc]; pos_esc++;
-			break;
-		}
-	}
-
-	esc[pos_esc] = '\0';
-	
-	return esc;
-}
-
-static NTSTATUS pdb_sql_string_field(struct pdb_sql_query *q,
-					   const char *name, const char *value)
-{
-	char *esc_value;
-
-	if (!name || !value || !strcmp(value, "") || strchr(name, '\''))
-		return NT_STATUS_INVALID_PARAMETER;   /* This field shouldn't be set by module */
-
-	esc_value = sql_escape_string(q, value);
-
-	if (q->update) {
-		q->part1 =
-			talloc_asprintf_append(q->part1,
-								   "%s = '%s',", name, esc_value);
-	} else {
-		q->part1 =
-			talloc_asprintf_append(q->part1, "%s,", name);
-		q->part2 =
-			talloc_asprintf_append(q->part2, "'%s',",
-								   esc_value);
-	}
-
-	talloc_free(esc_value);
-
-	return NT_STATUS_OK;
-}
-
-#define config_value(data,name,default_value) \
-	lp_parm_const_string(GLOBAL_SECTION_SNUM, data, name, default_value)
-
-static const char * config_value_write(const char *location, const char *name, const char *default_value) 
-{
-	char const *v = NULL;
-	char const *swrite = NULL;
-
-	v = lp_parm_const_string(GLOBAL_SECTION_SNUM, location, name, default_value);
-
-	if (!v)
-		return NULL;
-
-	swrite = strrchr(v, ':');
-
-	/* Default to the same field as read field */
-	if (!swrite) {
-
-		/* Updating NULL does not make much sense */
-		if (!strcmp(v, "NULL")) 
-			return NULL;
-
-		return v;
-	}
-
-	swrite++;
-
-	/* If the field is 0 chars long, we shouldn't write to it */
-	if (!strlen(swrite) || !strcmp(swrite, "NULL"))
-		return NULL;
-
-	/* Otherwise, use the additionally specified */
-	return swrite;
-}
-
-static const char * config_value_read(const char *location, const char *name, const char *default_value)
-{
-	char *v = NULL;
-	char *swrite;
-
-	v = lp_parm_talloc_string(GLOBAL_SECTION_SNUM, location, name, default_value);
-
-	if (!v)
-		return "NULL";
-
-	swrite = strrchr(v, ':');
-
-	/* If no write is specified, there are no problems */
-	if (!swrite) {
-		if (strlen(v) == 0)
-			return "NULL";
-		return (const char *)v;
-	}
-
-	/* Otherwise, we have to cut the ':write_part' */
-	*swrite = '\0';
-	if (strlen(v) == 0)
-		return "NULL";
-
-	return (const char *)v;
-}
-
-char *sql_account_query_select(TALLOC_CTX *mem_ctx, const char *data, BOOL update, enum sql_search_field field, const char *value)
-{
-	const char *field_string;
-	char *query;
-
-	switch(field) {
-	case SQL_SEARCH_NONE: 
-		field_string = "'1'"; 
-		value = "1"; 
-		break;
-		
-	case SQL_SEARCH_USER_SID: 
-		field_string = config_value_read(data, "user sid column", 
-										 CONFIG_USER_SID_DEFAULT); 
-		break;
-		
-	case SQL_SEARCH_USER_NAME: 
-		field_string = config_value_read(data, "username column", 
-										 CONFIG_USERNAME_DEFAULT);
-		break;
-	default:
-		field_string = "unknown";
-		break;
-	}
-
-	query = talloc_asprintf(mem_ctx,
-			 "SELECT %s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s FROM %s WHERE %s = '%s'",
-			 config_value_read(data, "logon time column",
-							   CONFIG_LOGON_TIME_DEFAULT),
-			 config_value_read(data, "logoff time column",
-							   CONFIG_LOGOFF_TIME_DEFAULT),
-			 config_value_read(data, "kickoff time column",
-							   CONFIG_KICKOFF_TIME_DEFAULT),
-			 config_value_read(data, "pass last set time column",
-							   CONFIG_PASS_LAST_SET_TIME_DEFAULT),
-			 config_value_read(data, "pass can change time column",
-							   CONFIG_PASS_CAN_CHANGE_TIME_DEFAULT),
-			 config_value_read(data, "pass must change time column",
-							   CONFIG_PASS_MUST_CHANGE_TIME_DEFAULT),
-			 config_value_read(data, "username column",
-							   CONFIG_USERNAME_DEFAULT),
-			 config_value_read(data, "domain column",
-							   CONFIG_DOMAIN_DEFAULT),
-			 config_value_read(data, "nt username column",
-							   CONFIG_NT_USERNAME_DEFAULT),
-			 config_value_read(data, "fullname column",
-							   CONFIG_FULLNAME_DEFAULT),
-			 config_value_read(data, "home dir column",
-							   CONFIG_HOME_DIR_DEFAULT),
-			 config_value_read(data, "dir drive column",
-							   CONFIG_DIR_DRIVE_DEFAULT),
-			 config_value_read(data, "logon script column",
-							   CONFIG_LOGON_SCRIPT_DEFAULT),
-			 config_value_read(data, "profile path column",
-							   CONFIG_PROFILE_PATH_DEFAULT),
-			 config_value_read(data, "acct desc column",
-							   CONFIG_ACCT_DESC_DEFAULT),
-			 config_value_read(data, "workstations column",
-							   CONFIG_WORKSTATIONS_DEFAULT),
-			 config_value_read(data, "unknown string column",
-							   CONFIG_UNKNOWN_STR_DEFAULT),
-			 config_value_read(data, "munged dial column",
-							   CONFIG_MUNGED_DIAL_DEFAULT),
-			 config_value_read(data, "user sid column",
-							   CONFIG_USER_SID_DEFAULT),
-			 config_value_read(data, "group sid column",
-							   CONFIG_GROUP_SID_DEFAULT),
-			 config_value_read(data, "lanman pass column",
-							   CONFIG_LM_PW_DEFAULT),
-			 config_value_read(data, "nt pass column",
-							   CONFIG_NT_PW_DEFAULT),
-			 config_value_read(data, "plain pass column",
-							   CONFIG_PLAIN_PW_DEFAULT),
-			 config_value_read(data, "acct ctrl column",
-							   CONFIG_ACCT_CTRL_DEFAULT),
-			 config_value_read(data, "logon divs column",
-							   CONFIG_LOGON_DIVS_DEFAULT),
-			 config_value_read(data, "hours len column",
-							   CONFIG_HOURS_LEN_DEFAULT),
-			 config_value_read(data, "bad password count column",
-							   CONFIG_BAD_PASSWORD_COUNT_DEFAULT),
-			 config_value_read(data, "logon count column",
-							   CONFIG_LOGON_COUNT_DEFAULT),
-			 config_value_read(data, "unknown 6 column",
-							   CONFIG_UNKNOWN_6_DEFAULT),
-			 config_value_read(data, "logon hours column",
-							   CONFIG_LOGON_HOURS),
-			 config_value(data, "table", CONFIG_TABLE_DEFAULT), 
-			 field_string, value
-				 );
-	 return query;
-}
-
-char *sql_account_query_delete(TALLOC_CTX *mem_ctx, const char *data, const char *esc) 
-{
-	char *query;
-	
-	query = talloc_asprintf(mem_ctx, "DELETE FROM %s WHERE %s = '%s'",
-			 config_value(data, "table", CONFIG_TABLE_DEFAULT),
-			 config_value_read(data, "username column",
-							   CONFIG_USERNAME_DEFAULT), esc);
-	return query;
-}
-
-char *sql_account_query_update(TALLOC_CTX *mem_ctx, const char *location, const SAM_ACCOUNT *newpwd, char isupdate)
-{
-	char *ret;
-	pstring temp;
-	fstring sid_str;
-	pdb_sql_query *query;
- 	int some_field_affected = 0;
-
-	query = talloc(mem_ctx, pdb_sql_query);
-	query->update = isupdate;
-
-	/* I know this is somewhat overkill but only the talloc 
-	 * functions have asprint_append and the 'normal' asprintf 
-	 * is a GNU extension */
-	query->part2 = talloc_asprintf(query, "%s", "");
-	if (query->update) {
-		query->part1 =
-			talloc_asprintf(query, "UPDATE %s SET ",
-							config_value(location, "table",
-										 CONFIG_TABLE_DEFAULT));
-	} else {
-		query->part1 =
-			talloc_asprintf(query, "INSERT INTO %s (",
-							config_value(location, "table",
-										 CONFIG_TABLE_DEFAULT));
-	}
-
-	if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_ACCTCTRL)) {
- 		some_field_affected = 1;
-		pdb_sql_int_field(query,
-						config_value_write(location, "acct ctrl column",
-										   CONFIG_ACCT_CTRL_DEFAULT),
-						pdb_get_acct_ctrl(newpwd));
-	}
-
-	if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_LOGONTIME)) {
- 		some_field_affected = 1;
-		pdb_sql_int_field(query,
-							config_value_write(location,
-											   "logon time column",
-											   CONFIG_LOGON_TIME_DEFAULT),
-							pdb_get_logon_time(newpwd));
-	}
-
-	if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_LOGOFFTIME)) {
- 		some_field_affected = 1;
-		pdb_sql_int_field(query,
-							config_value_write(location,
-											   "logoff time column",
-											   CONFIG_LOGOFF_TIME_DEFAULT),
-							pdb_get_logoff_time(newpwd));
-	}
-
-	if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_KICKOFFTIME)) {
- 		some_field_affected = 1;
-		pdb_sql_int_field(query,
-							config_value_write(location,
-											   "kickoff time column",
-											   CONFIG_KICKOFF_TIME_DEFAULT),
-							pdb_get_kickoff_time(newpwd));
-	}
-
-	if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_CANCHANGETIME)) {
- 		some_field_affected = 1;
-		pdb_sql_int_field(query,
-							config_value_write(location,
-											   "pass can change time column",
-											   CONFIG_PASS_CAN_CHANGE_TIME_DEFAULT),
-							pdb_get_pass_can_change_time(newpwd));
-	}
-
-	if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_MUSTCHANGETIME)) {
- 		some_field_affected = 1;
-		pdb_sql_int_field(query,
-							config_value_write(location,
-											   "pass must change time column",
-											   CONFIG_PASS_MUST_CHANGE_TIME_DEFAULT),
-							pdb_get_pass_must_change_time(newpwd));
-	}
-
-	if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_PASSLASTSET)) {
- 		some_field_affected = 1;
-		pdb_sql_int_field(query,
-							config_value_write(location,
-											   "pass last set time column",
-											   CONFIG_PASS_LAST_SET_TIME_DEFAULT),
-							pdb_get_pass_last_set_time(newpwd));
-	}
-
-	if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_HOURSLEN)) {
- 		some_field_affected = 1;
-		pdb_sql_int_field(query,
-							config_value_write(location,
-											   "hours len column",
-											   CONFIG_HOURS_LEN_DEFAULT),
-							pdb_get_hours_len(newpwd));
-	}
-
-	if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_LOGONDIVS)) {
- 		some_field_affected = 1;
-		pdb_sql_int_field(query,
-							config_value_write(location,
-											   "logon divs column",
-											   CONFIG_LOGON_DIVS_DEFAULT),
-							pdb_get_logon_divs(newpwd));
-	}
-
-	if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_USERSID)) {
- 		some_field_affected = 1;
-		pdb_sql_string_field(query,
-						   config_value_write(location, "user sid column",
-											  CONFIG_USER_SID_DEFAULT),
-						   sid_to_string(sid_str, 
-										 pdb_get_user_sid(newpwd)));
-	}
-
-	if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_GROUPSID)) {
- 		some_field_affected = 1;
-		pdb_sql_string_field(query,
-						   config_value_write(location, "group sid column",
-											  CONFIG_GROUP_SID_DEFAULT),
-						   sid_to_string(sid_str,
-										 pdb_get_group_sid(newpwd)));
-	}
-
-	if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_USERNAME)) {
- 		some_field_affected = 1;
-		pdb_sql_string_field(query,
-						   config_value_write(location, "username column",
-											  CONFIG_USERNAME_DEFAULT),
-						   pdb_get_username(newpwd));
-	}
-
-	if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_DOMAIN)) {
- 		some_field_affected = 1;
-		pdb_sql_string_field(query,
-						   config_value_write(location, "domain column",
-											  CONFIG_DOMAIN_DEFAULT),
-						   pdb_get_domain(newpwd));
-	}
-
-	if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_USERNAME)) {
- 		some_field_affected = 1;
-		pdb_sql_string_field(query,
-						   config_value_write(location,
-											  "nt username column",
-											  CONFIG_NT_USERNAME_DEFAULT),
-						   pdb_get_nt_username(newpwd));
-	}
-
-	if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_FULLNAME)) {
- 		some_field_affected = 1;
-		pdb_sql_string_field(query,
-						   config_value_write(location, "fullname column",
-											  CONFIG_FULLNAME_DEFAULT),
-						   pdb_get_fullname(newpwd));
-	}
-
-	if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_LOGONSCRIPT)) {
- 		some_field_affected = 1;
-		pdb_sql_string_field(query,
-						   config_value_write(location,
-											  "logon script column",
-											  CONFIG_LOGON_SCRIPT_DEFAULT),
-						   pdb_get_logon_script(newpwd));
-	}
-
-	if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_PROFILE)) {
- 		some_field_affected = 1;
-		pdb_sql_string_field(query,
-						   config_value_write(location,
-											  "profile path column",
-											  CONFIG_PROFILE_PATH_DEFAULT),
-						   pdb_get_profile_path(newpwd));
-	}
-
-	if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_DRIVE)) {
- 		some_field_affected = 1;
-		pdb_sql_string_field(query,
-						   config_value_write(location, "dir drive column",
-											  CONFIG_DIR_DRIVE_DEFAULT),
-						   pdb_get_dir_drive(newpwd));
-	}
-
-	if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_SMBHOME)) {
- 		some_field_affected = 1;
-		pdb_sql_string_field(query,
-						   config_value_write(location, "home dir column",
-											  CONFIG_HOME_DIR_DEFAULT),
-						   pdb_get_homedir(newpwd));
-	}
-
-	if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_WORKSTATIONS)) {
- 		some_field_affected = 1;
-		pdb_sql_string_field(query,
-						   config_value_write(location,
-											  "workstations column",
-											  CONFIG_WORKSTATIONS_DEFAULT),
-						   pdb_get_workstations(newpwd));
-	}
-
-	if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_UNKNOWNSTR)) {
- 		some_field_affected = 1;
-		pdb_sql_string_field(query,
-						   config_value_write(location,
-											  "unknown string column",
-											  CONFIG_UNKNOWN_STR_DEFAULT),
-						   pdb_get_workstations(newpwd));
-	}
-
-	if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_LMPASSWD)) {
-		some_field_affected = 1;
-		pdb_sethexpwd(temp, pdb_get_lanman_passwd(newpwd),
-					  pdb_get_acct_ctrl(newpwd));
-		pdb_sql_string_field(query,
-						   config_value_write(location,
-											  "lanman pass column",
-											  CONFIG_LM_PW_DEFAULT), temp);
-	}
-
-	if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_NTPASSWD)) {
-		some_field_affected = 1;
-		pdb_sethexpwd(temp, pdb_get_nt_passwd(newpwd),
-					  pdb_get_acct_ctrl(newpwd));
-		pdb_sql_string_field(query,
-						   config_value_write(location, "nt pass column",
-											  CONFIG_NT_PW_DEFAULT), temp);
-	}
-
- 	if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_HOURS)) {
- 		some_field_affected = 1;
- 		pdb_sql_string_field(query,
- 							config_value_write(location,
- 											   "logon hours column",
- 											   CONFIG_LOGON_HOURS),
- 							(const char *)pdb_get_hours(newpwd));
- 	}
-
- 	if (!some_field_affected) {
-		talloc_free(query);
- 		return NULL;
- 	}
-
-	if (query->update) {
-		query->part1[strlen(query->part1) - 1] = '\0';
-		query->part1 = talloc_asprintf(
-			mem_ctx, "%s WHERE %s = '%s'", query->part1,
-			config_value_read(location,
-					  "user sid column",
-					  CONFIG_USER_SID_DEFAULT),
-			sid_to_string(sid_str, pdb_get_user_sid (newpwd)));
-	} else {
-		query->part2[strlen(query->part2) - 1] = ')';
-		query->part1[strlen(query->part1) - 1] = ')';
-		query->part1 =
-			talloc_asprintf_append(query->part1,
-								   " VALUES (%s", query->part2);
-	}
-
-	ret = talloc_strdup(mem_ctx, query->part1);
-	talloc_free(query);
-	return ret;
-}
-
-BOOL sql_account_config_valid(const char *data)
-{
-	const char *sid_column, *username_column;
-	
-    sid_column = config_value_read(data, "user sid column", CONFIG_USER_SID_DEFAULT);
-    username_column = config_value_read(data, "username column", CONFIG_USERNAME_DEFAULT);
-	
-    if(!strcmp(sid_column,"NULL") || !strcmp(username_column, "NULL")) {
-        DEBUG(0,("Please specify both a valid 'user sid column' and a valid 'username column' in smb.conf\n"));
-        return False;
-    }
-
-	return True;
-}
diff --git a/source3/passdb/pdb_xml.c b/source3/passdb/pdb_xml.c
deleted file mode 100644
index d40a5731a4..0000000000
--- a/source3/passdb/pdb_xml.c
+++ /dev/null
@@ -1,580 +0,0 @@
-
-/*
- * XML password backend for samba
- * Copyright (C) Jelmer Vernooij 2002
- * Some parts based on the libxml gjobread example by Daniel Veillard
- * 
- * 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.
- */
-
-/* FIXME: 
- * - Support stdin input by using '-'
- * - Be faster. Don't rewrite the whole file when adding a user, but store it in the memory and save it when exiting. Requires changes to samba source.
- * - Gives the ability to read/write to standard input/output
- * - Do locking!
- * - Better names!
- */
-
-
-#define XML_URL "http://samba.org/samba/DTD/passdb"
-
-#include "includes.h"
-
-#include <libxml/xmlmemory.h>
-#include <libxml/parser.h>
-
-static int xmlsam_debug_level = DBGC_ALL;
-
-#undef DBGC_CLASS
-#define DBGC_CLASS xmlsam_debug_level
-
-
-/* Helper utilities for charset conversion */
-static xmlNodePtr smbXmlNewChild(xmlNodePtr prnt, xmlNsPtr ns, const xmlChar *name, const char *content)
-{
-	char *string_utf8;
-	xmlNodePtr ret;
-
-	if(!content) return xmlNewChild(prnt, ns, name, NULL);
-
-	
-	if(push_utf8_allocate(&string_utf8,content) == (size_t)-1)
-       return NULL;
-
-	ret = xmlNewTextChild(prnt, ns, name, string_utf8);
-
-	SAFE_FREE(string_utf8);
-
-	return ret;
-}
-
-
-static char * iota(int a) {
-	static char tmp[10];
-
-	snprintf(tmp, 9, "%d", a);
-	return tmp;
-}
-
-static BOOL parsePass(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur, SAM_ACCOUNT * u)
-{
-	pstring temp;
-
-	cur = cur->xmlChildrenNode;
-	while (cur != NULL) {
-		if (strcmp(cur->name, "crypt"))
-			DEBUG(0, ("Unknown element %s\n", cur->name));
-		else {
-			if (!strcmp(xmlGetProp(cur, "type"), "nt")
-				&&
-				pdb_gethexpwd(xmlNodeListGetString
-							  (doc, cur->xmlChildrenNode, 1), temp))
-				pdb_set_nt_passwd(u, temp, PDB_SET);
-			else if (!strcmp(xmlGetProp(cur, "type"), "lanman")
-					 &&
-					 pdb_gethexpwd(xmlNodeListGetString
-								   (doc, cur->xmlChildrenNode, 1), temp))
-				pdb_set_lanman_passwd(u, temp, PDB_SET);
-			else
-				DEBUG(0,
-					  ("Unknown crypt type: %s\n",
-					   xmlGetProp(cur, "type")));
-		}
-		cur = cur->next;
-	}
-	return True;
-}
-
-static BOOL parseUser(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur, SAM_ACCOUNT * u)
-{
-	char *tmp;
-	DOM_SID sid;
-
-	tmp = xmlGetProp(cur, "sid");
-	if (tmp){
-		string_to_sid(&sid, tmp);
-		pdb_set_user_sid(u, &sid, PDB_SET);
-	}
-	pdb_set_username(u, xmlGetProp(cur, "name"), PDB_SET);
-	/* We don't care what the top level element name is */
-	cur = cur->xmlChildrenNode;
-	while (cur != NULL) {
-		if ((!strcmp(cur->name, "group")) && (cur->ns == ns)) {
-			tmp = xmlGetProp(cur, "sid");
-			if (tmp){
-				string_to_sid(&sid, tmp);
-				pdb_set_group_sid(u, &sid, PDB_SET);
-			}
-		}
-
-		else if ((!strcmp(cur->name, "domain")) && (cur->ns == ns))
-			pdb_set_domain(u,
-						   xmlNodeListGetString(doc, cur->xmlChildrenNode,
-												1), PDB_SET);
-
-		else if (!strcmp(cur->name, "fullname") && cur->ns == ns)
-			pdb_set_fullname(u,
-							 xmlNodeListGetString(doc,
-												  cur->xmlChildrenNode,
-												  1), PDB_SET);
-
-		else if (!strcmp(cur->name, "nt_username") && cur->ns == ns)
-			pdb_set_nt_username(u,
-								xmlNodeListGetString(doc,
-													 cur->xmlChildrenNode,
-													 1), PDB_SET);
-
-		else if (!strcmp(cur->name, "logon_script") && cur->ns == ns)
-			pdb_set_logon_script(u,
-								 xmlNodeListGetString(doc,
-													  cur->xmlChildrenNode,
-													  1), PDB_SET);
-
-		else if (!strcmp(cur->name, "profile_path") && cur->ns == ns)
-			pdb_set_profile_path(u,
-								 xmlNodeListGetString(doc,
-													  cur->xmlChildrenNode,
-													  1), PDB_SET);
-
-		else if (!strcmp(cur->name, "logon_time") && cur->ns == ns)
-			pdb_set_logon_time(u,
-							   atol(xmlNodeListGetString
-									(doc, cur->xmlChildrenNode, 1)), PDB_SET);
-
-		else if (!strcmp(cur->name, "logoff_time") && cur->ns == ns)
-			pdb_set_logoff_time(u,
-								atol(xmlNodeListGetString
-									 (doc, cur->xmlChildrenNode, 1)),
-								PDB_SET);
-
-		else if (!strcmp(cur->name, "kickoff_time") && cur->ns == ns)
-			pdb_set_kickoff_time(u,
-								 atol(xmlNodeListGetString
-									  (doc, cur->xmlChildrenNode, 1)),
-								 PDB_SET);
-
-		else if (!strcmp(cur->name, "logon_divs") && cur->ns == ns)
-			pdb_set_logon_divs(u,
-							   atol(xmlNodeListGetString
-									(doc, cur->xmlChildrenNode, 1)), PDB_SET);
-
-		else if (!strcmp(cur->name, "hours_len") && cur->ns == ns)
-			pdb_set_hours_len(u,
-							  atol(xmlNodeListGetString
-								   (doc, cur->xmlChildrenNode, 1)), PDB_SET);
-
-		else if (!strcmp(cur->name, "bad_password_count") && cur->ns == ns)
-			pdb_set_bad_password_count(u,
-							  atol(xmlNodeListGetString
-								   (doc, cur->xmlChildrenNode, 1)), PDB_SET);
-
-		else if (!strcmp(cur->name, "logon_count") && cur->ns == ns)
-			pdb_set_logon_count(u,
-							  atol(xmlNodeListGetString
-								   (doc, cur->xmlChildrenNode, 1)), PDB_SET);
-
-		else if (!strcmp(cur->name, "unknown_6") && cur->ns == ns)
-			pdb_set_unknown_6(u,
-							  atol(xmlNodeListGetString
-								   (doc, cur->xmlChildrenNode, 1)), PDB_SET);
-
-		else if (!strcmp(cur->name, "homedir") && cur->ns == ns)
-			pdb_set_homedir(u,
-							xmlNodeListGetString(doc, cur->xmlChildrenNode,
-												 1), PDB_SET);
-
-		else if (!strcmp(cur->name, "unknown_str") && cur->ns == ns)
-			pdb_set_unknown_str(u,
-								xmlNodeListGetString(doc,
-													 cur->xmlChildrenNode,
-													 1), PDB_SET);
-
-		else if (!strcmp(cur->name, "dir_drive") && cur->ns == ns)
-			pdb_set_dir_drive(u,
-							  xmlNodeListGetString(doc,
-												   cur->xmlChildrenNode,
-												   1), PDB_SET);
-
-		else if (!strcmp(cur->name, "munged_dial") && cur->ns == ns)
-			pdb_set_munged_dial(u,
-								xmlNodeListGetString(doc,
-													 cur->xmlChildrenNode,
-													 1), PDB_SET);
-
-		else if (!strcmp(cur->name, "acct_desc") && cur->ns == ns)
-			pdb_set_acct_desc(u,
-							  xmlNodeListGetString(doc,
-												   cur->xmlChildrenNode,
-												   1), PDB_SET);
-
-		else if (!strcmp(cur->name, "acct_ctrl") && cur->ns == ns)
-			pdb_set_acct_ctrl(u,
-							  atol(xmlNodeListGetString
-								   (doc, cur->xmlChildrenNode, 1)), PDB_SET);
-
-		else if (!strcmp(cur->name, "workstations") && cur->ns == ns)
-			pdb_set_workstations(u,
-								 xmlNodeListGetString(doc,
-													  cur->xmlChildrenNode,
-													  1), PDB_SET);
-
-		else if ((!strcmp(cur->name, "password")) && (cur->ns == ns)) {
-			tmp = xmlGetProp(cur, "last_set");
-			if (tmp)
-				pdb_set_pass_last_set_time(u, atol(tmp), PDB_SET);
-			tmp = xmlGetProp(cur, "must_change");
-			if (tmp)
-				pdb_set_pass_must_change_time(u, atol(tmp), PDB_SET);
-			tmp = xmlGetProp(cur, "can_change");
-			if (tmp)
-				pdb_set_pass_can_change_time(u, atol(tmp), PDB_SET);
-			parsePass(doc, ns, cur, u);
-		}
-
-		else
-			DEBUG(0, ("Unknown element %s\n", cur->name));
-		cur = cur->next;
-	}
-
-	return True;
-}
-
-typedef struct pdb_xml {
-	char *location;
-	char written;
-	xmlDocPtr doc;
-	xmlNodePtr users;
-	xmlNodePtr pwent;
-	xmlNsPtr ns;
-} pdb_xml;
-
-static xmlNodePtr parseSambaXMLFile(struct pdb_xml *data)
-{
-	xmlNodePtr cur;
-
-	data->doc = xmlParseFile(data->location);
-	if (data->doc == NULL)
-		return NULL;
-
-	cur = xmlDocGetRootElement(data->doc);
-	if (!cur) {
-		DEBUG(0, ("empty document\n"));
-		xmlFreeDoc(data->doc);
-		return NULL;
-	}
-	data->ns = xmlSearchNsByHref(data->doc, cur, XML_URL);
-	if (!data->ns) {
-		DEBUG(0,
-			  ("document of the wrong type, samba user namespace not found\n"));
-		xmlFreeDoc(data->doc);
-		return NULL;
-	}
-	if (strcmp(cur->name, "samba")) {
-		DEBUG(0, ("document of the wrong type, root node != samba"));
-		xmlFreeDoc(data->doc);
-		return NULL;
-	}
-
-	cur = cur->xmlChildrenNode;
-	while (cur && xmlIsBlankNode(cur)) {
-		cur = cur->next;
-	}
-	if (!cur)
-		return NULL;
-	if ((strcmp(cur->name, "users")) || (cur->ns != data->ns)) {
-		DEBUG(0, ("document of the wrong type, was '%s', users expected",
-				  cur->name));
-		DEBUG(0, ("xmlDocDump follows\n"));
-		xmlDocDump(stderr, data->doc);
-		DEBUG(0, ("xmlDocDump finished\n"));
-		xmlFreeDoc(data->doc);
-		return NULL;
-	}
-	data->users = cur;
-	cur = cur->xmlChildrenNode;
-	return cur;
-}
-
-static NTSTATUS xmlsam_setsampwent(struct pdb_methods *methods, BOOL update, uint16 acb_mask)
-{
-	pdb_xml *data;
-
-	if (!methods) {
-		DEBUG(0, ("Invalid methods\n"));
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-	data = (pdb_xml *) methods->private_data;
-	if (!data) {
-		DEBUG(0, ("Invalid pdb_xml_data\n"));
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-	data->pwent = parseSambaXMLFile(data);
-	if (!data->pwent)
-		return NT_STATUS_UNSUCCESSFUL;
-	
-	return NT_STATUS_OK;
-}
-
-/***************************************************************
-  End enumeration of the passwd list.
- ****************************************************************/
-
-static void xmlsam_endsampwent(struct pdb_methods *methods)
-{
-	pdb_xml *data;
-
-	if (!methods) {
-		DEBUG(0, ("Invalid methods\n"));
-		return;
-	}
-
-	data = (pdb_xml *) methods->private_data;
-
-	if (!data) {
-		DEBUG(0, ("Invalid pdb_xml_data\n"));
-		return;
-	}
-
-	xmlFreeDoc(data->doc);
-	data->doc = NULL;
-	data->pwent = NULL;
-}
-
-/*****************************************************************
-  Get one SAM_ACCOUNT from the list (next in line)
- *****************************************************************/
-
-static NTSTATUS xmlsam_getsampwent(struct pdb_methods *methods, SAM_ACCOUNT * user)
-{
-	pdb_xml *data;
-
-	if (!methods) {
-		DEBUG(0, ("Invalid methods\n"));
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-	data = (pdb_xml *) methods->private_data;
-
-	if (!data) {
-		DEBUG(0, ("Invalid pdb_xml_data\n"));
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	while (data->pwent) {
-		if ((!strcmp(data->pwent->name, "user")) &&
-			(data->pwent->ns == data->ns)) {
-
-			parseUser(data->doc, data->ns, data->pwent, user);
-			data->pwent = data->pwent->next;
-			return NT_STATUS_OK;
-		}
-		data->pwent = data->pwent->next;
-	}
-	return NT_STATUS_UNSUCCESSFUL;
-}
-
-/***************************************************************************
-  Adds an existing SAM_ACCOUNT
- ****************************************************************************/
-
-static NTSTATUS xmlsam_add_sam_account(struct pdb_methods *methods, SAM_ACCOUNT * u)
-{
-	pstring temp;
-	fstring sid_str;
-	xmlNodePtr cur, user, pass, root;
-	pdb_xml *data;
-
-	DEBUG(10, ("xmlsam_add_sam_account called!\n"));
-
-	if (!methods) {
-		DEBUG(0, ("Invalid methods\n"));
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	data = (pdb_xml *) methods->private_data;
-	if (!data) {
-		DEBUG(0, ("Invalid pdb_xml_data\n"));
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	/* Create a new document if we can't open the current one */
-	if (!parseSambaXMLFile(data)) {
-		DEBUG(0, ("Can't load current XML file, creating a new one\n"));
-		data->doc = xmlNewDoc(XML_DEFAULT_VERSION);
-		root = xmlNewDocNode(data->doc, NULL, "samba", NULL);
-		cur = xmlDocSetRootElement(data->doc, root);
-		data->ns = xmlNewNs(root, XML_URL, "samba");
-		data->users = smbXmlNewChild(root, data->ns, "users", NULL);
-	}
-
-	user = smbXmlNewChild(data->users, data->ns, "user", NULL);
-	xmlNewProp(user, "sid",
-			   sid_to_string(sid_str, pdb_get_user_sid(u)));
-
-	if (pdb_get_username(u) && strcmp(pdb_get_username(u), ""))
-		xmlNewProp(user, "name", pdb_get_username(u));
-
-	cur = smbXmlNewChild(user, data->ns, "group", NULL);
-	
-	xmlNewProp(cur, "sid",
-			   sid_to_string(sid_str, pdb_get_group_sid(u)));
-
-	if (pdb_get_init_flags(u, PDB_LOGONTIME) != PDB_DEFAULT)
-		smbXmlNewChild(user, data->ns, "logon_time",
-					iota(pdb_get_logon_time(u)));
-
-	if (pdb_get_init_flags(u, PDB_LOGOFFTIME) != PDB_DEFAULT)
-		smbXmlNewChild(user, data->ns, "logoff_time",
-					iota(pdb_get_logoff_time(u)));
-
-	if (pdb_get_init_flags(u, PDB_KICKOFFTIME) != PDB_DEFAULT)
-		smbXmlNewChild(user, data->ns, "kickoff_time",
-					iota(pdb_get_kickoff_time(u)));
-
-	if (pdb_get_domain(u) && strcmp(pdb_get_domain(u), ""))
-		smbXmlNewChild(user, data->ns, "domain", pdb_get_domain(u));
-
-	if (pdb_get_nt_username(u) && strcmp(pdb_get_nt_username(u), ""))
-		smbXmlNewChild(user, data->ns, "nt_username", pdb_get_nt_username(u));
-
-	if (pdb_get_fullname(u) && strcmp(pdb_get_fullname(u), ""))
-		smbXmlNewChild(user, data->ns, "fullname", pdb_get_fullname(u));
-
-	if (pdb_get_homedir(u) && strcmp(pdb_get_homedir(u), ""))
-		smbXmlNewChild(user, data->ns, "homedir", pdb_get_homedir(u));
-
-	if (pdb_get_dir_drive(u) && strcmp(pdb_get_dir_drive(u), ""))
-		smbXmlNewChild(user, data->ns, "dir_drive", pdb_get_dir_drive(u));
-
-	if (pdb_get_logon_script(u) && strcmp(pdb_get_logon_script(u), ""))
-		smbXmlNewChild(user, data->ns, "logon_script",
-					pdb_get_logon_script(u));
-
-	if (pdb_get_profile_path(u) && strcmp(pdb_get_profile_path(u), ""))
-		smbXmlNewChild(user, data->ns, "profile_path",
-					pdb_get_profile_path(u));
-
-	if (pdb_get_acct_desc(u) && strcmp(pdb_get_acct_desc(u), ""))
-		smbXmlNewChild(user, data->ns, "acct_desc", pdb_get_acct_desc(u));
-
-	if (pdb_get_workstations(u) && strcmp(pdb_get_workstations(u), ""))
-		smbXmlNewChild(user, data->ns, "workstations",
-					pdb_get_workstations(u));
-
-	if (pdb_get_unknown_str(u) && strcmp(pdb_get_unknown_str(u), ""))
-		smbXmlNewChild(user, data->ns, "unknown_str", pdb_get_unknown_str(u));
-
-	if (pdb_get_munged_dial(u) && strcmp(pdb_get_munged_dial(u), ""))
-		smbXmlNewChild(user, data->ns, "munged_dial", pdb_get_munged_dial(u));
-
-
-	/* Password stuff */
-	pass = smbXmlNewChild(user, data->ns, "password", NULL);
-	if (pdb_get_pass_last_set_time(u))
-		xmlNewProp(pass, "last_set", iota(pdb_get_pass_last_set_time(u)));
-	if (pdb_get_init_flags(u, PDB_CANCHANGETIME) != PDB_DEFAULT)
-		xmlNewProp(pass, "can_change",
-				   iota(pdb_get_pass_can_change_time(u)));
-
-	if (pdb_get_init_flags(u, PDB_MUSTCHANGETIME) != PDB_DEFAULT)
-		xmlNewProp(pass, "must_change",
-				   iota(pdb_get_pass_must_change_time(u)));
-
-
-	if (pdb_get_lanman_passwd(u)) {
-		pdb_sethexpwd(temp, pdb_get_lanman_passwd(u),
-					  pdb_get_acct_ctrl(u));
-		cur = smbXmlNewChild(pass, data->ns, "crypt", temp);
-		xmlNewProp(cur, "type", "lanman");
-	}
-
-	if (pdb_get_nt_passwd(u)) {
-		pdb_sethexpwd(temp, pdb_get_nt_passwd(u), pdb_get_acct_ctrl(u));
-		cur = smbXmlNewChild(pass, data->ns, "crypt", temp);
-		xmlNewProp(cur, "type", "nt");
-	}
-
-	smbXmlNewChild(user, data->ns, "acct_ctrl", iota(pdb_get_acct_ctrl(u)));
-
-	if (pdb_get_logon_divs(u))
-		smbXmlNewChild(user, data->ns, "logon_divs",
-					iota(pdb_get_logon_divs(u)));
-
-	if (pdb_get_hours_len(u))
-		smbXmlNewChild(user, data->ns, "hours_len",
-					iota(pdb_get_hours_len(u)));
-
-	smbXmlNewChild(user, data->ns, "bad_password_count", iota(pdb_get_bad_password_count(u)));
-	smbXmlNewChild(user, data->ns, "logon_count", iota(pdb_get_logon_count(u)));
-	smbXmlNewChild(user, data->ns, "unknown_6", iota(pdb_get_unknown_6(u)));
-	xmlSaveFile(data->location, data->doc);
-
-	return NT_STATUS_OK;
-}
-
-static NTSTATUS xmlsam_init(PDB_CONTEXT * pdb_context, PDB_METHODS ** pdb_method,
-		 const char *location)
-{
-	NTSTATUS nt_status;
-	pdb_xml *data;
-
-	xmlsam_debug_level = debug_add_class("xmlsam");
-	if (xmlsam_debug_level == -1) {
-		xmlsam_debug_level = DBGC_ALL;
-		DEBUG(0, ("xmlsam: Couldn't register custom debugging class!\n"));
-	}
-
-	if (!pdb_context) {
-		DEBUG(0, ("invalid pdb_methods specified\n"));
-		return NT_STATUS_UNSUCCESSFUL;
-	}
-
-	if (!NT_STATUS_IS_OK
-		(nt_status = make_pdb_methods(pdb_context->mem_ctx, pdb_method))) {
-		return nt_status;
-	}
-
-	(*pdb_method)->name = "xmlsam";
-
-	(*pdb_method)->setsampwent = xmlsam_setsampwent;
-	(*pdb_method)->endsampwent = xmlsam_endsampwent;
-	(*pdb_method)->getsampwent = xmlsam_getsampwent;
-	(*pdb_method)->add_sam_account = xmlsam_add_sam_account;
-	(*pdb_method)->getsampwnam = NULL;
-	(*pdb_method)->getsampwsid = NULL;
-	(*pdb_method)->update_sam_account = NULL;
-	(*pdb_method)->delete_sam_account = NULL;
-	(*pdb_method)->getgrsid = NULL;
-	(*pdb_method)->getgrgid = NULL;
-	(*pdb_method)->getgrnam = NULL;
-	(*pdb_method)->add_group_mapping_entry = NULL;
-	(*pdb_method)->update_group_mapping_entry = NULL;
-	(*pdb_method)->delete_group_mapping_entry = NULL;
-	(*pdb_method)->enum_group_mapping = NULL;
-
-	data = _talloc(pdb_context->mem_ctx, sizeof(pdb_xml));
-	data->location = talloc_strdup(pdb_context->mem_ctx, (location ? location : "passdb.xml"));
-	data->pwent = NULL;
-	data->written = 0;
-	(*pdb_method)->private_data = data;
-
-	LIBXML_TEST_VERSION xmlKeepBlanksDefault(0);
-
-	return NT_STATUS_OK;
-}
-
-NTSTATUS pdb_xml_init(void) 
-{
-	return smb_register_passdb(PASSDB_INTERFACE_VERSION, "xml", xmlsam_init);
-}