diff options
| author | Gerald Carter <jerry@samba.org> | 2005-01-21 18:47:55 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2005-01-21 18:47:55 +0000 |
| commit | 0ff19b2807e92b9abd3fc8cd716dd19284e93af9 (patch) | |
| tree | 2f2b58e05c853b1a47f2d73e398da1cbd22fc8fc /source/passdb/pdb_mysql.c | |
| parent | f1f54e8731e7cf45a849d3c7bd6d7eee6f9b33b7 (diff) | |
| download | samba-0ff19b2807e92b9abd3fc8cd716dd19284e93af9.tar.gz samba-0ff19b2807e92b9abd3fc8cd716dd19284e93af9.tar.xz samba-0ff19b2807e92b9abd3fc8cd716dd19284e93af9.zip | |
r4904: sync up with 3.0 for 3.0.11pre2
Diffstat (limited to 'source/passdb/pdb_mysql.c')
| -rw-r--r-- | source/passdb/pdb_mysql.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/passdb/pdb_mysql.c b/source/passdb/pdb_mysql.c index 0e6a11d9326..fbe44233245 100644 --- a/source/passdb/pdb_mysql.c +++ b/source/passdb/pdb_mysql.c @@ -120,7 +120,7 @@ static NTSTATUS row_to_sam_account(MYSQL_RES * r, SAM_ACCOUNT * u) return NT_STATUS_OK; } -static NTSTATUS mysqlsam_setsampwent(struct pdb_methods *methods, BOOL update) +static NTSTATUS mysqlsam_setsampwent(struct pdb_methods *methods, BOOL update, uint16 acb_mask) { struct pdb_mysql_data *data = (struct pdb_mysql_data *) methods->private_data; @@ -454,10 +454,9 @@ static NTSTATUS mysqlsam_init(struct pdb_context * pdb_context, struct pdb_metho data->location = smb_xstrdup(location); DEBUG(1, - ("Connecting to database server, host: %s, user: %s, password: %s, database: %s, port: %ld\n", + ("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 password", CONFIG_PASS_DEFAULT), config_value(data, "mysql database", CONFIG_DB_DEFAULT), xatol(config_value(data, "mysql port", CONFIG_PORT_DEFAULT)))); |