summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-03-19 01:29:14 +0000
committerJeremy Allison <jra@samba.org>2004-03-19 01:29:14 +0000
commita79b205d9202a61ef5c82f7fccd1513df0290585 (patch)
tree05130d78759973ef94d3b01503c4b4a9ab6082ca
parent7942c2826b9f1f16246ef284009572427ec44909 (diff)
downloadsamba-a79b205d9202a61ef5c82f7fccd1513df0290585.tar.gz
samba-a79b205d9202a61ef5c82f7fccd1513df0290585.tar.bz2
samba-a79b205d9202a61ef5c82f7fccd1513df0290585.zip
Fix gcc warnings. Fix mkproto with new type.
Jeremy. (This used to be commit 00fa66df3edeb92ec5efd49bd61f98691e74877a)
-rw-r--r--source3/passdb/pdb_ldap.c21
-rw-r--r--source3/script/mkproto.awk2
2 files changed, 12 insertions, 11 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index b7e28a9e99..2141f2a3f1 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -770,15 +770,15 @@ static BOOL init_sam_from_ldap (struct ldapsam_privates *ldap_state,
/* see if we have newer updates */
if (!(cache_entry = login_cache_read(sampass))) {
- DEBUG (9, ("No cache entry, bad count = %d, bad time = %d\n",
- pdb_get_bad_password_count(sampass),
- pdb_get_bad_password_time(sampass)));
+ DEBUG (9, ("No cache entry, bad count = %u, bad time = %u\n",
+ (unsigned int)pdb_get_bad_password_count(sampass),
+ (unsigned int)pdb_get_bad_password_time(sampass)));
return True;
}
- DEBUG(7, ("ldap time is %d, cache time is %d, bad time = %d\n",
- ldap_entry_time, cache_entry->entry_timestamp,
- cache_entry->bad_password_time));
+ DEBUG(7, ("ldap time is %u, cache time is %u, bad time = %u\n",
+ (unsigned int)ldap_entry_time, (unsigned int)cache_entry->entry_timestamp,
+ (unsigned int)cache_entry->bad_password_time));
if (ldap_entry_time > cache_entry->entry_timestamp) {
/* cache is older than directory , so
@@ -1038,11 +1038,13 @@ static BOOL init_ldap_from_sam (struct ldapsam_privates *ldap_state,
uint32 pol;
account_policy_get(AP_BAD_ATTEMPT_LOCKOUT, &pol);
- DEBUG(3, ("updating bad password fields, policy=%d, count=%d, time=%d\n", pol, badcount, badtime));
+ DEBUG(3, ("updating bad password fields, policy=%u, count=%u, time=%u\n",
+ (unsigned int)pol, (unsigned int)badcount, (unsigned int)badtime));
if ((badcount >= pol) || (badcount == 0)) {
- DEBUG(7, ("making mods to update ldap, count=%d, time=%d\n", badcount, badtime));
- slprintf (temp, sizeof (temp) - 1, "%li", badcount);
+ DEBUG(7, ("making mods to update ldap, count=%u, time=%u\n",
+ (unsigned int)badcount, (unsigned int)badtime));
+ slprintf (temp, sizeof (temp) - 1, "%li", (long)badcount);
smbldap_make_mod(
ldap_state->smbldap_state->ldap_struct,
existing, mods,
@@ -1070,7 +1072,6 @@ static BOOL init_ldap_from_sam (struct ldapsam_privates *ldap_state,
DEBUG(7, ("Updating bad password count and time in login cache\n"));
login_cache_write(sampass, cache_entry);
}
-
}
return True;
diff --git a/source3/script/mkproto.awk b/source3/script/mkproto.awk
index 3835ea3af3..b38f405e0d 100644
--- a/source3/script/mkproto.awk
+++ b/source3/script/mkproto.awk
@@ -132,7 +132,7 @@ END {
gotstart = 1;
}
- if( $0 ~ /^WINBINDD_PW|^WINBINDD_GR|^NT_PRINTER_INFO_LEVEL_2/ ) {
+ if( $0 ~ /^WINBINDD_PW|^WINBINDD_GR|^NT_PRINTER_INFO_LEVEL_2|^LOGIN_CACHE/ ) {
gotstart = 1;
}