The branch, master has been updated
via 827ccdf... s4:kdc/wdc-samba4.c - fix integer counter types
via ad898fd... s4:kdc/db-glue.c - fix integer counter types
from 64f4183... s4:Added a test for correct CO expansion in SD creation.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 827ccdf6b9c36b7fe0c9b818debd422edceead37
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sun Apr 11 23:22:01 2010 +0200
s4:kdc/wdc-samba4.c - fix integer counter types
commit ad898fd63815823309019403ef32f516f4dfbf86
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sun Apr 11 23:17:15 2010 +0200
s4:kdc/db-glue.c - fix integer counter types
-----------------------------------------------------------------------
Summary of changes:
source4/kdc/db-glue.c | 13 +++++++------
source4/kdc/wdc-samba4.c | 3 ++-
2 files changed, 9 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c
index 8871b0e..49babef 100644
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -208,8 +208,8 @@ static krb5_error_code
samba_kdc_message2entry_keys(krb5_context context,
struct package_PrimaryKerberosBlob _pkb;
struct package_PrimaryKerberosCtr3 *pkb3 = NULL;
struct package_PrimaryKerberosCtr4 *pkb4 = NULL;
- uint32_t i;
- uint32_t allocated_keys = 0;
+ uint16_t i;
+ uint16_t allocated_keys = 0;
entry_ex->entry.keys.val = NULL;
entry_ex->entry.keys.len = 0;
@@ -498,7 +498,7 @@ static krb5_error_code samba_kdc_message2entry(krb5_context
context,
{
struct loadparm_context *lp_ctx = kdc_db_ctx->lp_ctx;
unsigned int userAccountControl;
- int i;
+ unsigned int i;
krb5_error_code ret = 0;
krb5_boolean is_computer = FALSE;
char *realm = strupper_talloc(mem_ctx, lp_realm(lp_ctx));
@@ -760,7 +760,8 @@ static krb5_error_code
samba_kdc_trust_message2entry(krb5_context context,
struct samba_kdc_entry *p;
enum ndr_err_code ndr_err;
- int i, ret, trust_direction_flags;
+ int ret, trust_direction_flags;
+ unsigned int i;
p = talloc(mem_ctx, struct samba_kdc_entry);
if (!p) {
@@ -1281,8 +1282,8 @@ done:
}
struct samba_kdc_seq {
- int index;
- int count;
+ unsigned int index;
+ unsigned int count;
struct ldb_message **msgs;
struct ldb_dn *realm_dn;
};
diff --git a/source4/kdc/wdc-samba4.c b/source4/kdc/wdc-samba4.c
index f6e5546..ce8f542 100644
--- a/source4/kdc/wdc-samba4.c
+++ b/source4/kdc/wdc-samba4.c
@@ -106,7 +106,8 @@ static krb5_error_code samba_wdc_reget_pac(void *priv,
krb5_context context,
static char *get_netbios_name(TALLOC_CTX *mem_ctx, HostAddresses *addrs)
{
char *nb_name = NULL;
- int len, i;
+ size_t len;
+ unsigned int i;
for (i = 0; addrs && i < addrs->len; i++) {
if (addrs->val[i].addr_type != KRB5_ADDRESS_NETBIOS) {
--
Samba Shared Repository
