RIP BOOL. Convert BOOL -> bool. I found a few interesting

[nivanova/samba-autobuild/.git] / source3 / rpc_server / srv_samr.c

diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c
index 971f5ed40ce1feeeaf3612b3065b3f8a87e5495f..a1deac083df45bd17fc9a1c44204a0f8b6ab700a 100644 (file)
--- a/source3/rpc_server/srv_samr.c
+++ b/source3/rpc_server/srv_samr.c
@@ -14,7 +14,7 @@
  *  
  *  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 2 of the License, or
+ *  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,
@@ -23,8 +23,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -40,7 +39,7 @@
  api_samr_close_hnd
  ********************************************************************/
 
-static BOOL api_samr_close_hnd(pipes_struct *p)
+static bool api_samr_close_hnd(pipes_struct *p)
 {
        SAMR_Q_CLOSE_HND q_u;
        SAMR_R_CLOSE_HND r_u;
@@ -70,7 +69,7 @@ static BOOL api_samr_close_hnd(pipes_struct *p)
  api_samr_open_domain
  ********************************************************************/
 
-static BOOL api_samr_open_domain(pipes_struct *p)
+static bool api_samr_open_domain(pipes_struct *p)
 {
        SAMR_Q_OPEN_DOMAIN q_u;
        SAMR_R_OPEN_DOMAIN r_u;
@@ -101,7 +100,7 @@ static BOOL api_samr_open_domain(pipes_struct *p)
  api_samr_get_usrdom_pwinfo
  ********************************************************************/
 
-static BOOL api_samr_get_usrdom_pwinfo(pipes_struct *p)
+static bool api_samr_get_usrdom_pwinfo(pipes_struct *p)
 {
        SAMR_Q_GET_USRDOM_PWINFO q_u;
        SAMR_R_GET_USRDOM_PWINFO r_u;
@@ -131,7 +130,7 @@ static BOOL api_samr_get_usrdom_pwinfo(pipes_struct *p)
  api_samr_set_sec_obj
  ********************************************************************/
 
-static BOOL api_samr_set_sec_obj(pipes_struct *p)
+static bool api_samr_set_sec_obj(pipes_struct *p)
 {
        SAMR_Q_SET_SEC_OBJ q_u;
        SAMR_R_SET_SEC_OBJ r_u;
@@ -161,7 +160,7 @@ static BOOL api_samr_set_sec_obj(pipes_struct *p)
  api_samr_query_sec_obj
  ********************************************************************/
 
-static BOOL api_samr_query_sec_obj(pipes_struct *p)
+static bool api_samr_query_sec_obj(pipes_struct *p)
 {
        SAMR_Q_QUERY_SEC_OBJ q_u;
        SAMR_R_QUERY_SEC_OBJ r_u;
@@ -191,7 +190,7 @@ static BOOL api_samr_query_sec_obj(pipes_struct *p)
  api_samr_enum_dom_users
  ********************************************************************/
 
-static BOOL api_samr_enum_dom_users(pipes_struct *p)
+static bool api_samr_enum_dom_users(pipes_struct *p)
 {
        SAMR_Q_ENUM_DOM_USERS q_u;
        SAMR_R_ENUM_DOM_USERS r_u;
@@ -222,7 +221,7 @@ static BOOL api_samr_enum_dom_users(pipes_struct *p)
  api_samr_enum_dom_groups
  ********************************************************************/
 
-static BOOL api_samr_enum_dom_groups(pipes_struct *p)
+static bool api_samr_enum_dom_groups(pipes_struct *p)
 {
        SAMR_Q_ENUM_DOM_GROUPS q_u;
        SAMR_R_ENUM_DOM_GROUPS r_u;
@@ -253,7 +252,7 @@ static BOOL api_samr_enum_dom_groups(pipes_struct *p)
  api_samr_enum_dom_aliases
  ********************************************************************/
 
-static BOOL api_samr_enum_dom_aliases(pipes_struct *p)
+static bool api_samr_enum_dom_aliases(pipes_struct *p)
 {
        SAMR_Q_ENUM_DOM_ALIASES q_u;
        SAMR_R_ENUM_DOM_ALIASES r_u;
@@ -284,7 +283,7 @@ static BOOL api_samr_enum_dom_aliases(pipes_struct *p)
  api_samr_query_dispinfo
  ********************************************************************/
 
-static BOOL api_samr_query_dispinfo(pipes_struct *p)
+static bool api_samr_query_dispinfo(pipes_struct *p)
 {
        SAMR_Q_QUERY_DISPINFO q_u;
        SAMR_R_QUERY_DISPINFO r_u;
@@ -314,7 +313,7 @@ static BOOL api_samr_query_dispinfo(pipes_struct *p)
  api_samr_query_aliasinfo
  ********************************************************************/
 
-static BOOL api_samr_query_aliasinfo(pipes_struct *p)
+static bool api_samr_query_aliasinfo(pipes_struct *p)
 {
        SAMR_Q_QUERY_ALIASINFO q_u;
        SAMR_R_QUERY_ALIASINFO r_u;
@@ -345,7 +344,7 @@ static BOOL api_samr_query_aliasinfo(pipes_struct *p)
  api_samr_lookup_names
  ********************************************************************/
 
-static BOOL api_samr_lookup_names(pipes_struct *p)
+static bool api_samr_lookup_names(pipes_struct *p)
 {
        SAMR_Q_LOOKUP_NAMES q_u;
        SAMR_R_LOOKUP_NAMES r_u;
@@ -376,7 +375,7 @@ static BOOL api_samr_lookup_names(pipes_struct *p)
  api_samr_chgpasswd_user
  ********************************************************************/
 
-static BOOL api_samr_chgpasswd_user(pipes_struct *p)
+static bool api_samr_chgpasswd_user(pipes_struct *p)
 {
        SAMR_Q_CHGPASSWD_USER q_u;
        SAMR_R_CHGPASSWD_USER r_u;
@@ -407,7 +406,7 @@ static BOOL api_samr_chgpasswd_user(pipes_struct *p)
  api_samr_lookup_rids
  ********************************************************************/
 
-static BOOL api_samr_lookup_rids(pipes_struct *p)
+static bool api_samr_lookup_rids(pipes_struct *p)
 {
        SAMR_Q_LOOKUP_RIDS q_u;
        SAMR_R_LOOKUP_RIDS r_u;
@@ -438,7 +437,7 @@ static BOOL api_samr_lookup_rids(pipes_struct *p)
  api_samr_open_user
  ********************************************************************/
 
-static BOOL api_samr_open_user(pipes_struct *p)
+static bool api_samr_open_user(pipes_struct *p)
 {
        SAMR_Q_OPEN_USER q_u;
        SAMR_R_OPEN_USER r_u;
@@ -468,7 +467,7 @@ static BOOL api_samr_open_user(pipes_struct *p)
  api_samr_query_userinfo
  ********************************************************************/
 
-static BOOL api_samr_query_userinfo(pipes_struct *p)
+static bool api_samr_query_userinfo(pipes_struct *p)
 {
        SAMR_Q_QUERY_USERINFO q_u;
        SAMR_R_QUERY_USERINFO r_u;
@@ -498,7 +497,7 @@ static BOOL api_samr_query_userinfo(pipes_struct *p)
  api_samr_query_usergroups
  ********************************************************************/
 
-static BOOL api_samr_query_usergroups(pipes_struct *p)
+static bool api_samr_query_usergroups(pipes_struct *p)
 {
        SAMR_Q_QUERY_USERGROUPS q_u;
        SAMR_R_QUERY_USERGROUPS r_u;
@@ -525,10 +524,10 @@ static BOOL api_samr_query_usergroups(pipes_struct *p)
 }
 
 /*******************************************************************
- api_samr_query_dom_info
+ api_samr_query_domain_info
  ********************************************************************/
 
-static BOOL api_samr_query_dom_info(pipes_struct *p)
+static bool api_samr_query_domain_info(pipes_struct *p)
 {
        SAMR_Q_QUERY_DOMAIN_INFO q_u;
        SAMR_R_QUERY_DOMAIN_INFO r_u;
@@ -538,16 +537,16 @@ static BOOL api_samr_query_dom_info(pipes_struct *p)
        ZERO_STRUCT(q_u);
        ZERO_STRUCT(r_u);
 
-       if(!samr_io_q_query_dom_info("", &q_u, data, 0)) {
-               DEBUG(0,("api_samr_query_dom_info: unable to unmarshall SAMR_Q_QUERY_DOMAIN_INFO.\n"));
+       if(!samr_io_q_query_domain_info("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_query_domain_info: unable to unmarshall SAMR_Q_QUERY_DOMAIN_INFO.\n"));
                return False;
        }
 
-       r_u.status = _samr_query_dom_info(p, &q_u, &r_u);
+       r_u.status = _samr_query_domain_info(p, &q_u, &r_u);
 
        /* store the response in the SMB stream */
-       if(!samr_io_r_query_dom_info("", &r_u, rdata, 0)) {
-               DEBUG(0,("api_samr_query_dom_info: unable to marshall SAMR_R_QUERY_DOMAIN_INFO.\n"));
+       if(!samr_io_r_query_domain_info("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_query_domain_info: unable to marshall SAMR_R_QUERY_DOMAIN_INFO.\n"));
                return False;
        }
 
@@ -558,7 +557,7 @@ static BOOL api_samr_query_dom_info(pipes_struct *p)
  api_samr_create_user
  ********************************************************************/
 
-static BOOL api_samr_create_user(pipes_struct *p)
+static bool api_samr_create_user(pipes_struct *p)
 {
        prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
@@ -590,7 +589,7 @@ static BOOL api_samr_create_user(pipes_struct *p)
  api_samr_connect_anon
  ********************************************************************/
 
-static BOOL api_samr_connect_anon(pipes_struct *p)
+static bool api_samr_connect_anon(pipes_struct *p)
 {
        SAMR_Q_CONNECT_ANON q_u;
        SAMR_R_CONNECT_ANON r_u;
@@ -621,7 +620,7 @@ static BOOL api_samr_connect_anon(pipes_struct *p)
  api_samr_connect
  ********************************************************************/
 
-static BOOL api_samr_connect(pipes_struct *p)
+static bool api_samr_connect(pipes_struct *p)
 {
        SAMR_Q_CONNECT q_u;
        SAMR_R_CONNECT r_u;
@@ -652,7 +651,7 @@ static BOOL api_samr_connect(pipes_struct *p)
  api_samr_connect4
  ********************************************************************/
 
-static BOOL api_samr_connect4(pipes_struct *p)
+static bool api_samr_connect4(pipes_struct *p)
 {
        SAMR_Q_CONNECT4 q_u;
        SAMR_R_CONNECT4 r_u;
@@ -679,11 +678,73 @@ static BOOL api_samr_connect4(pipes_struct *p)
        return True;
 }
 
+/*******************************************************************
+ api_samr_chgpasswd_user3
+ ********************************************************************/
+
+static bool api_samr_chgpasswd_user3(pipes_struct *p)
+{
+       SAMR_Q_CHGPASSWD_USER3 q_u;
+       SAMR_R_CHGPASSWD_USER3 r_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
+
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
+
+       /* change password request */
+       if (!samr_io_q_chgpasswd_user3("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_chgpasswd_user3: Failed to unmarshall SAMR_Q_CHGPASSWD_USER3.\n"));
+               return False;
+       }
+
+       r_u.status = _samr_chgpasswd_user3(p, &q_u, &r_u);
+
+       /* store the response in the SMB stream */
+       if(!samr_io_r_chgpasswd_user3("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_chgpasswd_user3: Failed to marshall SAMR_R_CHGPASSWD_USER3.\n" ));
+               return False;
+       }
+
+       return True;
+}
+
+/*******************************************************************
+ api_samr_connect5
+ ********************************************************************/
+
+static bool api_samr_connect5(pipes_struct *p)
+{
+       SAMR_Q_CONNECT5 q_u;
+       SAMR_R_CONNECT5 r_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
+
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
+
+       /* grab the samr open policy */
+       if(!samr_io_q_connect5("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_connect5: unable to unmarshall SAMR_Q_CONNECT5.\n"));
+               return False;
+       }
+
+       r_u.status = _samr_connect5(p, &q_u, &r_u);
+
+       /* store the response in the SMB stream */
+       if(!samr_io_r_connect5("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_connect5: unable to marshall SAMR_R_CONNECT5.\n"));
+               return False;
+       }
+
+       return True;
+}
+
 /**********************************************************************
  api_samr_lookup_domain
  **********************************************************************/
 
-static BOOL api_samr_lookup_domain(pipes_struct *p)
+static bool api_samr_lookup_domain(pipes_struct *p)
 {
        SAMR_Q_LOOKUP_DOMAIN q_u;
        SAMR_R_LOOKUP_DOMAIN r_u;
@@ -712,7 +773,7 @@ static BOOL api_samr_lookup_domain(pipes_struct *p)
  api_samr_enum_domains
  **********************************************************************/
 
-static BOOL api_samr_enum_domains(pipes_struct *p)
+static bool api_samr_enum_domains(pipes_struct *p)
 {
        SAMR_Q_ENUM_DOMAINS q_u;
        SAMR_R_ENUM_DOMAINS r_u;
@@ -741,7 +802,7 @@ static BOOL api_samr_enum_domains(pipes_struct *p)
  api_samr_open_alias
  ********************************************************************/
 
-static BOOL api_samr_open_alias(pipes_struct *p)
+static bool api_samr_open_alias(pipes_struct *p)
 {
        SAMR_Q_OPEN_ALIAS q_u;
        SAMR_R_OPEN_ALIAS r_u;
@@ -772,7 +833,7 @@ static BOOL api_samr_open_alias(pipes_struct *p)
  api_samr_set_userinfo
  ********************************************************************/
 
-static BOOL api_samr_set_userinfo(pipes_struct *p)
+static bool api_samr_set_userinfo(pipes_struct *p)
 {
        SAMR_Q_SET_USERINFO q_u;
        SAMR_R_SET_USERINFO r_u;
@@ -785,8 +846,9 @@ static BOOL api_samr_set_userinfo(pipes_struct *p)
        if (!samr_io_q_set_userinfo("", &q_u, data, 0)) {
                DEBUG(0,("api_samr_set_userinfo: Unable to unmarshall SAMR_Q_SET_USERINFO.\n"));
                /* Fix for W2K SP2 */
+               /* what is that status-code ? - gd */
                if (q_u.switch_value == 0x1a) {
-                       setup_fault_pdu(p, NT_STATUS(0x1c000006));
+                       setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_INVALID_TAG));
                        return True;
                }
                return False;
@@ -806,7 +868,7 @@ static BOOL api_samr_set_userinfo(pipes_struct *p)
  api_samr_set_userinfo2
  ********************************************************************/
 
-static BOOL api_samr_set_userinfo2(pipes_struct *p)
+static bool api_samr_set_userinfo2(pipes_struct *p)
 {
        SAMR_Q_SET_USERINFO2 q_u;
        SAMR_R_SET_USERINFO2 r_u;
@@ -836,7 +898,7 @@ static BOOL api_samr_set_userinfo2(pipes_struct *p)
  api_samr_query_useraliases
  ********************************************************************/
 
-static BOOL api_samr_query_useraliases(pipes_struct *p)
+static bool api_samr_query_useraliases(pipes_struct *p)
 {
        SAMR_Q_QUERY_USERALIASES q_u;
        SAMR_R_QUERY_USERALIASES r_u;
@@ -866,7 +928,7 @@ static BOOL api_samr_query_useraliases(pipes_struct *p)
  api_samr_query_aliasmem
  ********************************************************************/
 
-static BOOL api_samr_query_aliasmem(pipes_struct *p)
+static bool api_samr_query_aliasmem(pipes_struct *p)
 {
        SAMR_Q_QUERY_ALIASMEM q_u;
        SAMR_R_QUERY_ALIASMEM r_u;
@@ -896,7 +958,7 @@ static BOOL api_samr_query_aliasmem(pipes_struct *p)
  api_samr_query_groupmem
  ********************************************************************/
 
-static BOOL api_samr_query_groupmem(pipes_struct *p)
+static bool api_samr_query_groupmem(pipes_struct *p)
 {
        SAMR_Q_QUERY_GROUPMEM q_u;
        SAMR_R_QUERY_GROUPMEM r_u;
@@ -926,7 +988,7 @@ static BOOL api_samr_query_groupmem(pipes_struct *p)
  api_samr_add_aliasmem
  ********************************************************************/
 
-static BOOL api_samr_add_aliasmem(pipes_struct *p)
+static bool api_samr_add_aliasmem(pipes_struct *p)
 {
        SAMR_Q_ADD_ALIASMEM q_u;
        SAMR_R_ADD_ALIASMEM r_u;
@@ -956,7 +1018,7 @@ static BOOL api_samr_add_aliasmem(pipes_struct *p)
  api_samr_del_aliasmem
  ********************************************************************/
 
-static BOOL api_samr_del_aliasmem(pipes_struct *p)
+static bool api_samr_del_aliasmem(pipes_struct *p)
 {
        SAMR_Q_DEL_ALIASMEM q_u;
        SAMR_R_DEL_ALIASMEM r_u;
@@ -986,7 +1048,7 @@ static BOOL api_samr_del_aliasmem(pipes_struct *p)
  api_samr_add_groupmem
  ********************************************************************/
 
-static BOOL api_samr_add_groupmem(pipes_struct *p)
+static bool api_samr_add_groupmem(pipes_struct *p)
 {
        SAMR_Q_ADD_GROUPMEM q_u;
        SAMR_R_ADD_GROUPMEM r_u;
@@ -1016,7 +1078,7 @@ static BOOL api_samr_add_groupmem(pipes_struct *p)
  api_samr_del_groupmem
  ********************************************************************/
 
-static BOOL api_samr_del_groupmem(pipes_struct *p)
+static bool api_samr_del_groupmem(pipes_struct *p)
 {
        SAMR_Q_DEL_GROUPMEM q_u;
        SAMR_R_DEL_GROUPMEM r_u;
@@ -1046,7 +1108,7 @@ static BOOL api_samr_del_groupmem(pipes_struct *p)
  api_samr_delete_dom_user
  ********************************************************************/
 
-static BOOL api_samr_delete_dom_user(pipes_struct *p)
+static bool api_samr_delete_dom_user(pipes_struct *p)
 {
        SAMR_Q_DELETE_DOM_USER q_u;
        SAMR_R_DELETE_DOM_USER r_u;
@@ -1076,7 +1138,7 @@ static BOOL api_samr_delete_dom_user(pipes_struct *p)
  api_samr_delete_dom_group
  ********************************************************************/
 
-static BOOL api_samr_delete_dom_group(pipes_struct *p)
+static bool api_samr_delete_dom_group(pipes_struct *p)
 {
        SAMR_Q_DELETE_DOM_GROUP q_u;
        SAMR_R_DELETE_DOM_GROUP r_u;
@@ -1106,7 +1168,7 @@ static BOOL api_samr_delete_dom_group(pipes_struct *p)
  api_samr_delete_dom_alias
  ********************************************************************/
 
-static BOOL api_samr_delete_dom_alias(pipes_struct *p)
+static bool api_samr_delete_dom_alias(pipes_struct *p)
 {
        SAMR_Q_DELETE_DOM_ALIAS q_u;
        SAMR_R_DELETE_DOM_ALIAS r_u;
@@ -1136,7 +1198,7 @@ static BOOL api_samr_delete_dom_alias(pipes_struct *p)
  api_samr_create_dom_group
  ********************************************************************/
 
-static BOOL api_samr_create_dom_group(pipes_struct *p)
+static bool api_samr_create_dom_group(pipes_struct *p)
 {
        SAMR_Q_CREATE_DOM_GROUP q_u;
        SAMR_R_CREATE_DOM_GROUP r_u;
@@ -1166,7 +1228,7 @@ static BOOL api_samr_create_dom_group(pipes_struct *p)
  api_samr_create_dom_alias
  ********************************************************************/
 
-static BOOL api_samr_create_dom_alias(pipes_struct *p)
+static bool api_samr_create_dom_alias(pipes_struct *p)
 {
        SAMR_Q_CREATE_DOM_ALIAS q_u;
        SAMR_R_CREATE_DOM_ALIAS r_u;
@@ -1196,7 +1258,7 @@ static BOOL api_samr_create_dom_alias(pipes_struct *p)
  api_samr_query_groupinfo
  ********************************************************************/
 
-static BOOL api_samr_query_groupinfo(pipes_struct *p)
+static bool api_samr_query_groupinfo(pipes_struct *p)
 {
        SAMR_Q_QUERY_GROUPINFO q_u;
        SAMR_R_QUERY_GROUPINFO r_u;
@@ -1226,7 +1288,7 @@ static BOOL api_samr_query_groupinfo(pipes_struct *p)
  api_samr_set_groupinfo
  ********************************************************************/
 
-static BOOL api_samr_set_groupinfo(pipes_struct *p)
+static bool api_samr_set_groupinfo(pipes_struct *p)
 {
        SAMR_Q_SET_GROUPINFO q_u;
        SAMR_R_SET_GROUPINFO r_u;
@@ -1256,7 +1318,7 @@ static BOOL api_samr_set_groupinfo(pipes_struct *p)
  api_samr_set_aliasinfo
  ********************************************************************/
 
-static BOOL api_samr_set_aliasinfo(pipes_struct *p)
+static bool api_samr_set_aliasinfo(pipes_struct *p)
 {
        SAMR_Q_SET_ALIASINFO q_u;
        SAMR_R_SET_ALIASINFO r_u;
@@ -1286,7 +1348,7 @@ static BOOL api_samr_set_aliasinfo(pipes_struct *p)
  api_samr_get_dom_pwinfo
  ********************************************************************/
 
-static BOOL api_samr_get_dom_pwinfo(pipes_struct *p)
+static bool api_samr_get_dom_pwinfo(pipes_struct *p)
 {
        SAMR_Q_GET_DOM_PWINFO q_u;
        SAMR_R_GET_DOM_PWINFO r_u;
@@ -1316,7 +1378,7 @@ static BOOL api_samr_get_dom_pwinfo(pipes_struct *p)
  api_samr_open_group
  ********************************************************************/
 
-static BOOL api_samr_open_group(pipes_struct *p)
+static bool api_samr_open_group(pipes_struct *p)
 {
        SAMR_Q_OPEN_GROUP q_u;
        SAMR_R_OPEN_GROUP r_u;
@@ -1346,7 +1408,7 @@ static BOOL api_samr_open_group(pipes_struct *p)
  api_samr_remove_sid_foreign_domain
  ********************************************************************/
 
-static BOOL api_samr_remove_sid_foreign_domain(pipes_struct *p)
+static bool api_samr_remove_sid_foreign_domain(pipes_struct *p)
 {
        SAMR_Q_REMOVE_SID_FOREIGN_DOMAIN q_u;
        SAMR_R_REMOVE_SID_FOREIGN_DOMAIN r_u;
@@ -1373,30 +1435,29 @@ static BOOL api_samr_remove_sid_foreign_domain(pipes_struct *p)
 }
 
 /*******************************************************************
- api_samr_query_dom_info
+ api_samr_query_dom_info2
  ********************************************************************/
 
-static BOOL api_samr_unknown_2e(pipes_struct *p)
+static bool api_samr_query_domain_info2(pipes_struct *p)
 {
-       SAMR_Q_UNKNOWN_2E q_u;
-       SAMR_R_UNKNOWN_2E r_u;
+       SAMR_Q_QUERY_DOMAIN_INFO2 q_u;
+       SAMR_R_QUERY_DOMAIN_INFO2 r_u;
        prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
 
        ZERO_STRUCT(q_u);
        ZERO_STRUCT(r_u);
 
-       /* grab the samr unknown 8 command */
-       if(!samr_io_q_unknown_2e("", &q_u, data, 0)) {
-               DEBUG(0,("api_samr_unknown_2e: unable to unmarshall SAMR_Q_UNKNOWN_2E.\n"));
+       if(!samr_io_q_query_domain_info2("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_query_domain_info2: unable to unmarshall SAMR_Q_QUERY_DOMAIN_INFO2.\n"));
                return False;
        }
 
-       r_u.status = _samr_unknown_2e(p, &q_u, &r_u);
+       r_u.status = _samr_query_domain_info2(p, &q_u, &r_u);
 
        /* store the response in the SMB stream */
-       if(!samr_io_r_samr_unknown_2e("", &r_u, rdata, 0)) {
-               DEBUG(0,("api_samr_unknown_2e: unable to marshall SAMR_R_UNKNOWN_2E.\n"));
+       if(!samr_io_r_query_domain_info2("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_query_domain_info2: unable to marshall SAMR_R_QUERY_DOMAIN_INFO2.\n"));
                return False;
        }
 
@@ -1407,7 +1468,7 @@ static BOOL api_samr_unknown_2e(pipes_struct *p)
  api_samr_set_dom_info
  ********************************************************************/
 
-static BOOL api_samr_set_dom_info(pipes_struct *p)
+static bool api_samr_set_dom_info(pipes_struct *p)
 {
        SAMR_Q_SET_DOMAIN_INFO q_u;
        SAMR_R_SET_DOMAIN_INFO r_u;
@@ -1466,7 +1527,7 @@ static struct api_struct api_samr_cmds [] =
       {"SAMR_SET_USERINFO"      , SAMR_SET_USERINFO     , api_samr_set_userinfo     },
       {"SAMR_SET_USERINFO2"     , SAMR_SET_USERINFO2    , api_samr_set_userinfo2    },
       
-      {"SAMR_QUERY_DOMAIN_INFO" , SAMR_QUERY_DOMAIN_INFO, api_samr_query_dom_info   },
+      {"SAMR_QUERY_DOMAIN_INFO" , SAMR_QUERY_DOMAIN_INFO, api_samr_query_domain_info},
       {"SAMR_QUERY_USERGROUPS"  , SAMR_QUERY_USERGROUPS , api_samr_query_usergroups },
       {"SAMR_QUERY_DISPINFO"    , SAMR_QUERY_DISPINFO   , api_samr_query_dispinfo   },
       {"SAMR_QUERY_DISPINFO3"   , SAMR_QUERY_DISPINFO3  , api_samr_query_dispinfo   },
@@ -1489,9 +1550,11 @@ static struct api_struct api_samr_cmds [] =
       {"SAMR_QUERY_SEC_OBJECT"  , SAMR_QUERY_SEC_OBJECT , api_samr_query_sec_obj    },
       {"SAMR_SET_SEC_OBJECT"    , SAMR_SET_SEC_OBJECT   , api_samr_set_sec_obj      },
       {"SAMR_GET_USRDOM_PWINFO" , SAMR_GET_USRDOM_PWINFO, api_samr_get_usrdom_pwinfo},
-      {"SAMR_UNKNOWN_2E"        , SAMR_UNKNOWN_2E       , api_samr_unknown_2e       },
+      {"SAMR_QUERY_DOMAIN_INFO2", SAMR_QUERY_DOMAIN_INFO2, api_samr_query_domain_info2},
       {"SAMR_SET_DOMAIN_INFO"   , SAMR_SET_DOMAIN_INFO  , api_samr_set_dom_info     },
-      {"SAMR_CONNECT4"          , SAMR_CONNECT4         , api_samr_connect4         }
+      {"SAMR_CONNECT4"          , SAMR_CONNECT4         , api_samr_connect4         },
+      {"SAMR_CHGPASSWD_USER3"   , SAMR_CHGPASSWD_USER3  , api_samr_chgpasswd_user3  },
+      {"SAMR_CONNECT5"          , SAMR_CONNECT5         , api_samr_connect5         }
 };
 
 void samr_get_pipe_fns( struct api_struct **fns, int *n_fns )