← Back to branch summary

~ubuntu-branches/ubuntu/lucid/samba/lucid-proposed

« back to all changes in this revision

Viewing changes to source/passdb/pdb_mysql.c

  • Committer: Bazaar Package Importer
  • Author(s): Adam Conrad
  • Date: 2005-07-21 17:53:23 UTC
  • mfrom: (0.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20050721175323-m3oh6aoigywohfnq
Tags: 3.0.14a-6ubuntu1
Resynchronise with Debian, resolving merge conflicts (#12360)

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/passdb/pdb_mysql.c
111
111
                pdb_set_plaintext_passwd(u, row[22]);
112
112
 
113
113
        pdb_set_acct_ctrl(u, xatol(row[23]), PDB_SET);
114
 
        pdb_set_logon_divs(u, xatol(row[25]), PDB_SET);
115
 
        pdb_set_hours_len(u, xatol(row[26]), PDB_SET);
116
 
        pdb_set_bad_password_count(u, xatol(row[27]), PDB_SET);
117
 
        pdb_set_logon_count(u, xatol(row[28]), PDB_SET);
118
 
        pdb_set_unknown_6(u, xatol(row[29]), PDB_SET);
 
114
        pdb_set_logon_divs(u, xatol(row[24]), PDB_SET);
 
115
        pdb_set_hours_len(u, xatol(row[25]), PDB_SET);
 
116
        pdb_set_bad_password_count(u, xatol(row[26]), PDB_SET);
 
117
        pdb_set_logon_count(u, xatol(row[27]), PDB_SET);
 
118
        pdb_set_unknown_6(u, xatol(row[28]), PDB_SET);
119
119
 
120
120
        return NT_STATUS_OK;
121
121
}
122
122
 
123
 
static NTSTATUS mysqlsam_setsampwent(struct pdb_methods *methods, BOOL update)
 
123
static NTSTATUS mysqlsam_setsampwent(struct pdb_methods *methods, BOOL update, uint16 acb_mask)
124
124
{
125
125
        struct pdb_mysql_data *data =
126
126
                (struct pdb_mysql_data *) methods->private_data;
454
454
        data->location = smb_xstrdup(location);
455
455
 
456
456
        DEBUG(1,
457
 
                  ("Connecting to database server, host: %s, user: %s, password: %s, database: %s, port: %ld\n",
 
457
                  ("Connecting to database server, host: %s, user: %s, database: %s, port: %ld\n",
458
458
                   config_value(data, "mysql host", CONFIG_HOST_DEFAULT),
459
459
                   config_value(data, "mysql user", CONFIG_USER_DEFAULT),
460
 
                   config_value(data, "mysql password", CONFIG_PASS_DEFAULT),
461
460
                   config_value(data, "mysql database", CONFIG_DB_DEFAULT),
462
461
                   xatol(config_value(data, "mysql port", CONFIG_PORT_DEFAULT))));
463
462