Merge branch 'master' of ssh://git.samba.org/data/git/samba

[samba.git] / source4 / dsdb / samdb / samdb_privilege.c

diff --git a/source4/dsdb/samdb/samdb_privilege.c b/source4/dsdb/samdb/samdb_privilege.c
index ba29a8e96ed1c0869d0c5c43f639c20be4b7d478..f05b7e2a186dbf68407e46f6658d0dd296533e58 100644 (file)
--- a/source4/dsdb/samdb/samdb_privilege.c
+++ b/source4/dsdb/samdb/samdb_privilege.c
@@ -7,7 +7,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,
@@ -16,36 +16,45 @@
    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/>.
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/security.h"
-#include "lib/ldb/include/ldb.h"
-#include "libcli/ldap/ldap.h"
+#include "libcli/ldap/ldap_ndr.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
+#include "libcli/security/security.h"
+#include "../lib/util/util_ldb.h"
+#include "param/param.h"
+#include "ldb_wrap.h"
+
+/* connect to the privilege database */
+struct ldb_context *privilege_connect(TALLOC_CTX *mem_ctx, 
+                                     struct tevent_context *ev_ctx,
+                                     struct loadparm_context *lp_ctx)
+{
+       return ldb_wrap_connect(mem_ctx, ev_ctx, lp_ctx, "privilege.ldb",
+                               NULL, NULL, 0);
+}
 
 /*
   add privilege bits for one sid to a security_token
 */
-static NTSTATUS samdb_privilege_setup_sid(void *samctx, TALLOC_CTX *mem_ctx,
-                                         const struct dom_sid *sid, 
-                                         uint64_t *mask)
+static NTSTATUS samdb_privilege_setup_sid(struct ldb_context *pdb, TALLOC_CTX *mem_ctx,
+                                         struct security_token *token,
+                                         const struct dom_sid *sid)
 {
        const char * const attrs[] = { "privilege", NULL };
        struct ldb_message **res = NULL;
        struct ldb_message_element *el;
-       int ret, i;
+       unsigned int i;
+       int ret;
        char *sidstr;
-       
-       *mask = 0;
 
        sidstr = ldap_encode_ndr_dom_sid(mem_ctx, sid);
        NT_STATUS_HAVE_NO_MEMORY(sidstr);
 
-       ret = gendb_search(samctx, mem_ctx, NULL, &res, attrs, "objectSid=%s", sidstr);
+       ret = gendb_search(pdb, mem_ctx, NULL, &res, attrs, "objectSid=%s", sidstr);
        talloc_free(sidstr);
        if (ret != 1) {
                /* not an error to not match */
@@ -59,13 +68,13 @@ static NTSTATUS samdb_privilege_setup_sid(void *samctx, TALLOC_CTX *mem_ctx,
 
        for (i=0;i<el->num_values;i++) {
                const char *priv_str = (const char *)el->values[i].data;
-               int privilege = sec_privilege_id(priv_str);
+               enum sec_privilege privilege = sec_privilege_id(priv_str);
                if (privilege == -1) {
                        DEBUG(1,("Unknown privilege '%s' in samdb\n",
                                 priv_str));
                        continue;
                }
-               *mask |= sec_privilege_mask(privilege);
+               security_token_set_privilege(token, privilege);
        }
 
        return NT_STATUS_OK;
@@ -75,27 +84,33 @@ static NTSTATUS samdb_privilege_setup_sid(void *samctx, TALLOC_CTX *mem_ctx,
   setup the privilege mask for this security token based on our
   local SAM
 */
-NTSTATUS samdb_privilege_setup(struct security_token *token)
+NTSTATUS samdb_privilege_setup(struct tevent_context *ev_ctx, 
+                              struct loadparm_context *lp_ctx, struct security_token *token)
 {
-       void *samctx;
+       struct ldb_context *pdb;
        TALLOC_CTX *mem_ctx;
-       int i;
+       unsigned int i;
        NTSTATUS status;
 
        /* Shortcuts to prevent recursion and avoid lookups */
-       if (is_system_token(token)) {
+       if (token->user_sid == NULL) {
+               token->privilege_mask = 0;
+               return NT_STATUS_OK;
+       }
+
+       if (security_token_is_system(token)) {
                token->privilege_mask = ~0;
                return NT_STATUS_OK;
        }
 
-       if (is_anonymous_token(token)) {
+       if (security_token_is_anonymous(token)) {
                token->privilege_mask = 0;
                return NT_STATUS_OK;
        }
 
        mem_ctx = talloc_new(token);
-       samctx = samdb_connect(mem_ctx, system_session(mem_ctx));
-       if (samctx == NULL) {
+       pdb = privilege_connect(mem_ctx, ev_ctx, lp_ctx);
+       if (pdb == NULL) {
                talloc_free(mem_ctx);
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }
@@ -103,14 +118,12 @@ NTSTATUS samdb_privilege_setup(struct security_token *token)
        token->privilege_mask = 0;
        
        for (i=0;i<token->num_sids;i++) {
-               uint64_t mask;
-               status = samdb_privilege_setup_sid(samctx, mem_ctx, 
-                                                  token->sids[i], &mask);
+               status = samdb_privilege_setup_sid(pdb, mem_ctx,
+                                                  token, token->sids[i]);
                if (!NT_STATUS_IS_OK(status)) {
                        talloc_free(mem_ctx);
                        return status;
                }
-               token->privilege_mask |= mask;
        }
 
        talloc_free(mem_ctx);