[GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch.

[samba.git] / source / rpc_server / srv_samr.c

diff --git a/source/rpc_server/srv_samr.c b/source/rpc_server/srv_samr.c
index 8e4955a81c2bbe11b82c1e5d3e5d43fc3e5959ae..bdc082f647938598d62636929b2c1be0a143c7fe 100644 (file)
--- a/source/rpc_server/srv_samr.c
+++ b/source/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/>.
  */
 
 /*
@@ -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;
        }
 
@@ -1449,7 +1448,6 @@ static BOOL api_samr_query_domain_info2(pipes_struct *p)
        ZERO_STRUCT(q_u);
        ZERO_STRUCT(r_u);
 
-       /* grab the samr unknown 8 command */
        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;
@@ -1458,7 +1456,7 @@ static BOOL api_samr_query_domain_info2(pipes_struct *p)
        r_u.status = _samr_query_domain_info2(p, &q_u, &r_u);
 
        /* store the response in the SMB stream */
-       if(!samr_io_r_samr_query_domain_info2("", &r_u, rdata, 0)) {
+       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;
        }
@@ -1529,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   },