Menu
▾
▴
[pdbsql-cvs] SF.net SVN: pdbsql:[177] branches/pdbsql_36
|
From: <he...@us...> - 2013-05-10 19:27:17
|
Revision: 177
http://sourceforge.net/p/pdbsql/code/177
Author: herwinw
Date: 2013-05-10 19:27:13 +0000 (Fri, 10 May 2013)
Log Message:
-----------
Lot of whitespace fixes
* Removed trailing whitespace (which will be great if we ever want to import the project into git)
* Uniformized on tabs instead of a mix of tabs and spaces
* Some reindenting (mainly just a gg=G in vim)
Modified Paths:
--------------
branches/pdbsql_36/pdb_multi.c
branches/pdbsql_36/pdb_mysql.c
branches/pdbsql_36/pdb_pgsql.c
branches/pdbsql_36/pdb_sql.c
branches/pdbsql_36/pdb_sql.h
Modified: branches/pdbsql_36/pdb_multi.c
===================================================================
--- branches/pdbsql_36/pdb_multi.c 2013-05-03 17:26:24 UTC (rev 176)
+++ branches/pdbsql_36/pdb_multi.c 2013-05-10 19:27:13 UTC (rev 177)
@@ -66,7 +66,7 @@
if (res == true)
return true;
}
-
+
return false;
}
@@ -86,8 +86,8 @@
}
static bool multisam_search_users(struct pdb_methods *methods,
- struct pdb_search *search,
- uint32 acct_flags)
+ struct pdb_search *search,
+ uint32 acct_flags)
{
struct multisam_search_state *state;
struct multisam_data *data;
@@ -136,16 +136,16 @@
static bool multisam_new_rid(struct pdb_methods *methods,
uint32 *rid,
- short backend)
+ short backend)
{
short i;
struct multisam_data *data;
-
+
if (!methods) return false;
data = (struct multisam_data *)methods->private_data;
if (!data) return false;
-
-
+
+
/* 250 tries.. Andrew Bartlett picked the number. */
for (i = 0; *rid == 0 && i < 250; i++) {
if (!data->methods[backend]->new_rid(data->methods[backend], rid)) {
@@ -156,24 +156,24 @@
*rid = 0;
} */
}
-
+
if (*rid == 0) {
return false;
}
-
+
return true;
}
#if 0
static bool multisam_search_groups(struct pdb_methods *methods,
- struct pdb_search *search)
+ struct pdb_search *search)
{
return false;
}
static bool multisam_search_aliases(struct pdb_methods *methods,
- struct pdb_search *search,
- const struct dom_sid *sid)
+ struct pdb_search *search,
+ const struct dom_sid *sid)
{
return false;
}
@@ -200,76 +200,76 @@
#if PASSDB_INTERFACE_VERSION < 19
/* Tries uid_to_rid on every backend until one succeeds, returns true on success */
static bool multisam_uid_to_rid(struct pdb_methods *methods, uid_t uid,
- uint32 *rid)
+ uint32 *rid)
{
short i;
struct multisam_data *data;
bool rv;
-
+
if (!methods) return false;
data = (struct multisam_data *)methods->private_data;
if (!data) return false;
-
+
for (i = 0; i < data->num_backends; i++) {
rv = data->methods[i]->uid_to_rid(data->methods[i], uid, rid);
if (rv == true) {
return true;
}
}
-
+
return false;
}
#endif
/* Tries gid_to_sid on every backend until one succeeds, returns true on success */
static bool multisam_gid_to_sid(struct pdb_methods *methods, gid_t gid,
- struct dom_sid *sid)
+ struct dom_sid *sid)
{
short i;
struct multisam_data *data;
bool rv;
-
+
if (!methods) return false;
data = (struct multisam_data *)methods->private_data;
if (!data) return false;
-
+
for (i = 0; i < data->num_backends; i++) {
rv = data->methods[i]->gid_to_sid(data->methods[i], gid, sid);
if (rv == true) {
return true;
}
}
-
+
return false;
}
/* Tries sid_to_id on every backend until one succeeds, returns true on success */
static bool multisam_sid_to_id(struct pdb_methods *methods,
- const struct dom_sid *sid,
- union unid_t *id, enum lsa_SidType *type)
+ const struct dom_sid *sid,
+ union unid_t *id, enum lsa_SidType *type)
{
short i;
struct multisam_data *data;
bool rv;
-
+
if (!methods) return false;
data = (struct multisam_data *)methods->private_data;
if (!data) return false;
-
+
for (i = 0; i < data->num_backends; i++) {
rv = data->methods[i]->sid_to_id(data->methods[i], sid, id, type);
if (rv == true) {
return true;
}
}
-
+
return false;
}
#if 0
static NTSTATUS multisam_set_unix_primary_group(struct pdb_methods *methods,
- TALLOC_CTX *mem_ctx,
- struct samu *sampass)
+ TALLOC_CTX *mem_ctx,
+ struct samu *sampass)
{
DEBUG(1, ("This function is not implemented yet\n"));
return NT_STATUS_NOT_IMPLEMENTED;
@@ -281,9 +281,9 @@
uint32 acb_info, uint32 *rid)
{
struct multisam_data *data;
-
+
SET_DATA(data, methods);
-
+
DEBUG(0, ("Creating user in first multisam backend\n"));
/* XXX Might be nice to allow separations of machine accounts here? */
@@ -299,8 +299,8 @@
multisam_new_rid(methods, rid, 0);
}
#endif
-
- return data->methods[0]->create_user(data->methods[0], tmp_ctx, name, acb_info, rid);
+
+ return data->methods[0]->create_user(data->methods[0], tmp_ctx, name, acb_info, rid);
}
static NTSTATUS multisam_delete_user(struct pdb_methods *methods,
@@ -311,7 +311,7 @@
struct multisam_data *data;
SET_DATA(data, methods);
-
+
for (i = 0; i < data->num_backends; i++) {
if (NT_STATUS_IS_OK(data->methods[i]->delete_user(data->methods[i], mem_ctx, sam_acct))) {
return NT_STATUS_OK;
@@ -323,11 +323,11 @@
#if 0
static NTSTATUS multisam_enum_group_memberships(struct pdb_methods *methods,
- TALLOC_CTX *mem_ctx,
- struct samu *user,
- struct dom_sid **pp_sids,
- gid_t **pp_gids,
- size_t *p_num_groups)
+ TALLOC_CTX *mem_ctx,
+ struct samu *user,
+ struct dom_sid **pp_sids,
+ gid_t **pp_gids,
+ size_t *p_num_groups)
{
DEBUG(1, ("This function is not implemented yet\n"));
return NT_STATUS_NOT_IMPLEMENTED;
@@ -346,8 +346,8 @@
static NTSTATUS multisam_delete_dom_group(struct pdb_methods *methods,
- TALLOC_CTX *mem_ctx,
- uint32 rid)
+ TALLOC_CTX *mem_ctx,
+ uint32 rid)
{
DEBUG(1, ("This function is not implemented yet\n"));
return NT_STATUS_NOT_IMPLEMENTED;
@@ -361,21 +361,21 @@
}
static NTSTATUS multisam_getgrsid(struct pdb_methods *methods, GROUP_MAP *map,
- struct dom_sid sid)
+ struct dom_sid sid)
{
DEBUG(1, ("This function is not implemented yet\n"));
return NT_STATUS_NOT_IMPLEMENTED;
}
static NTSTATUS multisam_getgrgid(struct pdb_methods *methods, GROUP_MAP *map,
- gid_t gid)
+ gid_t gid)
{
DEBUG(1, ("This function is not implemented yet\n"));
return NT_STATUS_NOT_IMPLEMENTED;
}
static NTSTATUS multisam_getgrnam(struct pdb_methods *methods, GROUP_MAP *map,
- const char *name)
+ const char *name)
{
DEBUG(1, ("This function is not implemented yet\n"));
return NT_STATUS_NOT_IMPLEMENTED;
@@ -396,12 +396,12 @@
return data->methods[i]->add_group_mapping_entry(data->methods[i], map);
}
}
-
+
return NT_STATUS_NOT_IMPLEMENTED;
}
static NTSTATUS multisam_update_group_mapping_entry(struct pdb_methods *methods,
- GROUP_MAP *map)
+ GROUP_MAP *map)
{
short i;
struct multisam_data *data;
@@ -421,7 +421,7 @@
}
static NTSTATUS multisam_delete_group_mapping_entry(struct pdb_methods *methods,
- struct dom_sid sid)
+ struct dom_sid sid)
{
short i;
struct multisam_data *data;
@@ -442,9 +442,9 @@
#if 0
static NTSTATUS multisam_enum_group_mapping(struct pdb_methods *methods,
- const struct dom_sid *sid, enum SID_NAME_USE sid_name_use,
- GROUP_MAP **pp_rmap, size_t *p_num_entries,
- bool unix_only)
+ const struct dom_sid *sid, enum SID_NAME_USE sid_name_use,
+ GROUP_MAP **pp_rmap, size_t *p_num_entries,
+ bool unix_only)
{
DEBUG(1, ("This function is not implemented yet\n"));
return NT_STATUS_NOT_IMPLEMENTED;
@@ -458,64 +458,64 @@
}
static NTSTATUS multisam_create_alias(struct pdb_methods *methods,
- const char *name, uint32 *rid)
+ const char *name, uint32 *rid)
{
DEBUG(1, ("This function is not implemented yet\n"));
return NT_STATUS_NOT_IMPLEMENTED;
}
static NTSTATUS multisam_delete_alias(struct pdb_methods *methods,
- const struct dom_sid *sid)
+ const struct dom_sid *sid)
{
DEBUG(1, ("This function is not implemented yet\n"));
return NT_STATUS_NOT_IMPLEMENTED;
}
static NTSTATUS multisam_get_aliasinfo(struct pdb_methods *methods,
- const struct dom_sid *sid,
- struct acct_info *info)
+ const struct dom_sid *sid,
+ struct acct_info *info)
{
DEBUG(1, ("This function is not implemented yet\n"));
return NT_STATUS_NOT_IMPLEMENTED;
}
static NTSTATUS multisam_set_aliasinfo(struct pdb_methods *methods,
- const struct dom_sid *sid,
- struct acct_info *info)
+ const struct dom_sid *sid,
+ struct acct_info *info)
{
DEBUG(1, ("This function is not implemented yet\n"));
return NT_STATUS_NOT_IMPLEMENTED;
}
static NTSTATUS multisam_add_aliasmem(struct pdb_methods *methods,
- const struct dom_sid *alias, const struct dom_sid *member)
+ const struct dom_sid *alias, const struct dom_sid *member)
{
DEBUG(1, ("This function is not implemented yet\n"));
return NT_STATUS_NOT_IMPLEMENTED;
}
static NTSTATUS multisam_del_aliasmem(struct pdb_methods *methods,
- const struct dom_sid *alias, const struct dom_sid *member)
+ const struct dom_sid *alias, const struct dom_sid *member)
{
DEBUG(1, ("This function is not implemented yet\n"));
return NT_STATUS_NOT_IMPLEMENTED;
}
NTSTATUS multisam_enum_aliasmem(struct pdb_methods *methods,
- const struct dom_sid *alias, struct dom_sid **pp_members,
- size_t *p_num_members)
+ const struct dom_sid *alias, struct dom_sid **pp_members,
+ size_t *p_num_members)
{
DEBUG(1, ("This function is not implemented yet\n"));
return NT_STATUS_NOT_IMPLEMENTED;
}
static NTSTATUS multisam_alias_memberships(struct pdb_methods *methods,
- TALLOC_CTX *mem_ctx,
- const struct dom_sid *domain_sid,
- const struct dom_sid *members,
- size_t num_members,
- uint32 **pp_alias_rids,
- size_t *p_num_alias_rids)
+ TALLOC_CTX *mem_ctx,
+ const struct dom_sid *domain_sid,
+ const struct dom_sid *members,
+ size_t num_members,
+ uint32 **pp_alias_rids,
+ size_t *p_num_alias_rids)
{
DEBUG(1, ("This function is not implemented yet\n"));
return NT_STATUS_NOT_IMPLEMENTED;
@@ -531,7 +531,7 @@
NTSTATUS ret;
SET_DATA(data, methods);
-
+
DEBUG(1, ("Setsampwent executing..\n"));
for (i = 0; i < data->num_backends; i++) {
@@ -540,7 +540,7 @@
return ret;
}
}
-
+
return NT_STATUS_OK;
}
@@ -558,7 +558,7 @@
if (!data) return;
DEBUG(1, ("Freeing pwent results on multisam backends\n"));
-
+
for (i = 0; i < data->num_backends; i++) {
data->methods[i]->endsampwent(data->methods[i]);
}
@@ -573,16 +573,16 @@
short i;
struct multisam_data *data;
NTSTATUS ret;
-
+
SET_DATA(data, methods);
-
+
for (i = 0; i < data->num_backends; i++) {
ret = data->methods[i]->getsampwent(data->methods[i], user);
if (NT_STATUS_IS_OK(ret)) {
return ret;
}
}
-
+
return NT_STATUS_INVALID_PARAMETER;
}
#endif
@@ -592,14 +592,14 @@
******************************************************************/
/* Tries to find the account in all backends until it succeeds or runs out of backends */
static NTSTATUS multisam_getsampwnam(struct pdb_methods *methods, struct samu * user,
- const char *sname)
+ const char *sname)
{
short i;
struct multisam_data *data;
NTSTATUS ret;
SET_DATA(data, methods);
-
+
for (i = 0; i < data->num_backends; i++) {
DEBUG(5, ("Looking for user in %s\n", data->names[i]));
if (NT_STATUS_IS_OK(ret = data->methods[i]->getsampwnam(data->methods[i], user, sname))) {
@@ -616,14 +616,14 @@
**************************************************************************/
/* Tries to find the account in all backends until it succeeds or runs out of backends */
static NTSTATUS multisam_getsampwsid(struct pdb_methods *methods, struct samu * user,
- const struct dom_sid * sid)
+ const struct dom_sid * sid)
{
short i;
struct multisam_data *data;
NTSTATUS ret;
SET_DATA(data, methods);
-
+
for (i = 0; i < data->num_backends; i++) {
DEBUG(5, ("Looking for user in %s\n", data->names[i]));
if (NT_STATUS_IS_OK(ret = data->methods[i]->getsampwsid(data->methods[i], user, sid))) {
@@ -635,9 +635,9 @@
}
/***************************************************************************
- Delete a sam account
+ Delete a sam account
****************************************************************************/
-/* Tries to delete the user from all backends, if one succeeds we're happy */
+/* Tries to delete the user from all backends, if one succeeds we're happy */
static NTSTATUS multisam_delete_sam_account(struct pdb_methods *methods,
struct samu * sam_pass)
{
@@ -645,7 +645,7 @@
struct multisam_data *data;
SET_DATA(data, methods);
-
+
for (i = 0; i < data->num_backends; i++) {
if (NT_STATUS_IS_OK(data->methods[i]->delete_sam_account(data->methods[i], sam_pass))) {
return NT_STATUS_OK;
@@ -659,9 +659,9 @@
static NTSTATUS multisam_add_sam_account(struct pdb_methods *methods, struct samu * newpwd)
{
struct multisam_data *data;
-
+
SET_DATA(data, methods);
-
+
DEBUG(0, ("Creating sam account in first multisam backend\n"));
return data->methods[0]->add_sam_account(data->methods[0], newpwd);
}
@@ -673,7 +673,7 @@
short i;
struct multisam_data *data;
NTSTATUS ret;
-
+
SET_DATA(data, methods);
DEBUG(5, ("Updating sam account.\n"));
for (i = 0; i < data->num_backends; i++) {
@@ -689,7 +689,7 @@
short i;
struct multisam_data *data;
NTSTATUS ret;
-
+
SET_DATA(data, methods);
DEBUG(5, ("Renaming sam account.\n"));
for (i = 0; i < data->num_backends; i++) {
@@ -704,37 +704,37 @@
#if 0
static NTSTATUS multisam_lookup_rids(struct pdb_methods *methods,
- const struct dom_sid *domain_sid,
- int num_rids,
- uint32 *rids,
- const char **names,
- uint32 *attrs)
+ const struct dom_sid *domain_sid,
+ int num_rids,
+ uint32 *rids,
+ const char **names,
+ uint32 *attrs)
{
return NT_STATUS_NOT_IMPLEMENTED;
}
static NTSTATUS multisam_create_dom_group(struct pdb_methods *methods,
- TALLOC_CTX *mem_ctx,
- const char *name,
- uint32 *rid)
+ TALLOC_CTX *mem_ctx,
+ const char *name,
+ uint32 *rid)
{
DEBUG(1, ("This function is not implemented yet\n"));
return NT_STATUS_NOT_IMPLEMENTED;
}
static NTSTATUS multisam_add_groupmem(struct pdb_methods *methods,
- TALLOC_CTX *mem_ctx,
- uint32 group_rid,
- uint32 member_rid)
+ TALLOC_CTX *mem_ctx,
+ uint32 group_rid,
+ uint32 member_rid)
{
DEBUG(1, ("This function is not implemented yet\n"));
return NT_STATUS_NOT_IMPLEMENTED;
}
static NTSTATUS multisam_del_groupmem(struct pdb_methods *methods,
- TALLOC_CTX *mem_ctx,
- uint32 group_rid,
- uint32 member_rid)
+ TALLOC_CTX *mem_ctx,
+ uint32 group_rid,
+ uint32 member_rid)
{
DEBUG(1, ("This function is not implemented yet\n"));
return NT_STATUS_NOT_IMPLEMENTED;
@@ -771,7 +771,7 @@
if (multisam_debug_level == -1) {
multisam_debug_level = DBGC_ALL;
DEBUG(0,
- ("multisam: Couldn't register custom debugging class!\n"));
+ ("multisam: Couldn't register custom debugging class!\n"));
}
if ( !NT_STATUS_IS_OK(nt_status = make_pdb_method( pdb_method )) ) {
@@ -786,7 +786,7 @@
DEBUG(0, ("Could not create default pdb_method\n"));
return nt_status;
}
-
+
(*pdb_method)->name = "multisam";
/* Mandatory implementation */
@@ -814,8 +814,8 @@
#endif
(*pdb_method)->gid_to_sid = multisam_gid_to_sid;
(*pdb_method)->sid_to_id = multisam_sid_to_id;
-
+
/* Not yet implemented here */
#if 0
(*pdb_method)->update_login_attempts = multisam_update_login_attempts;
@@ -879,10 +879,10 @@
DEBUG(0, ("Unable to find multisam backend %d: %s\n", i, data->names[i]));
return NT_STATUS_UNSUCCESSFUL;
}
-
+
DEBUG(2, ("Found entry point. Loading multisam backend %d: %s\n", i, data->names[i]));
nt_status = entry->init(&data->methods[i], data->locations[i]);
-
+
if (NT_STATUS_IS_ERR(nt_status)) {
return nt_status;
}
@@ -893,11 +893,11 @@
(*pdb_method)->update_group_mapping_entry = multisam_update_group_mapping_entry;
if (!IS_DEFAULT(data->methods[i], delete_group_mapping_entry))
(*pdb_method)->delete_group_mapping_entry = multisam_delete_group_mapping_entry;
- }
+ }
return NT_STATUS_OK;
}
-NTSTATUS init_samba_module(void)
+NTSTATUS init_samba_module(void)
{
return smb_register_passdb(PASSDB_INTERFACE_VERSION, "multi", multisam_init);
}
Modified: branches/pdbsql_36/pdb_mysql.c
===================================================================
--- branches/pdbsql_36/pdb_mysql.c 2013-05-03 17:26:24 UTC (rev 176)
+++ branches/pdbsql_36/pdb_mysql.c 2013-05-10 19:27:13 UTC (rev 177)
@@ -31,11 +31,11 @@
#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"
+#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;
@@ -51,17 +51,17 @@
#define SET_DATA(data,methods) { \
if(!methods){ \
DEBUG(0, ("invalid methods!\n")); \
- return NT_STATUS_INVALID_PARAMETER; \
+ 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; \
+ return NT_STATUS_INVALID_HANDLE; \
} \
}
#define config_value( data, name, default_value ) \
- lp_parm_const_string( GLOBAL_SECTION_SNUM, (data)->location, name, default_value )
+ lp_parm_const_string( GLOBAL_SECTION_SNUM, (data)->location, name, default_value )
static long xatol(const char *d)
{
@@ -76,16 +76,16 @@
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)),
+ 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)));
+ ("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;
}
@@ -95,7 +95,7 @@
DEBUG(5, ("Executing query %s\n", query));
res = mysql_query(data->handle, query);
-
+
/* [SYN] If the server has gone away, reconnect and retry */
if (res && mysql_errno(data->handle) == CR_SERVER_GONE_ERROR) {
DEBUG(5, ("MySQL server has gone away, reconnecting and retrying.\n"));
@@ -112,7 +112,7 @@
if (res)
{
DEBUG(0,
- ("Error while executing MySQL query %s\n",
+ ("Error while executing MySQL query %s\n",
mysql_error(data->handle)));
}
@@ -179,15 +179,15 @@
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], xatol(row[25]), 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],
+ 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);
@@ -197,7 +197,7 @@
}
static NTSTATUS mysqlsam_select_by_field(struct pdb_methods * methods, struct samu * user,
- enum sql_search_field field, const char *sname)
+ enum sql_search_field field, const char *sname)
{
char *esc_sname;
char *query;
@@ -213,14 +213,14 @@
esc_sname = talloc_array(mem_ctx, char, strlen(sname) * 2 + 1);
if (!esc_sname) {
talloc_free(mem_ctx);
- return NT_STATUS_NO_MEMORY;
+ 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));
+ strlen(tmp_sname));
talloc_free(tmp_sname);
@@ -240,7 +240,7 @@
talloc_free(mem_ctx);
return NT_STATUS_UNSUCCESSFUL;
}
-
+
talloc_free(query);
res = mysql_store_result(data->handle);
if (res == NULL) {
@@ -249,7 +249,7 @@
talloc_free(mem_ctx);
return NT_STATUS_UNSUCCESSFUL;
}
-
+
ret = row_to_sam_account(res, user);
mysql_free_result(res);
talloc_free(mem_ctx);
@@ -262,7 +262,7 @@
******************************************************************/
static NTSTATUS mysqlsam_getsampwnam(struct pdb_methods *methods, struct samu * user,
- const char *sname)
+ const char *sname)
{
struct pdb_mysql_data *data;
@@ -283,7 +283,7 @@
**************************************************************************/
static NTSTATUS mysqlsam_getsampwsid(struct pdb_methods *methods, struct samu * user,
- const struct dom_sid * sid)
+ const struct dom_sid * sid)
{
struct pdb_mysql_data *data;
fstring sid_str;
@@ -292,12 +292,12 @@
sid_to_fstring(sid_str, sid);
/* sid_string_dbg(sid); */
-
+
return mysqlsam_select_by_field(methods, user, SQL_SEARCH_USER_SID, sid_str);
}
/***************************************************************************
- Delete a sam account
+ Delete a sam account
****************************************************************************/
static NTSTATUS mysqlsam_delete_sam_account(struct pdb_methods *methods,
@@ -329,18 +329,18 @@
}
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));
+ strlen(tmp_sname));
talloc_free(tmp_sname);
@@ -363,7 +363,7 @@
}
static NTSTATUS mysqlsam_replace_sam_account(struct pdb_methods *methods,
- struct samu * newpwd, char isupdate)
+ struct samu * newpwd, char isupdate)
{
struct pdb_mysql_data *data;
char *query;
@@ -384,8 +384,8 @@
query = sql_account_query_update(NULL, data->location, newpwd, isupdate);
if ( query == NULL ) /* Nothing to update. */
return NT_STATUS_OK;
-
-
+
+
if (pdb_mysql_query(data, query, &mysql_ret) == false)
{
talloc_free(query);
@@ -451,7 +451,7 @@
entry->account_name = talloc_strdup(search, row[6]);
entry->fullname = talloc_strdup(search, row[9]);
entry->description = talloc_strdup(search, row[14]);
-
+
state->current += 1;
if ((entry->account_name == NULL)) {
@@ -533,10 +533,10 @@
DEBUG(0,("mysqlsam: Couldn't register custom debugging class!\n"));
}
- if (!NT_STATUS_IS_OK(nt_status = make_pdb_method( pdb_method ))) {
+ if (!NT_STATUS_IS_OK(nt_status = make_pdb_method( pdb_method ))) {
return nt_status;
- }
-
+ }
+
(*pdb_method)->name = "mysqlsam";
(*pdb_method)->search_users = mysqlsam_search_users;
@@ -565,11 +565,11 @@
data->location = talloc_strdup(data, 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))));
+ ("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);
@@ -581,7 +581,7 @@
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;
}
@@ -589,7 +589,7 @@
return NT_STATUS_OK;
}
-NTSTATUS init_samba_module(void)
+NTSTATUS init_samba_module(void)
{
return smb_register_passdb(PASSDB_INTERFACE_VERSION, "mysql", mysqlsam_init);
}
Modified: branches/pdbsql_36/pdb_pgsql.c
===================================================================
--- branches/pdbsql_36/pdb_pgsql.c 2013-05-03 17:26:24 UTC (rev 176)
+++ branches/pdbsql_36/pdb_pgsql.c 2013-05-10 19:27:13 UTC (rev 177)
@@ -39,11 +39,11 @@
#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"
+#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"
static int pgsqlsam_debug_level = DBGC_ALL;
@@ -76,7 +76,7 @@
#define SET_DATA(data,methods) { \
if(!methods){ \
DEBUG(0, ("invalid methods!\n")); \
- return NT_STATUS_INVALID_PARAMETER; \
+ return NT_STATUS_INVALID_PARAMETER; \
} \
data = (struct pdb_pgsql_data *)methods->private_data; \
}
@@ -85,7 +85,7 @@
#define SET_DATA_QUIET(data,methods) { \
if(!methods){ \
DEBUG(0, ("invalid methods!\n")); \
- return; \
+ return; \
} \
data = (struct pdb_pgsql_data *)methods->private_data; \
}
@@ -97,10 +97,10 @@
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));
-
+ data->host, data->user, data->db, data->port));
+
/* Do the pgsql initialization */
handle = PQsetdbLogin(
data->host,
@@ -110,13 +110,13 @@
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;
}
@@ -159,7 +159,7 @@
if (PQgetisnull(r, row, col)) {
return 0;
}
-
+
return atol(PQgetvalue(r, row, col));
}
@@ -169,7 +169,7 @@
struct dom_sid sid;
unsigned char *hours;
size_t hours_len = 0;
-
+
if (row >= PQntuples(r)) {
return NT_STATUS_INVALID_PARAMETER;
}
@@ -192,14 +192,14 @@
pdb_set_workstations (u, PQgetvalue(r, row, 15), PDB_SET);
pdb_set_comment (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);
@@ -207,8 +207,8 @@
pdb_set_hours(u, hours, PQgetlong(r, row, 25), PDB_SET);
}
}
-
-
+
+
if (!PQgetisnull(r, row, 18)) {
string_to_sid(&sid, PQgetvalue(r, row, 18));
pdb_set_user_sid(u, &sid, PDB_SET);
@@ -218,7 +218,7 @@
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_lanman_passwd(u, temp, PDB_SET);
}
@@ -230,32 +230,32 @@
uint8 pwhist[MAX_PW_HISTORY_LEN * PW_HISTORY_ENTRY_LEN];
int i;
char *history_string = PQgetvalue(r, row, 30);
-
+
memset(&pwhist, 0, MAX_PW_HISTORY_LEN * PW_HISTORY_ENTRY_LEN);
for (i = 0; i < MAX_PW_HISTORY_LEN && i < strlen(history_string)/64; i++) {
pdb_gethexpwd(&(history_string)[i*64], &pwhist[i*PW_HISTORY_ENTRY_LEN]);
- pdb_gethexpwd(&(history_string)[i*64+32],
+ pdb_gethexpwd(&(history_string)[i*64+32],
&pwhist[i*PW_HISTORY_ENTRY_LEN+PW_HISTORY_SALT_LEN]);
}
pdb_set_pw_history(u, pwhist, strlen(history_string)/64, 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_select_by_field(struct pdb_methods *methods, struct samu *user, enum sql_search_field field, const char *sname)
{
struct pdb_pgsql_data *data;
-
+
char *esc;
char *query;
-
+
PGresult *result;
NTSTATUS retval;
@@ -265,22 +265,22 @@
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;
+ return NT_STATUS_NO_MEMORY;
}
-
+
/* tmp_sname = smb_xstrdup(sname); */
PQescapeString(esc, sname, strlen(sname));
query = sql_account_query_select(NULL, data->location, true, field, esc);
result = pdb_pgsql_query(data, query);
-
+
/* Result? */
if (result == NULL)
{
@@ -289,12 +289,12 @@
else
{
retval = row_to_sam_account(result, 0, user);
- PQclear(result);
+ PQclear(result);
}
-
+
talloc_free(esc);
talloc_free(query);
-
+
return retval;
}
@@ -308,9 +308,9 @@
size_t i, l;
char *lowercasename;
NTSTATUS result;
-
+
SET_DATA(data, methods);
-
+
if (!sname) {
DEBUG(0, ("invalid name specified"));
return NT_STATUS_INVALID_PARAMETER;
@@ -322,7 +322,7 @@
smb_ucs2_t uc = tolower_w(UCS2_CHAR(lowercasename[i]));
lowercasename[i] = UCS2_TO_CHAR(uc);
}
-
+
result = pgsqlsam_select_by_field(methods, user, SQL_SEARCH_USER_NAME, lowercasename);
talloc_free(lowercasename);
@@ -338,9 +338,9 @@
static NTSTATUS pgsqlsam_getsampwsid(struct pdb_methods *methods, struct samu *user, const struct dom_sid *sid)
{
fstring sid_str;
-
+
sid_to_fstring(sid_str, sid);
-
+
return pgsqlsam_select_by_field(methods, user, SQL_SEARCH_USER_SID, sid_str);
}
@@ -351,33 +351,33 @@
static NTSTATUS pgsqlsam_delete_sam_account(struct pdb_methods *methods, struct samu *sam_pass)
{
struct pdb_pgsql_data *data;
-
+
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));
query = sql_account_query_delete(NULL, data->location, esc);
result = pdb_pgsql_query(data, query);
-
+
if (result == NULL) {
retval = NT_STATUS_UNSUCCESSFUL;
} else {
@@ -385,10 +385,10 @@
retval = NT_STATUS_OK;
PQclear(result);
}
-
+
talloc_free(esc);
talloc_free(query);
-
+
return retval;
}
@@ -398,14 +398,14 @@
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;
@@ -419,14 +419,14 @@
/* Execute the query */
result = pdb_pgsql_query(data, query);
-
+
if (result == NULL) {
retval = NT_STATUS_INVALID_PARAMETER;
} else {
PQclear(result);
retval = NT_STATUS_OK;
}
-
+
talloc_free(query);
return retval;
}
@@ -442,17 +442,17 @@
}
#if PASSDB_INTERFACE_VERSION < 19
-static bool pgsqlsam_rid_algorithm(struct pdb_methods *pdb_methods)
+static bool pgsqlsam_rid_algorithm(struct pdb_methods *pdb_methods)
{
return true;
}
#else
-static uint32_t pgsqlsam_capabilities(struct pdb_methods *pdb_methods)
+static uint32_t pgsqlsam_capabilities(struct pdb_methods *pdb_methods)
{
return PDB_CAP_STORE_RIDS | PDB_CAP_ADS;
}
#endif
-static bool pgsqlsam_new_rid(struct pdb_methods *pdb_methods, uint32 *rid)
+static bool pgsqlsam_new_rid(struct pdb_methods *pdb_methods, uint32 *rid)
{
return false;
}
@@ -481,11 +481,11 @@
/* We've reached the end */
return false;
}
-
+
/* Now why do we need to fill entry as rid is enough? Okay, it is a bit
* of a hack, but I don't see the point in filling everything when we
* never read it.
- */
+ */
if (!PQgetisnull(r, row, 18)) {
string_to_sid(&sid, PQgetvalue(r, row, 18));
entry->rid = sid.sub_auths[4];
@@ -505,7 +505,7 @@
if ((entry->acct_flags & search_state->acct_flags) != search_state->acct_flags) {
return pgsqlsam_search_next_entry(search, entry);
-
+
}
return true;
@@ -539,7 +539,7 @@
char *query;
data = (struct pdb_pgsql_data *) pdb_methods->private_data;
-
+
search_state = TALLOC_ZERO_P(search, struct pdb_pgsql_search_state);
if (search_state == NULL) {
DEBUG(0, ("talloc failed\n"));
@@ -569,14 +569,14 @@
search->private_data = search_state;
search->next_entry = pgsqlsam_search_next_entry;
search->search_end = pgsqlsam_search_end;
-
+
return true;
}
static NTSTATUS pgsqlsam_init (struct pdb_methods **pdb_method, const char *location)
{
NTSTATUS nt_status;
-
+
struct pdb_pgsql_data *data;
pgsqlsam_debug_level = debug_add_class("pgsqlsam");
@@ -586,13 +586,13 @@
("pgsqlsam: Couldn't register custom debugging class!\n"));
}
- if ( !NT_STATUS_IS_OK(nt_status = make_pdb_method( pdb_method )) ) {
+ if ( !NT_STATUS_IS_OK(nt_status = make_pdb_method( pdb_method )) ) {
return nt_status;
- }
-
-
+ }
+
+
(*pdb_method)->name = "pgsqlsam";
-
+
(*pdb_method)->search_users = pgsqlsam_search_users;
(*pdb_method)->getsampwnam = pgsqlsam_getsampwnam;
(*pdb_method)->getsampwsid = pgsqlsam_getsampwsid;
Modified: branches/pdbsql_36/pdb_sql.c
===================================================================
--- branches/pdbsql_36/pdb_sql.c 2013-05-03 17:26:24 UTC (rev 176)
+++ branches/pdbsql_36/pdb_sql.c 2013-05-10 19:27:13 UTC (rev 177)
@@ -2,17 +2,17 @@
* Common PDB SQL backend functions
* Copyright (C) Jelmer Vernooij 2003-2004
* Copyright (C) Collen Blijenberg 2007-2008
- *
+ *
* 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 3 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.
@@ -23,38 +23,38 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_PASSDB
-#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_DEFAULT "logon_hours"
-#define CONFIG_PASSWORD_HISTORY_DEFAULT "password_history"
+#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_DEFAULT "logon_hours"
+#define CONFIG_PASSWORD_HISTORY_DEFAULT "password_history"
/* Used to construct insert and update queries */
@@ -72,7 +72,7 @@
if (q->update) {
q->part1 =
talloc_asprintf_append(q->part1,
- "%s = %ld,", name, value);
+ "%s = %ld,", name, value);
} else {
q->part1 =
talloc_asprintf_append(q->part1, "%s,", name);
@@ -99,12 +99,12 @@
}
esc[pos_esc] = '\0';
-
+
return esc;
}
static NTSTATUS pdb_sql_string_field(struct pdb_sql_query *q,
- const char *name, const char *value)
+ const char *name, const char *value)
{
char *esc_value;
@@ -116,13 +116,13 @@
if (q->update) {
q->part1 =
talloc_asprintf_append(q->part1,
- "%s = '%s',", name, esc_value);
+ "%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);
+ esc_value);
}
talloc_free(esc_value);
@@ -133,7 +133,7 @@
#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)
+static const char * config_value_write(const char *location, const char *name, const char *default_value)
{
char const *v = NULL;
char const *swrite = NULL;
@@ -149,7 +149,7 @@
if (!swrite) {
/* Updating NULL does not make much sense */
- if (!strcmp(v, "NULL"))
+ if (!strcmp(v, "NULL"))
return NULL;
return v;
@@ -198,19 +198,19 @@
char *query;
switch(field) {
- case SQL_SEARCH_NONE:
- field_string = "'1'";
- value = "1";
+ 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);
+
+ 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);
+
+ case SQL_SEARCH_USER_NAME:
+ field_string = config_value_read(data, "username column",
+ CONFIG_USERNAME_DEFAULT);
break;
default:
field_string = "unknown";
@@ -218,83 +218,83 @@
}
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,%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_DEFAULT),
- config_value_read(data, "password history column",
- CONFIG_PASSWORD_HISTORY_DEFAULT),
- config_value(data, "table", CONFIG_TABLE_DEFAULT),
- field_string, value
- );
- return (char *)query;
+ "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,%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_DEFAULT),
+ config_value_read(data, "password history column",
+ CONFIG_PASSWORD_HISTORY_DEFAULT),
+ config_value(data, "table", CONFIG_TABLE_DEFAULT),
+ field_string, value
+ );
+ return (char *)query;
}
-char *sql_account_query_delete(TALLOC_CTX *mem_ctx, const char *data, const char *esc)
+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);
+ config_value(data, "table", CONFIG_TABLE_DEFAULT),
+ config_value_read(data, "username column",
+ CONFIG_USERNAME_DEFAULT), esc);
return query;
}
@@ -304,293 +304,293 @@
fstring temp;
fstring sid_str;
pdb_sql_query *query;
- int some_field_affected = 0;
+ 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
+ /* 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));
+ config_value(location, "table",
+ CONFIG_TABLE_DEFAULT));
} else {
query->part1 =
talloc_asprintf(query, "INSERT INTO %s (",
- config_value(location, "table",
- CONFIG_TABLE_DEFAULT));
+ config_value(location, "table",
+ CONFIG_TABLE_DEFAULT));
}
if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_ACCTCTRL)) {
- some_field_affected = 1;
+ 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));
+ 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;
+ 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));
+ 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;
+ 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));
+ 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;
+ 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));
+ 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;
+ 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));
+ 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;
+ 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));
+ 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;
+ 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));
+ 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;
+ 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));
+ 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;
+ 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));
+ 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;
+ some_field_affected = 1;
pdb_sql_string_field(query,
- config_value_write(location, "user sid column",
- CONFIG_USER_SID_DEFAULT),
- sid_to_fstring(sid_str,
- /* sid_string_dbg(sid, */
- pdb_get_user_sid(newpwd)));
- }
+ config_value_write(location, "user sid column",
+ CONFIG_USER_SID_DEFAULT),
+ sid_to_fstring(sid_str,
+ /* sid_string_dbg(sid, */
+ 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_fstring(sid_str,
- pdb_get_group_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_fstring(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_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_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_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_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_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_ACCTDESC)) {
- some_field_affected = 1;
- pdb_sql_string_field(query,
- config_value_write(location, "acct desc column",
- CONFIG_ACCT_DESC_DEFAULT),
- pdb_get_acct_desc(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_ACCTDESC)) {
+ some_field_affected = 1;
+ pdb_sql_string_field(query,
+ config_value_write(location, "acct desc column",
+ CONFIG_ACCT_DESC_DEFAULT),
+ pdb_get_acct_desc(newpwd));
+ }
if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_DRIVE)) {
- some_field_affected = 1;
+ 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));
+ 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;
+ some_field_affected = 1;
pdb_sql_string_field(query,
- config_value_write(location, "home dir column",
- CONFIG_HOME_DIR_DEFAULT),
- pdb_get_homedir(newpwd));
+ 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;
+ some_field_affected = 1;
pdb_sql_string_field(query,
- config_value_write(location,
- "workstations column",
- CONFIG_WORKSTATIONS_DEFAULT),
- pdb_get_workstations(newpwd));
+ config_value_write(location,
+ "workstations column",
+ CONFIG_WORKSTATIONS_DEFAULT),
+ pdb_get_workstations(newpwd));
}
if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_COMMENT)) {
- some_field_affected = 1;
+ some_field_affected = 1;
pdb_sql_string_field(query,
- config_value_write(location,
- "unknown string column",
- CONFIG_UNKNOWN_STR_DEFAULT),
- pdb_get_comment(newpwd));
+ config_value_write(location,
+ "unknown string column",
+ CONFIG_UNKNOWN_STR_DEFAULT),
+ pdb_get_comment(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_get_acct_ctrl(newpwd));
pdb_sql_string_field(query,
- config_value_write(location,
- "...
[truncated message content] |
