Make sure prototypes are always included, make some functions static and

[samba.git] / source4 / rpc_server / drsuapi / dcesrv_drsuapi.c

diff --git a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
index bbb78cb7787f227ec38b216072151e34ebe161e8..6af8ea50b59a1dd31b1ea7428a4d3ef4fc63cff1 100644 (file)
--- a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
+++ b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
@@ -69,7 +69,7 @@ static WERROR dcesrv_drsuapi_DsBind(struct dcesrv_call_state *dce_call, TALLOC_C
        server_site_dn = samdb_server_site_dn(b_state->sam_ctx, mem_ctx);
        W_ERROR_HAVE_NO_MEMORY(server_site_dn);
 
-       ret = ldb_search_exp_fmt(b_state->sam_ctx, mem_ctx, &site_res,
+       ret = ldb_search(b_state->sam_ctx, mem_ctx, &site_res,
                                 server_site_dn, LDB_SCOPE_BASE, site_attrs,
                                 "(objectClass=*)");
        if (ret != LDB_SUCCESS) {
@@ -86,7 +86,7 @@ static WERROR dcesrv_drsuapi_DsBind(struct dcesrv_call_state *dce_call, TALLOC_C
        ntds_dn = samdb_ntds_settings_dn(b_state->sam_ctx);
        W_ERROR_HAVE_NO_MEMORY(ntds_dn);
 
-       ret = ldb_search_exp_fmt(b_state->sam_ctx, mem_ctx, &ntds_res,
+       ret = ldb_search(b_state->sam_ctx, mem_ctx, &ntds_res,
                                 ntds_dn, LDB_SCOPE_BASE, ntds_attrs,
                                 "(objectClass=*)");
        if (ret != LDB_SUCCESS) {
@@ -330,19 +330,21 @@ static WERROR dcesrv_drsuapi_DsGetNT4ChangeLog(struct dcesrv_call_state *dce_cal
 /* 
   drsuapi_DsCrackNames 
 */
-WERROR dcesrv_drsuapi_DsCrackNames(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_drsuapi_DsCrackNames(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                            struct drsuapi_DsCrackNames *r)
 {
        WERROR status;
        struct drsuapi_bind_state *b_state;
        struct dcesrv_handle *h;
 
-       r->out.level = r->in.level;
-       ZERO_STRUCT(r->out.ctr);
+       *r->out.level_out = r->in.level;
 
        DCESRV_PULL_HANDLE_WERR(h, r->in.bind_handle, DRSUAPI_BIND_HANDLE);
        b_state = h->data;
 
+       r->out.ctr = talloc_zero(mem_ctx, union drsuapi_DsNameCtr);
+       W_ERROR_HAVE_NO_MEMORY(r->out.ctr);
+
        switch (r->in.level) {
                case 1: {
                        struct drsuapi_DsNameCtr1 *ctr1;
@@ -353,16 +355,16 @@ WERROR dcesrv_drsuapi_DsCrackNames(struct dcesrv_call_state *dce_call, TALLOC_CT
                        ctr1 = talloc(mem_ctx, struct drsuapi_DsNameCtr1);
                        W_ERROR_HAVE_NO_MEMORY(ctr1);
 
-                       count = r->in.req.req1.count;
+                       count = r->in.req->req1.count;
                        names = talloc_array(mem_ctx, struct drsuapi_DsNameInfo1, count);
                        W_ERROR_HAVE_NO_MEMORY(names);
 
                        for (i=0; i < count; i++) {
                                status = DsCrackNameOneName(b_state->sam_ctx, mem_ctx,
-                                                           r->in.req.req1.format_flags,
-                                                           r->in.req.req1.format_offered,
-                                                           r->in.req.req1.format_desired,
-                                                           r->in.req.req1.names[i].str,
+                                                           r->in.req->req1.format_flags,
+                                                           r->in.req->req1.format_offered,
+                                                           r->in.req->req1.format_desired,
+                                                           r->in.req->req1.names[i].str,
                                                            &names[i]);
                                if (!W_ERROR_IS_OK(status)) {
                                        return status;
@@ -371,7 +373,7 @@ WERROR dcesrv_drsuapi_DsCrackNames(struct dcesrv_call_state *dce_call, TALLOC_CT
 
                        ctr1->count = count;
                        ctr1->array = names;
-                       r->out.ctr.ctr1 = ctr1;
+                       r->out.ctr->ctr1 = ctr1;
 
                        return WERR_OK;
                }
@@ -389,17 +391,20 @@ static WERROR dcesrv_drsuapi_DsWriteAccountSpn(struct dcesrv_call_state *dce_cal
        struct drsuapi_bind_state *b_state;
        struct dcesrv_handle *h;
 
-       r->out.level = r->in.level;
+       *r->out.level_out = r->in.level;
 
        DCESRV_PULL_HANDLE_WERR(h, r->in.bind_handle, DRSUAPI_BIND_HANDLE);
        b_state = h->data;
 
+       r->out.res = talloc(mem_ctx, union drsuapi_DsWriteAccountSpnResult);
+       W_ERROR_HAVE_NO_MEMORY(r->out.res);
+
        switch (r->in.level) {
                case 1: {
                        struct drsuapi_DsWriteAccountSpnRequest1 *req;
                        struct ldb_message *msg;
                        int count, i, ret;
-                       req = &r->in.req.req1;
+                       req = &r->in.req->req1;
                        count = req->count;
 
                        msg = ldb_msg_new(mem_ctx);
@@ -409,7 +414,7 @@ static WERROR dcesrv_drsuapi_DsWriteAccountSpn(struct dcesrv_call_state *dce_cal
 
                        msg->dn = ldb_dn_new(msg, b_state->sam_ctx, req->object_dn);
                        if ( ! ldb_dn_validate(msg->dn)) {
-                               r->out.res.res1.status = WERR_OK;
+                               r->out.res->res1.status = WERR_OK;
                                return WERR_OK;
                        }
                        
@@ -440,9 +445,9 @@ static WERROR dcesrv_drsuapi_DsWriteAccountSpn(struct dcesrv_call_state *dce_cal
                                DEBUG(0,("Failed to modify SPNs on %s: %s\n",
                                         ldb_dn_get_linearized(msg->dn), 
                                         ldb_errstring(b_state->sam_ctx)));
-                               r->out.res.res1.status = WERR_ACCESS_DENIED;
+                               r->out.res->res1.status = WERR_ACCESS_DENIED;
                        } else {
-                               r->out.res.res1.status = WERR_OK;
+                               r->out.res->res1.status = WERR_OK;
                        }
 
                        return WERR_OK;
@@ -473,7 +478,7 @@ static WERROR dcesrv_DRSUAPI_REMOVE_DS_DOMAIN(struct dcesrv_call_state *dce_call
 }
 
 /* Obtain the site name from a server DN */
-const char *result_site_name(struct ldb_dn *site_dn)
+static const char *result_site_name(struct ldb_dn *site_dn)
 {
        /* Format is cn=<NETBIOS name>,cn=Servers,cn=<site>,cn=sites.... */
        const struct ldb_val *val = ldb_dn_get_component_val(site_dn, 2);
@@ -519,14 +524,16 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta
 
        int ret, i;
 
-       r->out.level_out = r->in.req.req1.level;
+       *r->out.level_out = r->in.req->req1.level;
+       r->out.ctr = talloc(mem_ctx, union drsuapi_DsGetDCInfoCtr);
+       W_ERROR_HAVE_NO_MEMORY(r->out.ctr);
 
        sites_dn = samdb_sites_dn(b_state->sam_ctx, mem_ctx);
        if (!sites_dn) {
                return WERR_DS_OBJ_NOT_FOUND;
        }
 
-       switch (r->out.level_out) {
+       switch (*r->out.level_out) {
        case -1:
                /* this level is not like the others */
                return WERR_UNKNOWN_LEVEL;
@@ -540,7 +547,7 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta
                return WERR_UNKNOWN_LEVEL;
        }
 
-       ret = ldb_search_exp_fmt(b_state->sam_ctx, mem_ctx, &res, sites_dn, LDB_SCOPE_SUBTREE, attrs, 
+       ret = ldb_search(b_state->sam_ctx, mem_ctx, &res, sites_dn, LDB_SCOPE_SUBTREE, attrs,
                                 "objectClass=server");
        
        if (ret) {
@@ -549,9 +556,9 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta
                return WERR_GENERAL_FAILURE;
        }
 
-       switch (r->out.level_out) {
+       switch (*r->out.level_out) {
        case 1:
-               ctr1 = &r->out.ctr.ctr1;
+               ctr1 = &r->out.ctr->ctr1;
                ctr1->count = res->count;
                ctr1->array = talloc_zero_array(mem_ctx, 
                                                struct drsuapi_DsGetDCInfo1, 
@@ -571,7 +578,7 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta
                                return WERR_NOMEM;
                        }
 
-                       ret = ldb_search_exp_fmt(b_state->sam_ctx, mem_ctx, &res_account, ref_dn, 
+                       ret = ldb_search(b_state->sam_ctx, mem_ctx, &res_account, ref_dn,
                                                 LDB_SCOPE_BASE, attrs_account_1, "objectClass=computer");
                        if (ret == LDB_SUCCESS && res_account->count == 1) {
                                const char *errstr;
@@ -588,7 +595,7 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta
                                                                     &domain_dn, &errstr);
                                
                                if (ret == LDB_SUCCESS) {
-                                       ret = ldb_search_exp_fmt(b_state->sam_ctx, mem_ctx, &res_domain, domain_dn, 
+                                       ret = ldb_search(b_state->sam_ctx, mem_ctx, &res_domain, domain_dn,
                                                                 LDB_SCOPE_BASE, attrs_none, "fSMORoleOwner=%s",
                                                                 ldb_dn_get_linearized(ntds_dn));
                                        if (ret) {
@@ -614,7 +621,7 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta
                }
                break;
        case 2:
-               ctr2 = &r->out.ctr.ctr2;
+               ctr2 = &r->out.ctr->ctr2;
                ctr2->count = res->count;
                ctr2->array = talloc_zero_array(mem_ctx, 
                                                 struct drsuapi_DsGetDCInfo2, 
@@ -641,7 +648,7 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta
                                return WERR_NOMEM;
                        }
 
-                       ret = ldb_search_exp_fmt(b_state->sam_ctx, mem_ctx, &res_ntds, ntds_dn, 
+                       ret = ldb_search(b_state->sam_ctx, mem_ctx, &res_ntds, ntds_dn,
                                                 LDB_SCOPE_BASE, attrs_ntds, "objectClass=nTDSDSA");
                        if (ret == LDB_SUCCESS && res_ntds->count == 1) {
                                ctr2->array[i].is_gc
@@ -655,7 +662,7 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta
                                          ldb_dn_get_linearized(ntds_dn), ldb_errstring(b_state->sam_ctx)));
                        }
 
-                       ret = ldb_search_exp_fmt(b_state->sam_ctx, mem_ctx, &res_site, site_dn, 
+                       ret = ldb_search(b_state->sam_ctx, mem_ctx, &res_site, site_dn,
                                                 LDB_SCOPE_BASE, attrs_site, "objectClass=site");
                        if (ret == LDB_SUCCESS && res_site->count == 1) {
                                ctr2->array[i].site_guid 
@@ -667,7 +674,7 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta
                                          ldb_dn_get_linearized(site_dn), ldb_errstring(b_state->sam_ctx)));
                        }
 
-                       ret = ldb_search_exp_fmt(b_state->sam_ctx, mem_ctx, &res_account, ref_dn, 
+                       ret = ldb_search(b_state->sam_ctx, mem_ctx, &res_account, ref_dn,
                                                 LDB_SCOPE_BASE, attrs_account_2, "objectClass=computer");
                        if (ret == LDB_SUCCESS && res_account->count == 1) {
                                const char *errstr;
@@ -685,7 +692,7 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta
                                                                     &domain_dn, &errstr);
                                
                                if (ret == LDB_SUCCESS) {
-                                       ret = ldb_search_exp_fmt(b_state->sam_ctx, mem_ctx, &res_domain, domain_dn, 
+                                       ret = ldb_search(b_state->sam_ctx, mem_ctx, &res_domain, domain_dn,
                                                                 LDB_SCOPE_BASE, attrs_none, "fSMORoleOwner=%s",
                                                                 ldb_dn_get_linearized(ntds_dn));
                                        if (ret == LDB_SUCCESS && res_domain->count == 1) {