summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2010-10-05 09:27:36 +0200
committerMatthias Dieter Wallnöfer <mdw@sn-devel-104.sn.samba.org>2010-10-05 08:43:19 +0000
commit0e5b77bec44863b1ad440e45fd0933f07e797261 (patch)
tree54e1f38bf81f0eb1f6f2e8d0a3ee57575ccab0f0
parent933aef0bf4aa52c5b4a584858f635833eb0243bd (diff)
downloadsamba-0e5b77bec44863b1ad440e45fd0933f07e797261.tar.gz
samba-0e5b77bec44863b1ad440e45fd0933f07e797261.tar.bz2
samba-0e5b77bec44863b1ad440e45fd0933f07e797261.zip
s4:kdc - use "userAccountControl" always unsigned
It doesn't change much but it's nicer to have it consistent.
-rw-r--r--source4/kdc/db-glue.c6
-rw-r--r--source4/kdc/pac-glue.c2
-rw-r--r--source4/rpc_server/lsa/dcesrv_lsa.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c
index 3e918cf360..10d25ee184 100644
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -85,7 +85,7 @@ static KerberosTime ldb_msg_find_krb5time_ldap_time(struct ldb_message *msg, con
return timegm(&tm);
}
-static HDBFlags uf2HDBFlags(krb5_context context, int userAccountControl, enum samba_kdc_ent_type ent_type)
+static HDBFlags uf2HDBFlags(krb5_context context, uint32_t userAccountControl, enum samba_kdc_ent_type ent_type)
{
HDBFlags flags = int2HDBFlags(0);
@@ -197,7 +197,7 @@ static krb5_error_code samba_kdc_message2entry_keys(krb5_context context,
struct ldb_message *msg,
uint32_t rid,
bool is_rodc,
- unsigned int userAccountControl,
+ uint32_t userAccountControl,
enum samba_kdc_ent_type ent_type,
hdb_entry_ex *entry_ex)
{
@@ -544,7 +544,7 @@ static krb5_error_code samba_kdc_message2entry(krb5_context context,
hdb_entry_ex *entry_ex)
{
struct loadparm_context *lp_ctx = kdc_db_ctx->lp_ctx;
- unsigned int userAccountControl;
+ uint32_t userAccountControl;
unsigned int i;
krb5_error_code ret = 0;
krb5_boolean is_computer = FALSE;
diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index b9a686cf14..c7e3876e80 100644
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -107,7 +107,7 @@ bool samba_princ_needs_pac(struct hdb_entry_ex *princ)
{
struct samba_kdc_entry *p = talloc_get_type(princ->ctx, struct samba_kdc_entry);
- unsigned int userAccountControl;
+ uint32_t userAccountControl;
/* The service account may be set not to want the PAC */
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index 74c28595c3..7acf0364e2 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -1230,7 +1230,7 @@ static NTSTATUS dcesrv_lsa_OpenTrustedDomain(struct dcesrv_call_state *dce_call,
/* search for the trusted_domain record */
ret = gendb_search(trusted_domain_state->policy->sam_ldb,
mem_ctx, policy_state->domain_dn, &msgs, attrs,
- "(&(samaccountname=%s$)(objectclass=user)(userAccountControl:1.2.840.113556.1.4.803:=%d))",
+ "(&(samaccountname=%s$)(objectclass=user)(userAccountControl:1.2.840.113556.1.4.803:=%u))",
flatname, UF_INTERDOMAIN_TRUST_ACCOUNT);
if (ret == 1) {
trusted_domain_state->trusted_domain_user_dn = talloc_steal(trusted_domain_state, msgs[0]->dn);