Try to remove the last vestiges of unknown_3...

Jelmer, can you look at the sql and xml backends please to verify?
(This used to be commit b7706f7e258516d83646aca8c367508bc1c8f0dd)

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 0cdbdf0f2601ced728654a9a5a1dc795c35d89b2..3db0702c924ec8cc2516f440f022bfbff60a6f3d 100644 (file)
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -712,8 +712,6 @@ static BOOL init_sam_from_ldap (struct ldapsam_privates *ldap_state,
 
 /*     pdb_set_munged_dial(sampass, munged_dial, PDB_SET); */
        
-       /* pdb_set_unknown_3(sampass, unknown3, PDB_SET); */
-
        if (!smbldap_get_single_attribute(ldap_state->smbldap_state->ldap_struct, entry,
                        get_userattr_key2string(ldap_state->schema_ver, LDAP_ATTR_BAD_PASSWORD_COUNT), temp)) {
                        /* leave as default */

diff --git a/source3/passdb/pdb_mysql.c b/source3/passdb/pdb_mysql.c
index acc1eff8298f3c1eeed684cc9a566b801d19108c..deed27dbe498e931d38a02c875ce1176065672dd 100644 (file)
--- a/source3/passdb/pdb_mysql.c
+++ b/source3/passdb/pdb_mysql.c
@@ -111,7 +111,6 @@ static NTSTATUS row_to_sam_account(MYSQL_RES * r, SAM_ACCOUNT * u)
                pdb_set_plaintext_passwd(u, row[22]);
 
        pdb_set_acct_ctrl(u, xatol(row[23]), PDB_SET);
-       pdb_set_unknown_3(u, xatol(row[24]), PDB_SET);
        pdb_set_logon_divs(u, xatol(row[25]), PDB_SET);
        pdb_set_hours_len(u, xatol(row[26]), PDB_SET);
        pdb_set_bad_password_count(u, xatol(row[27]), PDB_SET);

diff --git a/source3/passdb/pdb_pgsql.c b/source3/passdb/pdb_pgsql.c
index 61c620e092ec1ab16b66458a51ad61848a45549e..1731c720a21b9c0a8678d16ec26168eacc9b2085 100644 (file)
--- a/source3/passdb/pdb_pgsql.c
+++ b/source3/passdb/pdb_pgsql.c
@@ -98,7 +98,6 @@ static NTSTATUS row_to_sam_account ( PGresult *r, long row, SAM_ACCOUNT *u )
   pdb_set_munged_dial          ( u, PQgetvalue( r, row, 17 ), PDB_SET ) ;
   
   pdb_set_acct_ctrl            ( u, PQgetlong ( r, row, 23 ), PDB_SET ) ;
-  pdb_set_unknown_3            ( u, PQgetlong ( r, row, 24 ), PDB_SET ) ;
   pdb_set_logon_divs           ( u, PQgetlong ( r, row, 25 ), PDB_SET ) ;
   pdb_set_hours_len            ( u, PQgetlong ( r, row, 26 ), PDB_SET ) ;
   pdb_set_logon_count            ( u, PQgetlong ( r, row, 27 ), PDB_SET ) ;

diff --git a/source3/passdb/pdb_sql.c b/source3/passdb/pdb_sql.c
index b87004e01938d74982275487e3a62e3cc7bf0aa7..ffb8313a97088e13619c626bcaa2f68591902fb6 100644 (file)
--- a/source3/passdb/pdb_sql.c
+++ b/source3/passdb/pdb_sql.c
@@ -44,7 +44,6 @@
 #define CONFIG_NT_PW_DEFAULT                           "nt_pw"
 #define CONFIG_PLAIN_PW_DEFAULT                                "NULL"
 #define CONFIG_ACCT_CTRL_DEFAULT                       "acct_ctrl"
-#define CONFIG_UNKNOWN_3_DEFAULT                       "unknown_3"
 #define CONFIG_LOGON_DIVS_DEFAULT                      "logon_divs"
 #define CONFIG_HOURS_LEN_DEFAULT                       "hours_len"
 #define CONFIG_BAD_PASSWORD_COUNT_DEFAULT              "bad_password_count"
@@ -205,7 +204,7 @@ char *sql_account_query_select(const char *data, BOOL update, enum sql_search_fi
        }
 
        asprintf(&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 FROM %s WHERE %s = '%s'",
+                        "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 FROM %s WHERE %s = '%s'",
                         config_value_read(data, "logon time column",
                                                           CONFIG_LOGON_TIME_DEFAULT),
                         config_value_read(data, "logoff time column",
@@ -254,8 +253,6 @@ char *sql_account_query_select(const char *data, BOOL update, enum sql_search_fi
                                                           CONFIG_PLAIN_PW_DEFAULT),
                         config_value_read(data, "acct ctrl column",
                                                           CONFIG_ACCT_CTRL_DEFAULT),
-                        config_value_read(data, "unknown 3 column",
-                                                          CONFIG_UNKNOWN_3_DEFAULT),
                         config_value_read(data, "logon divs column",
                                                           CONFIG_LOGON_DIVS_DEFAULT),
                         config_value_read(data, "hours len column",

diff --git a/source3/passdb/pdb_xml.c b/source3/passdb/pdb_xml.c
index 29922bca4f994336e58c300ce52895bff775bcf7..64cb73ba5a4aa401a50c35228f36ad985c012743 100644 (file)
--- a/source3/passdb/pdb_xml.c
+++ b/source3/passdb/pdb_xml.c
@@ -154,11 +154,6 @@ static BOOL parseUser(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur, SAM_ACCOUNT *
                                                          atol(xmlNodeListGetString
                                                                   (doc, cur->xmlChildrenNode, 1)), PDB_SET);
 
-               else if (!strcmp(cur->name, "unknown_3") && cur->ns == ns)
-                       pdb_set_unknown_3(u,
-                                                         atol(xmlNodeListGetString
-                                                                  (doc, cur->xmlChildrenNode, 1)), PDB_SET);
-
                else if (!strcmp(cur->name, "bad_password_count") && cur->ns == ns)
                        pdb_set_bad_password_count(u,
                                                          atol(xmlNodeListGetString
@@ -490,7 +485,6 @@ static NTSTATUS xmlsam_add_sam_account(struct pdb_methods *methods, SAM_ACCOUNT
        }
 
        xmlNewChild(user, data->ns, "acct_ctrl", iota(pdb_get_acct_ctrl(u)));
-       xmlNewChild(user, data->ns, "unknown_3", iota(pdb_get_unknown_3(u)));
 
        if (pdb_get_logon_divs(u))
                xmlNewChild(user, data->ns, "logon_divs",