Menu
▾
▴
[pdbsql-cvs] SF.net SVN: pdbsql: [70] tags
|
From: <sy...@us...> - 2006-08-20 20:09:26
|
Revision: 70 Author: synnack Date: 2006-08-20 13:09:14 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/pdbsql/?rev=70&view=rev Log Message: ----------- Release 0.2: * acct_description fix (pgsql/mysql) * logon hours fix (mysql) * 64-bit platform time_t fix (pgsql/mysql) * Added password history (pgsql/mysql) Added Paths: ----------- tags/pdbsql-0.2-samba-3.0.23/ tags/pdbsql-0.2-samba-3.0.23/docs/mysql.dump tags/pdbsql-0.2-samba-3.0.23/docs/pgsql.dump tags/pdbsql-0.2-samba-3.0.23/pdb_mysql.c tags/pdbsql-0.2-samba-3.0.23/pdb_pgsql.c tags/pdbsql-0.2-samba-3.0.23/pdb_sql.c Removed Paths: ------------- tags/pdbsql-0.2-samba-3.0.23/docs/mysql.dump tags/pdbsql-0.2-samba-3.0.23/docs/pgsql.dump tags/pdbsql-0.2-samba-3.0.23/pdb_mysql.c tags/pdbsql-0.2-samba-3.0.23/pdb_pgsql.c tags/pdbsql-0.2-samba-3.0.23/pdb_sql.c Copied: tags/pdbsql-0.2-samba-3.0.23 (from rev 67, trunk) Deleted: tags/pdbsql-0.2-samba-3.0.23/docs/mysql.dump =================================================================== --- trunk/docs/mysql.dump 2006-08-20 10:44:44 UTC (rev 67) +++ tags/pdbsql-0.2-samba-3.0.23/docs/mysql.dump 2006-08-20 20:09:14 UTC (rev 70) @@ -1,37 +0,0 @@ -# Put this in your MySQL database by running -# mysql -u<user> -p<password> -h<host> <database> < mysql.dump - -CREATE TABLE user ( - logon_time int(9) default NULL, - logoff_time int(9) default NULL, - kickoff_time int(9) default NULL, - pass_last_set_time int(9) default NULL, - pass_can_change_time int(9) default '0', - pass_must_change_time int(9) default '2147483647', - username varchar(255) default NULL, - domain varchar(255) default NULL, - nt_username varchar(255) default NULL, - nt_fullname varchar(255) default NULL, - home_dir varchar(255) default NULL, - dir_drive varchar(4) default NULL, - logon_script varchar(255) default NULL, - profile_path varchar(255) default NULL, - acct_desc varchar(255) default NULL, - workstations varchar(255) default NULL, - unknown_str varchar(255) default NULL, - munged_dial varchar(255) default NULL, - uid int(9) NOT NULL PRIMARY KEY auto_increment, - gid int(9) default NULL, - user_sid varchar(255) default NULL, - group_sid varchar(255) default NULL, - lm_pw varchar(255) default NULL, - nt_pw varchar(255) default NULL, - acct_ctrl int(9) default '528', - logon_divs int(9) default '168', - hours_len int(9) default '21', - unknown_6 int(9) default "1260", - bad_password_count int(9) default NULL, - logon_count int(9) default '0', - logon_hours varchar(42) default NULL, - KEY username(username) -); Copied: tags/pdbsql-0.2-samba-3.0.23/docs/mysql.dump (from rev 68, trunk/docs/mysql.dump) =================================================================== --- tags/pdbsql-0.2-samba-3.0.23/docs/mysql.dump (rev 0) +++ tags/pdbsql-0.2-samba-3.0.23/docs/mysql.dump 2006-08-20 20:09:14 UTC (rev 70) @@ -0,0 +1,38 @@ +# Put this in your MySQL database by running +# mysql -u<user> -p<password> -h<host> <database> < mysql.dump + +CREATE TABLE user ( + logon_time int(9) default NULL, + logoff_time int(9) default NULL, + kickoff_time int(9) default NULL, + pass_last_set_time int(9) default NULL, + pass_can_change_time int(9) default '0', + pass_must_change_time int(9) default '2147483647', + username varchar(255) default NULL, + domain varchar(255) default NULL, + nt_username varchar(255) default NULL, + nt_fullname varchar(255) default NULL, + home_dir varchar(255) default NULL, + dir_drive varchar(4) default NULL, + logon_script varchar(255) default NULL, + profile_path varchar(255) default NULL, + acct_desc varchar(255) default NULL, + workstations varchar(255) default NULL, + unknown_str varchar(255) default NULL, + munged_dial varchar(255) default NULL, + uid int(9) NOT NULL PRIMARY KEY auto_increment, + gid int(9) default NULL, + user_sid varchar(255) default NULL, + group_sid varchar(255) default NULL, + lm_pw varchar(255) default NULL, + nt_pw varchar(255) default NULL, + acct_ctrl int(9) default '528', + logon_divs int(9) default '168', + hours_len int(9) default '21', + unknown_6 int(9) default "1260", + bad_password_count int(9) default NULL, + logon_count int(9) default '0', + logon_hours varchar(42) default NULL, + password_history text default NULL, + KEY username(username) +); Deleted: tags/pdbsql-0.2-samba-3.0.23/docs/pgsql.dump =================================================================== --- trunk/docs/pgsql.dump 2006-08-20 10:44:44 UTC (rev 67) +++ tags/pdbsql-0.2-samba-3.0.23/docs/pgsql.dump 2006-08-20 20:09:14 UTC (rev 70) @@ -1,35 +0,0 @@ -CREATE TABLE users ( - logon_time integer default NULL, - logoff_time integer default NULL, - kickoff_time integer default NULL, - pass_last_set_time integer default NULL, - pass_can_change_time integer default '0', - pass_must_change_time integer default '2147483647', - username varchar(255) default NULL, - domain varchar(255) default NULL, - nt_username varchar(255) default NULL, - nt_fullname varchar(255) default NULL, - home_dir varchar(255) default NULL, - dir_drive varchar(4) default NULL, - logon_script varchar(255) default NULL, - profile_path varchar(255) default NULL, - acct_desc varchar(255) default NULL, - workstations varchar(255) default NULL, - unknown_str varchar(255) default NULL, - munged_dial varchar(255) default NULL, - uid SERIAL NOT NULL PRIMARY KEY, - gid integer default NULL, - user_sid varchar(255) default NULL, - group_sid varchar(255) default NULL, - lm_pw varchar(255) default NULL, - nt_pw varchar(255) default NULL, - acct_ctrl integer default '528', - logon_divs integer default '168', - hours_len integer default '21', - unknown_6 integer default '1260', - bad_password_count integer default NULL, - logon_count integer default '0', - logon_hours varchar(42) default NULL, - UNIQUE (username), - UNIQUE (nt_username) -); Copied: tags/pdbsql-0.2-samba-3.0.23/docs/pgsql.dump (from rev 68, trunk/docs/pgsql.dump) =================================================================== --- tags/pdbsql-0.2-samba-3.0.23/docs/pgsql.dump (rev 0) +++ tags/pdbsql-0.2-samba-3.0.23/docs/pgsql.dump 2006-08-20 20:09:14 UTC (rev 70) @@ -0,0 +1,39 @@ +/* + * Import this file with psql < pgsql.dump + */ +CREATE TABLE users ( + logon_time integer default NULL, + logoff_time integer default NULL, + kickoff_time integer default NULL, + pass_last_set_time integer default NULL, + pass_can_change_time integer default '0', + pass_must_change_time integer default '2147483647', + username varchar(255) default NULL, + domain varchar(255) default NULL, + nt_username varchar(255) default NULL, + nt_fullname varchar(255) default NULL, + home_dir varchar(255) default NULL, + dir_drive varchar(4) default NULL, + logon_script varchar(255) default NULL, + profile_path varchar(255) default NULL, + acct_desc varchar(255) default NULL, + workstations varchar(255) default NULL, + unknown_str varchar(255) default NULL, + munged_dial varchar(255) default NULL, + uid SERIAL NOT NULL PRIMARY KEY, + gid integer default NULL, + user_sid varchar(255) default NULL, + group_sid varchar(255) default NULL, + lm_pw varchar(255) default NULL, + nt_pw varchar(255) default NULL, + acct_ctrl integer default '528', + logon_divs integer default '168', + hours_len integer default '21', + unknown_6 integer default '1260', + bad_password_count integer default NULL, + logon_count integer default '0', + logon_hours varchar(42) default NULL, + password_history text default NULL, + UNIQUE (username), + UNIQUE (nt_username) +); Deleted: tags/pdbsql-0.2-samba-3.0.23/pdb_mysql.c =================================================================== --- trunk/pdb_mysql.c 2006-08-20 10:44:44 UTC (rev 67) +++ tags/pdbsql-0.2-samba-3.0.23/pdb_mysql.c 2006-08-20 20:09:14 UTC (rev 70) @@ -1,583 +0,0 @@ -/* - * MySQL password backend for samba - * Copyright (C) Jelmer Vernooij 2002-2004 - * Copyright (C) Wilco Baan Hofman 2006 - * - * 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 "pdb_sql.h" -#include <mysql.h> -#include <errmsg.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 pdb_mysql_connect(struct pdb_mysql_data *data) { - /* Connect to mysql database */ - 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; -} - -static NTSTATUS row_to_sam_account(MYSQL_RES * r, struct samu * u) -{ - MYSQL_ROW row; - unsigned char pwd[16]; - unsigned int num_fields; - DOM_SID sid; - - num_fields = mysql_num_fields(r); - row = mysql_fetch_row(r); - if (!row) { - DEBUG(10, ("empty result")); - 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], pwd)) - pdb_set_lanman_passwd(u, pwd, PDB_SET); - if (pdb_gethexpwd(row[21], pwd)) - pdb_set_nt_passwd(u, pwd, 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, uint32 acb_mask) -{ - struct pdb_mysql_data *data = - (struct pdb_mysql_data *) methods->private_data; - char *query; - int mysql_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); - - mysql_ret = mysql_query(data->handle, query); - - /* [SYN] If the server has gone away, reconnect and retry */ - if (mysql_ret && mysql_errno(data->handle) == CR_SERVER_GONE_ERROR) { - DEBUG(5, ("MySQL server has gone away, reconnecting and retrying.\n")); - - /* [SYN] Reconnect */ - if (!NT_STATUS_IS_OK(pdb_mysql_connect(data))) { - DEBUG(0, ("Error: Lost connection to MySQL server\n")); - talloc_free(query); - return NT_STATUS_UNSUCCESSFUL; - } - /* [SYN] Retry */ - mysql_ret = mysql_query(data->handle, query); - } - - talloc_free(query); - - if (mysql_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 struct samu from the list (next in line) - *****************************************************************/ - -static NTSTATUS mysqlsam_getsampwent(struct pdb_methods *methods, struct samu * 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, struct samu * 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: struct samu 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); - - /* [SYN] If the server has gone away, reconnect and retry */ - if (mysql_ret && mysql_errno(data->handle) == CR_SERVER_GONE_ERROR) { - DEBUG(5, ("MySQL server has gone away, reconnecting and retrying.\n")); - - /* [SYN] Reconnect */ - if (!NT_STATUS_IS_OK(pdb_mysql_connect(data))) { - DEBUG(0, ("Error: Lost connection to MySQL server\n")); - talloc_free(query); - return NT_STATUS_UNSUCCESSFUL; - } - /* [SYN] Retry */ - 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, struct samu * 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, struct samu * 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, - struct samu * sam_pass) -{ - const char *sname = pdb_get_username(sam_pass); - char *esc; - char *query; - int mysql_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); - - mysql_ret = mysql_query(data->handle, query); - - /* [SYN] If the server has gone away, reconnect and retry */ - if (mysql_ret && mysql_errno(data->handle) == CR_SERVER_GONE_ERROR) { - DEBUG(5, ("MySQL server has gone away, reconnecting and retrying.\n")); - - /* [SYN] Reconnect */ - if (!NT_STATUS_IS_OK(pdb_mysql_connect(data))) { - DEBUG(0, ("Error: Lost connection to MySQL server\n")); - talloc_free(query); - return NT_STATUS_UNSUCCESSFUL; - } - /* [SYN] Retry */ - mysql_ret = mysql_query(data->handle, query); - } - - talloc_free(query); - - if (mysql_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, - struct samu * newpwd, char isupdate) -{ - struct pdb_mysql_data *data; - char *query; - int mysql_ret; - - 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 */ - mysql_ret = mysql_query(data->handle, query); - - /* [SYN] If the server has gone away, reconnect and retry */ - if (mysql_ret && mysql_errno(data->handle) == CR_SERVER_GONE_ERROR) { - DEBUG(5, ("MySQL server has gone away, reconnecting and retrying.\n")); - - /* [SYN] Reconnect */ - if (!NT_STATUS_IS_OK(pdb_mysql_connect(data))) { - DEBUG(0, ("Error: Lost connection to MySQL server\n")); - talloc_free(query); - return NT_STATUS_UNSUCCESSFUL; - } - /* [SYN] Retry */ - mysql_ret = mysql_query(data->handle, query); - } - - if (mysql_ret) { - 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, struct samu * newpwd) -{ - return mysqlsam_replace_sam_account(methods, newpwd, 0); -} - -static NTSTATUS mysqlsam_update_sam_account(struct pdb_methods *methods, - struct samu * newpwd) -{ - return mysqlsam_replace_sam_account(methods, newpwd, 1); -} - -static BOOL mysqlsam_rid_algorithm (struct pdb_methods *pdb_methods) { - return True; -} -static BOOL mysqlsam_new_rid (struct pdb_methods *pdb_methods, uint32 *rid) { - return False; -} - -static NTSTATUS mysqlsam_init(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 ( !NT_STATUS_IS_OK(nt_status = make_pdb_method( 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; - (*pdb_method)->rid_algorithm = mysqlsam_rid_algorithm; - (*pdb_method)->new_rid = mysqlsam_new_rid; - - data = talloc(*pdb_method, 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; - } - - if (!NT_STATUS_IS_OK(pdb_mysql_connect(data))) { - return NT_STATUS_UNSUCCESSFUL; - } - - return NT_STATUS_OK; -} - -NTSTATUS init_module(void) -{ - return smb_register_passdb(PASSDB_INTERFACE_VERSION, "mysql", mysqlsam_init); -} - Copied: tags/pdbsql-0.2-samba-3.0.23/pdb_mysql.c (from rev 68, trunk/pdb_mysql.c) =================================================================== --- tags/pdbsql-0.2-samba-3.0.23/pdb_mysql.c (rev 0) +++ tags/pdbsql-0.2-samba-3.0.23/pdb_mysql.c 2006-08-20 20:09:14 UTC (rev 70) @@ -0,0 +1,597 @@ +/* + * MySQL password backend for samba + * Copyright (C) Jelmer Vernooij 2002-2004 + * Copyright (C) Wilco Baan Hofman 2006 + * + * 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 "pdb_sql.h" +#include <mysql.h> +#include <errmsg.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 pdb_mysql_connect(struct pdb_mysql_data *data) { + /* Connect to mysql database */ + 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; +} + +static NTSTATUS row_to_sam_account(MYSQL_RES * r, struct samu * u) +{ + MYSQL_ROW row; + unsigned char pwd[16]; + unsigned int num_fields; + DOM_SID sid; + + num_fields = mysql_num_fields(r); + row = mysql_fetch_row(r); + if (!row) { + DEBUG(10, ("empty result")); + 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], pwd)) + pdb_set_lanman_passwd(u, pwd, PDB_SET); + if (pdb_gethexpwd(row[21], pwd)) + pdb_set_nt_passwd(u, pwd, 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); + pdb_set_hours(u, (uint8 *)row[29], PDB_SET); + + if (row[30]) { + uint8 pwhist[MAX_PW_HISTORY_LEN * PW_HISTORY_ENTRY_LEN]; + int i; + + memset(&pwhist, 0, MAX_PW_HISTORY_LEN * PW_HISTORY_ENTRY_LEN); + for (i = 0; i < MAX_PW_HISTORY_LEN && i < strlen(row[30])/64; i++) { + pdb_gethexpwd(&(row[30])[i*64], &pwhist[i*PW_HISTORY_ENTRY_LEN]); + pdb_gethexpwd(&(row[30])[i*64+32], + &pwhist[i*PW_HISTORY_ENTRY_LEN+PW_HISTORY_SALT_LEN]); + } + pdb_set_pw_history(u, pwhist, strlen(row[30])/64, PDB_SET); + } + + return NT_STATUS_OK; +} + +static NTSTATUS mysqlsam_setsampwent(struct pdb_methods *methods, BOOL update, uint32 acb_mask) +{ + struct pdb_mysql_data *data = + (struct pdb_mysql_data *) methods->private_data; + char *query; + int mysql_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); + + mysql_ret = mysql_query(data->handle, query); + + /* [SYN] If the server has gone away, reconnect and retry */ + if (mysql_ret && mysql_errno(data->handle) == CR_SERVER_GONE_ERROR) { + DEBUG(5, ("MySQL server has gone away, reconnecting and retrying.\n")); + + /* [SYN] Reconnect */ + if (!NT_STATUS_IS_OK(pdb_mysql_connect(data))) { + DEBUG(0, ("Error: Lost connection to MySQL server\n")); + talloc_free(query); + return NT_STATUS_UNSUCCESSFUL; + } + /* [SYN] Retry */ + mysql_ret = mysql_query(data->handle, query); + } + + talloc_free(query); + + if (mysql_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 struct samu from the list (next in line) + *****************************************************************/ + +static NTSTATUS mysqlsam_getsampwent(struct pdb_methods *methods, struct samu * 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, struct samu * 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: struct samu 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); + + /* [SYN] If the server has gone away, reconnect and retry */ + if (mysql_ret && mysql_errno(data->handle) == CR_SERVER_GONE_ERROR) { + DEBUG(5, ("MySQL server has gone away, reconnecting and retrying.\n")); + + /* [SYN] Reconnect */ + if (!NT_STATUS_IS_OK(pdb_mysql_connect(data))) { + DEBUG(0, ("Error: Lost connection to MySQL server\n")); + talloc_free(query); + return NT_STATUS_UNSUCCESSFUL; + } + /* [SYN] Retry */ + 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, struct samu * 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, struct samu * 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, + struct samu * sam_pass) +{ + const char *sname = pdb_get_username(sam_pass); + char *esc; + char *query; + int mysql_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); + + mysql_ret = mysql_query(data->handle, query); + + /* [SYN] If the server has gone away, reconnect and retry */ + if (mysql_ret && mysql_errno(data->handle) == CR_SERVER_GONE_ERROR) { + DEBUG(5, ("MySQL server has gone away, reconnecting and retrying.\n")); + + /* [SYN] Reconnect */ + if (!NT_STATUS_IS_OK(pdb_mysql_connect(data))) { + DEBUG(0, ("Error: Lost connection to MySQL server\n")); + talloc_free(query); + return NT_STATUS_UNSUCCESSFUL; + } + /* [SYN] Retry */ + mysql_ret = mysql_query(data->handle, query); + } + + talloc_free(query); + + if (mysql_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, + struct samu * newpwd, char isupdate) +{ + struct pdb_mysql_data *data; + char *query; + int mysql_ret; + + 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 */ + mysql_ret = mysql_query(data->handle, query); + + /* [SYN] If the server has gone away, reconnect and retry */ + if (mysql_ret && mysql_errno(data->handle) == CR_SERVER_GONE_ERROR) { + DEBUG(5, ("MySQL server has gone away, reconnecting and retrying.\n")); + + /* [SYN] Reconnect */ + if (!NT_STATUS_IS_OK(pdb_mysql_connect(data))) { + DEBUG(0, ("Error: Lost connection to MySQL server\n")); + talloc_free(query); + return NT_STATUS_UNSUCCESSFUL; + } + /* [SYN] Retry */ + mysql_ret = mysql_query(data->handle, query); + } + + if (mysql_ret) { + 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, struct samu * newpwd) +{ + return mysqlsam_replace_sam_account(methods, newpwd, 0); +} + +static NTSTATUS mysqlsam_update_sam_account(struct pdb_methods *methods, + struct samu * newpwd) +{ + return mysqlsam_replace_sam_account(methods, newpwd, 1); +} + +static BOOL mysqlsam_rid_algorithm (struct pdb_methods *pdb_methods) { + return True; +} +static BOOL mysqlsam_new_rid (struct pdb_methods *pdb_methods, uint32 *rid) { + return False; +} + +static NTSTATUS mysqlsam_init(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 ( !NT_STATUS_IS_OK(nt_status = make_pdb_method( 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; + (*pdb_method)->rid_algorithm = mysqlsam_rid_algorithm; + (*pdb_method)->new_rid = mysqlsam_new_rid; + + data = talloc(*pdb_method, 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; + } + + if (!NT_STATUS_IS_OK(pdb_mysql_connect(data))) { + return NT_STATUS_UNSUCCESSFUL; + } + + return NT_STATUS_OK; +} + +NTSTATUS init_module(void) +{ + return smb_register_passdb(PASSDB_INTERFACE_VERSION, "mysql", mysqlsam_init); +} + Deleted: tags/pdbsql-0.2-samba-3.0.23/pdb_pgsql.c =================================================================== --- trunk/pdb_pgsql.c 2006-08-20 10:44:44 UTC (rev 67) +++ tags/pdbsql-0.2-samba-3.0.23/pdb_pgsql.c 2006-08-20 20:09:14 UTC (rev 70) @@ -1,605 +0,0 @@ -/* - * PostgresSQL password backend for samba - * Copyright (C) Hamish Friedlander 2003 - * Copyright (C) Jelmer Vernooij 2004-2006 - * Copyright (C) Wilco Baan Hofman 2006 - * - * 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 "pdb_sql.h" -#include <libpq-fe.h> - -/* To prevent duplicate defines */ -#undef PACKAGE_BUGREPORT -#undef PACKAGE_NAME -#undef PACKAGE_STRING -#undef PACKAGE_VERSION -#undef PACKAGE_TARNAME -#include <pg_config.h> - -#define CONFIG_HOST_DEFAULT "localhost" -#define CONFIG_USER_DEFAULT "samba" -#define CONFIG_PASS_DEFAULT "" -#define CONFIG_PORT_DEFAULT DEF_PGPORT_STR -#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 ; - -#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, struct samu *u ) -{ - unsigned char temp[16]; - 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 = (unsigned char *)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, uint32 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 struct samu from the list (next in line) - *****************************************************************/ - -static NTSTATUS pgsqlsam_getsampwent( struct pdb_methods *methods, struct samu *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, struct samu *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: struct samu 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, struct samu *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, struct samu *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 struct samu - ****************************************************************************/ - -static NTSTATUS pgsqlsam_delete_sam_account( struct pdb_methods *methods, struct samu *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, struct samu *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 ) - { - 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, struct samu *newpwd ) -{ - return pgsqlsam_replace_sam_account( methods, newpwd, 0 ) ; -} - -static NTSTATUS pgsqlsam_update_sam_account ( struct pdb_methods *methods, struct samu *newpwd ) -{ - return pgsqlsam_replace_sam_account( methods, newpwd, 1 ) ; -} - -static BOOL pgsqlsam_rid_algorithm (struct pdb_methods *pdb_methods) { - return True; -} -static BOOL pgsqlsam_new_rid (struct pdb_methods *pdb_methods, uint32 *rid) { - return False; -} - -static NTSTATUS pgsqlsam_init (struct pdb_methods **pdb_method, const char *location ) -{ - NTSTATUS nt_status; - struct pdb_pgsql_data *data = malloc_p(struct pdb_pgsql_data); - - if ( !NT_STATUS_IS_OK(nt_status = make_pdb_method( 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; - (*pdb_method)->rid_algorithm = pgsqlsam_rid_algorithm; - (*pdb_method)->new_rid = pgsqlsam_new_rid; - - - (*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 initialized\n") ) ; - return NT_STATUS_OK; -} - -NTSTATUS init_module(void) -{ - return smb_register_passdb( PASSDB_INTERFACE_VERSION, "pgsql", pgsqlsa... [truncated message content] |
