Menu
▾
▴
[pdbsql-cvs] SF.net SVN: pdbsql: [69] trunk/pdb_pgsql.c
|
From: <sy...@us...> - 2006-08-20 20:07:09
|
Revision: 69 Author: synnack Date: 2006-08-20 13:07:02 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/pdbsql/?rev=69&view=rev Log Message: ----------- Reformatted pdb_pgsql to use tabs. Got rid of "Do it" comments. Modified Paths: -------------- trunk/pdb_pgsql.c Modified: trunk/pdb_pgsql.c =================================================================== --- trunk/pdb_pgsql.c 2006-08-20 19:28:53 UTC (rev 68) +++ trunk/pdb_pgsql.c 2006-08-20 20:07:02 UTC (rev 69) @@ -38,19 +38,19 @@ /* handles for doing db transactions */ typedef struct pdb_pgsql_data { - PGconn *master_handle ; - PGconn *handle ; + PGconn *master_handle; + PGconn *handle; - PGresult *pwent ; - long currow ; - const char *db ; - const char *host ; - const char *port ; - const char *user ; - const char *pass ; + 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 ; + const char *location; +} pdb_pgsql_data; #define SET_DATA(data,methods) { \ if(!methods){ \ @@ -64,138 +64,138 @@ #define SET_DATA_QUIET(data,methods) { \ if(!methods){ \ DEBUG(0, ("invalid methods!\n")); \ - return ; \ + 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 ) +#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 ) +static PGconn *pgsqlsam_connect(struct pdb_pgsql_data *data) { - PGconn *handle; + 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 - ) - ) ; + 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 - ) ; + /* 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; - } + 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; + 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 ) +static PGconn *choose_connection(struct pdb_pgsql_data *data) { - if ( data->master_handle == NULL ) - { - data->master_handle = pgsqlsam_connect( data ); - return data->master_handle ; - } + if (data->master_handle == NULL) { + data->master_handle = pgsqlsam_connect(data); + return data->master_handle; + } - /* Master connection != NULL, so we are just another process. */ + /* 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 ); - } + /* If we didn't connect yet, do it now. */ + if (data->handle == NULL) { + data->handle = pgsqlsam_connect(data); + } - return data->handle ; + return data->handle; } -static long PQgetlong( PGresult *r, long row, long col ) +static long PQgetlong(PGresult *r, long row, long col) { - if ( PQgetisnull( r, row, col ) ) return 0 ; + if (PQgetisnull(r, row, col)) { + return 0; + } - return atol( PQgetvalue( r, row, col ) ) ; + return atol(PQgetvalue(r, row, col)); } -static NTSTATUS row_to_sam_account ( PGresult *r, long row, struct samu *u ) +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 ; + unsigned char temp[16]; + DOM_SID sid; + unsigned char *hours; + size_t hours_len = 0; - if ( row >= PQntuples( r ) ) return NT_STATUS_INVALID_PARAMETER ; + 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_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); + } + } - 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 ) ; - } - - 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, 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 (!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 ) ; - - if (!PQgetisnull( r, row, 30 ) ) { + if (pdb_gethexpwd(PQgetvalue(r, row, 20), temp)) { + pdb_set_lanman_passwd(u, temp, PDB_SET); + } + if (pdb_gethexpwd(PQgetvalue(r, row, 21), temp)) { + pdb_set_nt_passwd(u, temp, PDB_SET); + } + /* Set password history field */ + if (!PQgetisnull(r, row, 30)) { uint8 pwhist[MAX_PW_HISTORY_LEN * PW_HISTORY_ENTRY_LEN]; int i; - char *history_string = PQgetvalue( r, row, 30); + 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++) { @@ -207,53 +207,51 @@ } - /* 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 ) ) ; + /* 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 ; + 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 ; + struct pdb_pgsql_data *data; + PGconn *handle; + char *query; + NTSTATUS retval; - SET_DATA( data, methods ) ; + 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") ) ; + /* 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); - query = sql_account_query_select(NULL, data->location, update, SQL_SEARCH_NONE, NULL); + /* Execute query */ + DEBUG(5, ("Executing query %s\n", query)); + data->pwent = PQexec(handle, query); + data->currow = 0; - /* 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 ; - } + /* 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 ; + talloc_free(query); + return retval; } /*************************************************************** @@ -262,142 +260,134 @@ static void pgsqlsam_endsampwent(struct pdb_methods *methods) { - struct pdb_pgsql_data *data ; - - SET_DATA_QUIET( data, methods ) ; + struct pdb_pgsql_data *data; - if (data->pwent != NULL) - { - PQclear( data->pwent ) ; - } + SET_DATA_QUIET(data, methods); - data->pwent = NULL ; - data->currow = 0 ; + if (data->pwent != NULL) { + PQclear(data->pwent); + } - DEBUG( 5, ("pgsql_endsampwent called\n") ) ; + 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 ) +static NTSTATUS pgsqlsam_getsampwent(struct pdb_methods *methods, struct samu *user) { - struct pdb_pgsql_data *data; - NTSTATUS retval ; + struct pdb_pgsql_data *data; + NTSTATUS retval; - SET_DATA( data, methods ) ; + SET_DATA(data, methods); - if ( data->pwent == NULL ) - { - DEBUG( 0, ("invalid pwent\n") ) ; - return NT_STATUS_INVALID_PARAMETER ; - } + 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++ ; + retval = row_to_sam_account(data->pwent, data->currow, user); + data->currow++; - return retval ; + return retval; } -static NTSTATUS pgsqlsam_select_by_field ( struct pdb_methods *methods, struct samu *user, enum sql_search_field field, const char *sname ) +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 ; + struct pdb_pgsql_data *data; + PGconn *handle; - char *esc ; - char *query ; + char *esc; + char *query; - PGresult *result ; - NTSTATUS retval ; + PGresult *result; + NTSTATUS retval; - SET_DATA(data, methods); + SET_DATA(data, methods); - if ( user == NULL ) - { - DEBUG( 0, ("pdb_getsampwnam: struct samu is NULL.\n") ) ; - return NT_STATUS_INVALID_PARAMETER; - } + 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) ) ; + 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; - } + /* 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) ) ; + /* 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 ; + /* 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); + query = sql_account_query_select(NULL, data->location, True, field, esc); - /* Do it */ - DEBUG( 5, ("Executing query %s\n", query) ) ; - result = PQexec( handle, query ) ; + /* Execute query */ + 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 ) ; - } + /* 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 ) ; + talloc_free(esc); + talloc_free(query); - if ( result != NULL ) - PQclear( result ) ; - - return retval ; + 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 ) +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; + struct pdb_pgsql_data *data; + size_t i, l; + char *lowercasename; + NTSTATUS result; - SET_DATA(data, methods); + SET_DATA(data, methods); - if ( !sname ) - { - DEBUG( 0, ("invalid name specified") ) ; - return NT_STATUS_INVALID_PARAMETER; - } + 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]); - } + 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 ) ; + result = pgsqlsam_select_by_field(methods, user, SQL_SEARCH_USER_NAME, lowercasename); - SAFE_FREE( lowercasename ) ; + SAFE_FREE(lowercasename); - return result; + return result; } @@ -405,164 +395,157 @@ Search by sid **************************************************************************/ -static NTSTATUS pgsqlsam_getsampwsid ( struct pdb_methods *methods, struct samu *user, const DOM_SID *sid ) +static NTSTATUS pgsqlsam_getsampwsid(struct pdb_methods *methods, struct samu *user, const DOM_SID *sid) { - struct pdb_pgsql_data *data; - fstring sid_str; + struct pdb_pgsql_data *data; + fstring sid_str; - SET_DATA( data, methods ) ; + SET_DATA(data, methods); - sid_to_string( sid_str, sid ) ; + sid_to_string(sid_str, sid); - return pgsqlsam_select_by_field( methods, user, SQL_SEARCH_USER_SID, sid_str ) ; + 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 ) +static NTSTATUS pgsqlsam_delete_sam_account(struct pdb_methods *methods, struct samu *sam_pass) { - struct pdb_pgsql_data *data ; - PGconn *handle ; + struct pdb_pgsql_data *data; + PGconn *handle; - const char *sname = pdb_get_username( sam_pass ) ; - char *esc ; - char *query ; + const char *sname = pdb_get_username(sam_pass); + char *esc; + char *query; - PGresult *result ; - NTSTATUS retval ; + PGresult *result; + NTSTATUS retval; + + SET_DATA(data, methods); - SET_DATA(data, methods); + if (!sname) { + DEBUG(0, ("invalid name specified\n")); + return NT_STATUS_INVALID_PARAMETER; + } - 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; + } - /* 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) ) ; + PQescapeString(esc, sname, strlen(sname)); - /* Connect to the DB. */ - handle = choose_connection( data ); - if ( handle == NULL ) - return NT_STATUS_UNSUCCESSFUL ; + /* Connect to the DB. */ + handle = choose_connection(data); + if (handle == NULL) { + return NT_STATUS_UNSUCCESSFUL; + } + query = sql_account_query_delete(NULL, data->location, esc); - query = sql_account_query_delete(NULL, data->location, esc); + /* Execute query */ + result = PQexec(handle, query); - /* 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 ) - { - 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); - if ( result != NULL ) - PQclear( result ) ; - talloc_free( esc ) ; - talloc_free( query ) ; - - return retval ; + return retval; } -static NTSTATUS pgsqlsam_replace_sam_account( struct pdb_methods *methods, struct samu *newpwd, char isupdate ) +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 ; + 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 ; - } + if (!methods) { + DEBUG(0, ("invalid methods!\n")); + return NT_STATUS_INVALID_PARAMETER; + } - data = (struct pdb_pgsql_data *) methods->private_data ; + data = (struct pdb_pgsql_data *) methods->private_data; - if ( data == NULL ) - { - DEBUG( 0, ("invalid handle!\n") ) ; - return NT_STATUS_INVALID_HANDLE ; - } + 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; + 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; + } - /* Connect to the DB. */ - handle = choose_connection( data ); - if ( handle == NULL ) - return NT_STATUS_UNSUCCESSFUL ; - - result = PQexec( handle, query ) ; + /* Execute the query */ + 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); + 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; + return retval; } -static NTSTATUS pgsqlsam_add_sam_account ( struct pdb_methods *methods, struct samu *newpwd ) +static NTSTATUS pgsqlsam_add_sam_account(struct pdb_methods *methods, struct samu *newpwd) { - return pgsqlsam_replace_sam_account( methods, newpwd, 0 ) ; + return pgsqlsam_replace_sam_account(methods, newpwd, 0); } -static NTSTATUS pgsqlsam_update_sam_account ( struct pdb_methods *methods, struct samu *newpwd ) +static NTSTATUS pgsqlsam_update_sam_account(struct pdb_methods *methods, struct samu *newpwd) { - return pgsqlsam_replace_sam_account( methods, newpwd, 1 ) ; + return pgsqlsam_replace_sam_account(methods, newpwd, 1); } -static BOOL pgsqlsam_rid_algorithm (struct pdb_methods *pdb_methods) { +static BOOL pgsqlsam_rid_algorithm(struct pdb_methods *pdb_methods) +{ return True; } -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; } -static NTSTATUS pgsqlsam_init (struct pdb_methods **pdb_method, const char *location ) +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 )) ) { + if (!NT_STATUS_IS_OK(nt_status = make_pdb_method(pdb_method))) { return nt_status; } @@ -584,37 +567,37 @@ data->master_handle = NULL; data->handle = NULL; - data->pwent = NULL ; + data->pwent = NULL; - if ( !location ) { - DEBUG( 0, ("No identifier specified. Check the Samba HOWTO Collection for details\n") ) ; + 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 ) ; + 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 ))); + 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 ); + 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") ) ; + DEBUG(5, ("Pgsql module initialized\n")); return NT_STATUS_OK; } NTSTATUS init_module(void) { - return smb_register_passdb( PASSDB_INTERFACE_VERSION, "pgsql", pgsqlsam_init ) ; + return smb_register_passdb(PASSDB_INTERFACE_VERSION, "pgsql", pgsqlsam_init); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
