From: Tim Potter <tpot@samba.org>
Date: Thu, 3 Apr 2003 06:16:53 +0000 (+0000)
Subject: Fix a compile warning in slprintf format string.
X-Git-Tag: release-4-0-0alpha6~801^2~11793^2~1412
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=b5989bdb1c5b3bb40e993f8ced85696c27e498dc;p=amitay%2Fsamba.git

Fix a compile warning in slprintf format string.

Possible typo: winbind_idmap_methods -> winbindd_idmap_methods

Fix wrong format char when generating a ldap filter string.
(This used to be commit f9cb23e68753337676876b97b145e04ad423e184)
---

diff --git a/source3/nsswitch/winbindd_idmap_ldap.c b/source3/nsswitch/winbindd_idmap_ldap.c
index b0b260e34da..7ffddf9ac46 100644
--- a/source3/nsswitch/winbindd_idmap_ldap.c
+++ b/source3/nsswitch/winbindd_idmap_ldap.c
@@ -77,7 +77,7 @@ static long ldap_allocate_id(BOOL is_user)
 			smb_ldap_make_a_mod(&mods, LDAP_MOD_DELETE, 
 					    is_user?"uidNumber":"gidNumber",
 					    temp);
-			slprintf(temp, sizeof(temp) - 1, "%i", ret + 1);
+			slprintf(temp, sizeof(temp) - 1, "%ld", ret + 1);
 			smb_ldap_make_a_mod(&mods, LDAP_MOD_ADD, is_user?"uidNumber":"gidNumber", temp);
 			slprintf(temp, sizeof(temp) - 1, "cn=%cID Pool,%s", is_user?'U':'G', lp_ldap_user_suffix());
 			rc = smb_ldap_modify(ldap_state, temp, mods);
@@ -305,7 +305,7 @@ static BOOL ldap_get_gid_from_sid(DOM_SID *sid, gid_t *gid)
 
 	sid_to_string(str_sid, sid);
 
-	slprintf(filter, sizeof(filter) - 1, "ntSid=%d,objectClass=sambaGroupMapping", str_sid);
+	slprintf(filter, sizeof(filter) - 1, "ntSid=%s,objectClass=sambaGroupMapping", str_sid);
 
 	DEBUG(2, ("ldap_get_gid_from_sid: searching for:[%s]\n", filter));
 
@@ -365,7 +365,7 @@ static void ldap_idmap_status(void)
 	DEBUG(0, ("Using LDAP\n"));
 }
 
-struct winbind_idmap_methods ldap_idmap_methods = {
+struct winbindd_idmap_methods ldap_idmap_methods = {
 	ldap_idmap_init,
 
 	ldap_get_sid_from_uid,
@@ -381,7 +381,7 @@ struct winbind_idmap_methods ldap_idmap_methods = {
 
 #endif
 
-BOOL winbind_idmap_reg_ldap(struct winbind_idmap_methods **meth)
+BOOL winbind_idmap_reg_ldap(struct winbindd_idmap_methods **meth)
 {
 #ifdef HAVE_LDAP
 	*meth = &ldap_idmap_methods;