summaryrefslogtreecommitdiff
path: root/source4/dsdb/samdb
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-08-11 13:12:45 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:31:37 -0500
commit3be75a4c6d4b9d86f1b85c75fb2f41c6c0eeec94 (patch)
treeb9d5ef9d55e280560296622720eea49d436e97cd /source4/dsdb/samdb
parent32e76af21a3b983e1cf73ae3e488251ba9a0f97f (diff)
downloadsamba-3be75a4c6d4b9d86f1b85c75fb2f41c6c0eeec94.tar.gz
samba-3be75a4c6d4b9d86f1b85c75fb2f41c6c0eeec94.tar.bz2
samba-3be75a4c6d4b9d86f1b85c75fb2f41c6c0eeec94.zip
r9240: - move struct security_token to the idl file, with this we can
the ndr_pull/push/print functions for it in the ntacl-lsm module - fix compiler warnings in the ldap_encode_ndr_* code metze (This used to be commit 83d65d0d7ed9c240ad44aa2c881c1f07212bfda4)
Diffstat (limited to 'source4/dsdb/samdb')
-rw-r--r--source4/dsdb/samdb/samdb_privilege.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/dsdb/samdb/samdb_privilege.c b/source4/dsdb/samdb/samdb_privilege.c
index 7560d21db5..059d612225 100644
--- a/source4/dsdb/samdb/samdb_privilege.c
+++ b/source4/dsdb/samdb/samdb_privilege.c
@@ -21,7 +21,7 @@
*/
#include "includes.h"
-#include "libcli/security/security.h"
+#include "librpc/gen_ndr/security.h"
#include "lib/ldb/include/ldb.h"
/*
@@ -35,7 +35,7 @@ static NTSTATUS samdb_privilege_setup_sid(void *samctx, TALLOC_CTX *mem_ctx,
struct ldb_message **res = NULL;
struct ldb_message_element *el;
int ret, i;
- const char *sidstr;
+ char *sidstr;
*mask = 0;
@@ -55,7 +55,7 @@ static NTSTATUS samdb_privilege_setup_sid(void *samctx, TALLOC_CTX *mem_ctx,
}
for (i=0;i<el->num_values;i++) {
- const char *priv_str = el->values[i].data;
+ const char *priv_str = (const char *)el->values[i].data;
int privilege = sec_privilege_id(priv_str);
if (privilege == -1) {
DEBUG(1,("Unknown privilege '%s' in samdb\n",