Changeset 745 for trunk/server/source3/passdb/pdb_ldap.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/passdb/pdb_ldap.c (modified) (112 diffs)

trunk/server/source3/passdb/pdb_ldap.c

@@ -45 +45 @@
 
 #include "includes.h"
+#include "passdb.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "secrets.h"
+#include "idmap_cache.h"
+#include "../libcli/security/security.h"
+#include "../lib/util/util_pw.h"
+#include "lib/winbind_util.h"
 
 #undef DBGC_CLASS
@@ -52 +58 @@
 #include <lber.h>
 #include <ldap.h>
-
-/*
- * Work around versions of the LDAP client libs that don't have the OIDs
- * defined, or have them defined under the old name.  
- * This functionality is really a factor of the server, not the client 
- *
- */
-
-#if defined(LDAP_EXOP_X_MODIFY_PASSWD) && !defined(LDAP_EXOP_MODIFY_PASSWD)
-#define LDAP_EXOP_MODIFY_PASSWD LDAP_EXOP_X_MODIFY_PASSWD
-#elif !defined(LDAP_EXOP_MODIFY_PASSWD)
-#define LDAP_EXOP_MODIFY_PASSWD "1.3.6.1.4.1.4203.1.11.1"
-#endif
-
-#if defined(LDAP_EXOP_X_MODIFY_PASSWD_ID) && !defined(LDAP_EXOP_MODIFY_PASSWD_ID)
-#define LDAP_TAG_EXOP_MODIFY_PASSWD_ID LDAP_EXOP_X_MODIFY_PASSWD_ID
-#elif !defined(LDAP_EXOP_MODIFY_PASSWD_ID)
-#define LDAP_TAG_EXOP_MODIFY_PASSWD_ID        ((ber_tag_t) 0x80U)
-#endif
-
-#if defined(LDAP_EXOP_X_MODIFY_PASSWD_NEW) && !defined(LDAP_EXOP_MODIFY_PASSWD_NEW)
-#define LDAP_TAG_EXOP_MODIFY_PASSWD_NEW LDAP_EXOP_X_MODIFY_PASSWD_NEW
-#elif !defined(LDAP_EXOP_MODIFY_PASSWD_NEW)
-#define LDAP_TAG_EXOP_MODIFY_PASSWD_NEW       ((ber_tag_t) 0x82U)
-#endif
 
 
@@ -85 +66 @@
  **********************************************************************/
 
-static LDAP *priv2ld(struct ldapsam_privates *priv)
+LDAP *priv2ld(struct ldapsam_privates *priv)
 {
         return priv->smbldap_state->ldap_struct;
@@ -377 +358 @@
 
 static int ldapsam_search_suffix_by_rid (struct ldapsam_privates *ldap_state,
-                                         uint32 rid, LDAPMessage ** result,
+                                         uint32_t rid, LDAPMessage ** result,
                                          const char **attr)
 {
@@ -400 +381 @@
 
 static int ldapsam_search_suffix_by_sid (struct ldapsam_privates *ldap_state,
-                                 const DOM_SID *sid, LDAPMessage ** result,
+                                 const struct dom_sid *sid, LDAPMessage ** result,
                                  const char **attr)
 {
@@ -530 +511 @@
                         *workstations = NULL,
                         *munged_dial = NULL;
-        uint32          user_rid;
+        uint32_t                user_rid;
         uint8           smblmpwd[LM_HASH_LEN],
                         smbntpwd[NT_HASH_LEN];
         bool            use_samba_attrs = True;
-        uint32          acct_ctrl = 0;
-        uint16          logon_divs;
-        uint16          bad_password_count = 0,
+        uint32_t                acct_ctrl = 0;
+        uint16_t                logon_divs;
+        uint16_t                bad_password_count = 0,
                         logon_count = 0;
-        uint32 hours_len;
+        uint32_t hours_len;
         uint8           hours[MAX_HOURS_LEN];
         char *temp = NULL;
-        LOGIN_CACHE     *cache_entry = NULL;
-        uint32          pwHistLen;
+        struct login_cache cache_entry;
+        uint32_t                pwHistLen;
         bool expand_explicit = lp_passdb_expand_explicit();
         bool ret = false;
@@ -605 +586 @@
                                         LDAP_ATTR_USER_RID),
                                 ctx))!=NULL) {
-                        user_rid = (uint32)atol(temp);
+                        user_rid = (uint32_t)atol(temp);
                         pdb_set_user_sid_from_rid(sampass, user_rid, PDB_SET);
                 }
         }
 
-        if (pdb_get_init_flags(sampass,PDB_USERSID) == PDB_DEFAULT) {
+        if (IS_SAM_DEFAULT(sampass, PDB_USERSID)) {
                 DEBUG(1, ("init_sam_from_ldap: no %s or %s attribute found for this user %s\n", 
                         get_userattr_key2string(ldap_state->schema_ver,
@@ -916 +897 @@
                 pwHistLen = MIN(pwHistLen, MAX_PW_HISTORY_LEN);
 
-                if ((pwhist = TALLOC_ARRAY(ctx, uint8,
-                                        pwHistLen * PW_HISTORY_ENTRY_LEN)) ==
-                                NULL){
+                pwhist = TALLOC_ARRAY(ctx, uint8,
+                                      pwHistLen * PW_HISTORY_ENTRY_LEN);
+                if (pwhist == NULL) {
                         DEBUG(0, ("init_sam_from_ldap: talloc failed!\n"));
                         goto fn_exit;
@@ -986 +967 @@
                         ctx);
         if (temp) {
-                bad_password_count = (uint32) atol(temp);
+                bad_password_count = (uint32_t) atol(temp);
                 pdb_set_bad_password_count(sampass,
                                 bad_password_count, PDB_SET);
@@ -1010 +991 @@
                         ctx);
         if (temp) {
-                logon_count = (uint32) atol(temp);
+                logon_count = (uint32_t) atol(temp);
                 pdb_set_logon_count(sampass, logon_count, PDB_SET);
         }
@@ -1025 +1006 @@
                 pdb_gethexhours(temp, hours);
                 memset((char *)temp, '\0', strlen(temp) +1);
-                pdb_set_hours(sampass, hours, PDB_SET);
+                pdb_set_hours(sampass, hours, hours_len, PDB_SET);
                 ZERO_STRUCT(hours);
         }
@@ -1033 +1014 @@
                 bool have_uid = false;
                 bool have_gid = false;
-                DOM_SID mapped_gsid;
-                const DOM_SID *primary_gsid;
+                struct dom_sid mapped_gsid;
+                const struct dom_sid *primary_gsid;
 
                 ZERO_STRUCT(unix_pw);
@@ -1105 +1086 @@
                 gid_to_sid(&mapped_gsid, sampass->unix_pw->pw_gid);
                 primary_gsid = pdb_get_group_sid(sampass);
-                if (primary_gsid && sid_equal(primary_gsid, &mapped_gsid)) {
+                if (primary_gsid && dom_sid_equal(primary_gsid, &mapped_gsid)) {
                         store_gid_sid_cache(primary_gsid,
                                             sampass->unix_pw->pw_gid);
@@ -1121 +1102 @@
 
         /* see if we have newer updates */
-        if (!(cache_entry = login_cache_read(sampass))) {
+        if (!login_cache_read(sampass, &cache_entry)) {
                 DEBUG (9, ("No cache entry, bad count = %u, bad time = %u\n",
                            (unsigned int)pdb_get_bad_password_count(sampass),
@@ -1131 +1112 @@
         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) {
+                  (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
                    we need to delete the entry but allow the
@@ -1143 +1124 @@
                 pdb_set_acct_ctrl(sampass,
                                   pdb_get_acct_ctrl(sampass) |
-                                  (cache_entry->acct_ctrl & ACB_AUTOLOCK),
+                                  (cache_entry.acct_ctrl & ACB_AUTOLOCK),
                                   PDB_SET);
                 pdb_set_bad_password_count(sampass,
-                                           cache_entry->bad_password_count,
+                                           cache_entry.bad_password_count,
                                            PDB_SET);
                 pdb_set_bad_password_time(sampass,
-                                          cache_entry->bad_password_time,
+                                          cache_entry.bad_password_time,
                                           PDB_SET);
         }
@@ -1158 +1139 @@
 
         TALLOC_FREE(ctx);
-        SAFE_FREE(cache_entry);
         return ret;
 }
@@ -1174 +1154 @@
 {
         char *temp = NULL;
-        uint32 rid;
+        uint32_t rid;
 
         if (mods == NULL || sampass == NULL) {
@@ -1203 +1183 @@
         if (need_update(sampass, PDB_USERSID)) {
                 fstring sid_string;
-                const DOM_SID *user_sid = pdb_get_user_sid(sampass);
+                const struct dom_sid *user_sid = pdb_get_user_sid(sampass);
 
                 switch ( ldap_state->schema_ver ) {
@@ -1240 +1220 @@
         if (need_update(sampass, PDB_GROUPSID)) {
                 fstring sid_string;
-                const DOM_SID *group_sid = pdb_get_group_sid(sampass);
+                const struct dom_sid *group_sid = pdb_get_group_sid(sampass);
 
                 switch ( ldap_state->schema_ver ) {
@@ -1398 +1378 @@
                 if (need_update(sampass, PDB_PWHISTORY)) {
                         char *pwstr = NULL;
-                        uint32 pwHistLen = 0;
+                        uint32_t pwHistLen = 0;
                         pdb_get_account_policy(PDB_POLICY_PASSWORD_HISTORY, &pwHistLen);
 
@@ -1411 +1391 @@
                         } else {
                                 int i;
-                                uint32 currHistLen = 0;
+                                uint32_t currHistLen = 0;
                                 const uint8 *pwhist = pdb_get_pw_history(sampass, &currHistLen);
                                 if (pwhist != NULL) {
@@ -1473 +1453 @@
         if (need_update(sampass, PDB_BAD_PASSWORD_COUNT))  /* &&
             need_update(sampass, PDB_BAD_PASSWORD_TIME)) */ {
-                uint16 badcount = pdb_get_bad_password_count(sampass);
+                uint16_t badcount = pdb_get_bad_password_count(sampass);
                 time_t badtime = pdb_get_bad_password_time(sampass);
-                uint32 pol;
+                uint32_t pol;
                 pdb_get_account_policy(PDB_POLICY_BAD_ATTEMPT_LOCKOUT, &pol);
 
@@ -1512 +1492 @@
                         login_cache_delentry(sampass);
                 } else {
-                        LOGIN_CACHE cache_entry;
+                        struct login_cache cache_entry;
 
                         cache_entry.entry_timestamp = time(NULL);
@@ -1520 +1500 @@
 
                         DEBUG(7, ("Updating bad password count and time in login cache\n"));
-                        login_cache_write(sampass, cache_entry);
+                        login_cache_write(sampass, &cache_entry);
                 }
         }
@@ -1626 +1606 @@
 
 static int ldapsam_get_ldap_user_by_sid(struct ldapsam_privates *ldap_state, 
-                                   const DOM_SID *sid, LDAPMessage **result) 
+                                   const struct dom_sid *sid, LDAPMessage **result)
 {
         int rc = -1;
         const char ** attr_list;
-        uint32 rid;
+        uint32_t rid;
 
         switch ( ldap_state->schema_ver ) {
@@ -1676 +1656 @@
 *********************************************************************/
 
-static NTSTATUS ldapsam_getsampwsid(struct pdb_methods *my_methods, struct samu * user, const DOM_SID *sid)
+static NTSTATUS ldapsam_getsampwsid(struct pdb_methods *my_methods, struct samu * user, const struct dom_sid *sid)
 {
         struct ldapsam_privates *ldap_state = (struct ldapsam_privates *)my_methods->private_data;
@@ -1737 +1717 @@
         if (!newpwd || !dn) {
                 return NT_STATUS_INVALID_PARAMETER;
-        }
-
-        if (!mods) {
-                DEBUG(5,("ldapsam_modify_entry: mods is empty: nothing to modify\n"));
-                /* may be password change below however */
-        } else {
-                switch(ldap_op) {
-                        case LDAP_MOD_ADD:
-                                if (ldap_state->is_nds_ldap) {
-                                        smbldap_set_mod(&mods, LDAP_MOD_ADD, 
-                                                        "objectclass", 
-                                                        "inetOrgPerson");
-                                } else {
-                                        smbldap_set_mod(&mods, LDAP_MOD_ADD, 
-                                                        "objectclass", 
-                                                        LDAP_OBJ_ACCOUNT);
-                                }
-                                rc = smbldap_add(ldap_state->smbldap_state, 
-                                                 dn, mods);
-                                break;
-                        case LDAP_MOD_REPLACE: 
-                                rc = smbldap_modify(ldap_state->smbldap_state, 
-                                                    dn ,mods);
-                                break;
-                        default:        
-                                DEBUG(0,("ldapsam_modify_entry: Wrong LDAP operation type: %d!\n", 
-                                         ldap_op));
-                                return NT_STATUS_INVALID_PARAMETER;
-                }
-
-                if (rc!=LDAP_SUCCESS) {
-                        return NT_STATUS_UNSUCCESSFUL;
-                }  
         }
 
@@ -1897 +1844 @@
                 ber_bvfree(bv);
         }
+
+        if (!mods) {
+                DEBUG(5,("ldapsam_modify_entry: mods is empty: nothing to modify\n"));
+                /* may be password change below however */
+        } else {
+                switch(ldap_op) {
+                        case LDAP_MOD_ADD:
+                                if (ldap_state->is_nds_ldap) {
+                                        smbldap_set_mod(&mods, LDAP_MOD_ADD,
+                                                        "objectclass",
+                                                        "inetOrgPerson");
+                                } else {
+                                        smbldap_set_mod(&mods, LDAP_MOD_ADD,
+                                                        "objectclass",
+                                                        LDAP_OBJ_ACCOUNT);
+                                }
+                                rc = smbldap_add(ldap_state->smbldap_state,
+                                                 dn, mods);
+                                break;
+                        case LDAP_MOD_REPLACE:
+                                rc = smbldap_modify(ldap_state->smbldap_state,
+                                                    dn ,mods);
+                                break;
+                        default:
+                                DEBUG(0,("ldapsam_modify_entry: Wrong LDAP operation type: %d!\n",
+                                         ldap_op));
+                                return NT_STATUS_INVALID_PARAMETER;
+                }
+
+                if (rc!=LDAP_SUCCESS) {
+                        return NT_STATUS_UNSUCCESSFUL;
+                }
+        }
+
         return NT_STATUS_OK;
 }
@@ -2070 +2051 @@
 static NTSTATUS ldapsam_del_groupmem(struct pdb_methods *my_methods,
                                      TALLOC_CTX *tmp_ctx,
-                                     uint32 group_rid,
-                                     uint32 member_rid);
+                                     uint32_t group_rid,
+                                     uint32_t member_rid);
 
 static NTSTATUS ldapsam_enum_group_memberships(struct pdb_methods *methods,
                                                TALLOC_CTX *mem_ctx,
                                                struct samu *user,
-                                               DOM_SID **pp_sids,
+                                               struct dom_sid **pp_sids,
                                                gid_t **pp_gids,
-                                               size_t *p_num_groups);
+                                               uint32_t *p_num_groups);
 
 static NTSTATUS ldapsam_rename_sam_account(struct pdb_methods *my_methods,
@@ -2177 +2158 @@
         LDAPMod         **mods = NULL;
         int             ldap_op = LDAP_MOD_REPLACE;
-        uint32          num_result;
+        uint32_t                num_result;
         const char      **attr_list;
         char *escape_user = NULL;
         const char      *username = pdb_get_username(newpwd);
-        const DOM_SID   *sid = pdb_get_user_sid(newpwd);
+        const struct dom_sid    *sid = pdb_get_user_sid(newpwd);
         char *filter = NULL;
         char *dn = NULL;
@@ -2594 +2575 @@
 
 static NTSTATUS ldapsam_getgrsid(struct pdb_methods *methods, GROUP_MAP *map,
-                                 DOM_SID sid)
+                                 struct dom_sid sid)
 {
         char *filter = NULL;
@@ -2664 +2645 @@
 static bool ldapsam_extract_rid_from_entry(LDAP *ldap_struct,
                                            LDAPMessage *entry,
-                                           const DOM_SID *domain_sid,
-                                           uint32 *rid)
+                                           const struct dom_sid *domain_sid,
+                                           uint32_t *rid)
 {
         fstring str;
-        DOM_SID sid;
+        struct dom_sid sid;
 
         if (!smbldap_get_single_attribute(ldap_struct, entry, "sambaSID",
@@ -2681 +2662 @@
         }
 
-        if (sid_compare_domain(&sid, domain_sid) != 0) {
+        if (dom_sid_compare_domain(&sid, domain_sid) != 0) {
                 DEBUG(10, ("SID %s is not in expected domain %s\n",
                            str, sid_string_dbg(domain_sid)));
@@ -2697 +2678 @@
 static NTSTATUS ldapsam_enum_group_members(struct pdb_methods *methods,
                                            TALLOC_CTX *mem_ctx,
-                                           const DOM_SID *group,
-                                           uint32 **pp_member_rids,
+                                           const struct dom_sid *group,
+                                           uint32_t **pp_member_rids,
                                            size_t *p_num_members)
 {
@@ -2815 +2796 @@
                 {
                         char *sidstr;
-                        DOM_SID sid;
-                        uint32 rid;
+                        struct dom_sid sid;
+                        uint32_t rid;
 
                         sidstr = smbldap_talloc_single_attribute(conn->ldap_struct,
@@ -2867 +2848 @@
              entry = ldap_next_entry(conn->ldap_struct, entry))
         {
-                uint32 rid;
+                uint32_t rid;
 
                 if (!ldapsam_extract_rid_from_entry(conn->ldap_struct,
@@ -2898 +2879 @@
                                                TALLOC_CTX *mem_ctx,
                                                struct samu *user,
-                                               DOM_SID **pp_sids,
+                                               struct dom_sid **pp_sids,
                                                gid_t **pp_gids,
-                                               size_t *p_num_groups)
+                                               uint32_t *p_num_groups)
 {
         struct ldapsam_privates *ldap_state =
@@ -2912 +2893 @@
         LDAPMessage *entry;
         NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
-        size_t num_sids, num_gids;
+        uint32_t num_sids;
+        uint32_t num_gids;
         char *gidstr;
         gid_t primary_gid = -1;
@@ -3015 +2997 @@
         {
                 fstring str;
-                DOM_SID sid;
+                struct dom_sid sid;
                 gid_t gid;
                 char *end;
@@ -3053 +3035 @@
         }
 
-        if (sid_compare(&global_sid_NULL, &(*pp_sids)[0]) == 0) {
+        if (dom_sid_compare(&global_sid_NULL, &(*pp_sids)[0]) == 0) {
                 DEBUG(3, ("primary group of [%s] not found\n",
                           pdb_get_username(user)));
@@ -3140 +3122 @@
         NTSTATUS result;
 
-        DOM_SID sid;
+        struct dom_sid sid;
 
         int rc;
@@ -3345 +3327 @@
 
 static NTSTATUS ldapsam_delete_group_mapping_entry(struct pdb_methods *methods,
-                                                   DOM_SID sid)
+                                                   struct dom_sid sid)
 {
         struct ldapsam_privates *priv =
@@ -3508 +3490 @@
 
 static NTSTATUS ldapsam_enum_group_mapping(struct pdb_methods *methods,
-                                           const DOM_SID *domsid, enum lsa_SidType sid_name_use,
+                                           const struct dom_sid *domsid, enum lsa_SidType sid_name_use,
                                            GROUP_MAP **pp_rmap,
                                            size_t *p_num_entries,
                                            bool unix_only)
 {
-        GROUP_MAP map;
+        GROUP_MAP map = { 0, };
         size_t entries = 0;
 
@@ -3558 +3540 @@
 
 static NTSTATUS ldapsam_modify_aliasmem(struct pdb_methods *methods,
-                                        const DOM_SID *alias,
-                                        const DOM_SID *member,
+                                        const struct dom_sid *alias,
+                                        const struct dom_sid *member,
                                         int modop)
 {
@@ -3663 +3645 @@
 
 static NTSTATUS ldapsam_add_aliasmem(struct pdb_methods *methods,
-                                     const DOM_SID *alias,
-                                     const DOM_SID *member)
+                                     const struct dom_sid *alias,
+                                     const struct dom_sid *member)
 {
         return ldapsam_modify_aliasmem(methods, alias, member, LDAP_MOD_ADD);
@@ -3670 +3652 @@
 
 static NTSTATUS ldapsam_del_aliasmem(struct pdb_methods *methods,
-                                     const DOM_SID *alias,
-                                     const DOM_SID *member)
+                                     const struct dom_sid *alias,
+                                     const struct dom_sid *member)
 {
         return ldapsam_modify_aliasmem(methods, alias, member,
@@ -3678 +3660 @@
 
 static NTSTATUS ldapsam_enum_aliasmem(struct pdb_methods *methods,
-                                      const DOM_SID *alias,
+                                      const struct dom_sid *alias,
                                       TALLOC_CTX *mem_ctx,
-                                      DOM_SID **pp_members,
+                                      struct dom_sid **pp_members,
                                       size_t *p_num_members)
 {
@@ -3691 +3673 @@
         int i;
         char *filter = NULL;
-        size_t num_members = 0;
+        uint32_t num_members = 0;
         enum lsa_SidType type = SID_NAME_USE_NONE;
         fstring tmp;
@@ -3766 +3748 @@
 
         for (i=0; i<count; i++) {
-                DOM_SID member;
+                struct dom_sid member;
                 NTSTATUS status;
 
@@ -3790 +3772 @@
 static NTSTATUS ldapsam_alias_memberships(struct pdb_methods *methods,
                                           TALLOC_CTX *mem_ctx,
-                                          const DOM_SID *domain_sid,
-                                          const DOM_SID *members,
+                                          const struct dom_sid *domain_sid,
+                                          const struct dom_sid *members,
                                           size_t num_members,
-                                          uint32 **pp_alias_rids,
+                                          uint32_t **pp_alias_rids,
                                           size_t *p_num_alias_rids)
 {
@@ -3871 +3853 @@
         {
                 fstring sid_str;
-                DOM_SID sid;
-                uint32 rid;
+                struct dom_sid sid;
+                uint32_t rid;
 
                 if (!smbldap_get_single_attribute(ldap_struct, entry,
@@ -3909 +3891 @@
 static NTSTATUS ldapsam_set_account_policy_in_ldap(struct pdb_methods *methods,
                                                    enum pdb_policy_type type,
-                                                   uint32 value)
+                                                   uint32_t value)
 {
         NTSTATUS ntstatus = NT_STATUS_UNSUCCESSFUL;
@@ -3965 +3947 @@
 static NTSTATUS ldapsam_get_account_policy_from_ldap(struct pdb_methods *methods,
                                                      enum pdb_policy_type type,
-                                                     uint32 *value)
+                                                     uint32_t *value)
 {
         NTSTATUS ntstatus = NT_STATUS_UNSUCCESSFUL;
@@ -3997 +3979 @@
         attrs[1] = NULL;
 
-        filter = talloc_asprintf(NULL, "(objectClass=%s)", LDAP_OBJ_DOMINFO);
+        filter = talloc_asprintf(talloc_tos(), "(objectClass=%s)", LDAP_OBJ_DOMINFO);
         if (filter == NULL) {
                 return NT_STATUS_NO_MEMORY;
@@ -4004 +3986 @@
                             LDAP_SCOPE_BASE, filter, attrs, 0,
                             &result);
-
+        TALLOC_FREE(filter);
         if (rc != LDAP_SUCCESS) {
                 return ntstatus;
@@ -4024 +4006 @@
         }
 
-        *value = (uint32)atol(vals[0]);
+        *value = (uint32_t)atol(vals[0]);
 
         ntstatus = NT_STATUS_OK;
@@ -4100 +4082 @@
 
 static NTSTATUS ldapsam_lookup_rids(struct pdb_methods *methods,
-                                    const DOM_SID *domain_sid,
+                                    const struct dom_sid *domain_sid,
                                     int num_rids,
-                                    uint32 *rids,
+                                    uint32_t *rids,
                                     const char **names,
                                     enum lsa_SidType *attrs)
@@ -4143 +4125 @@
 
         for (i=0; i<num_rids; i++) {
-                DOM_SID sid;
+                struct dom_sid sid;
                 sid_compose(&sid, domain_sid, rids[i]);
                 allsids = talloc_asprintf_append_buffer(
@@ -4183 +4165 @@
              entry != NULL;
              entry = ldap_next_entry(ld, entry)) {
-                uint32 rid;
+                uint32_t rid;
                 int rid_index;
                 const char *name;
@@ -4257 +4239 @@
              entry = ldap_next_entry(ld, entry))
         {
-                uint32 rid;
+                uint32_t rid;
                 int rid_index;
                 const char *attr;
@@ -4348 +4330 @@
 }
 
-const char **talloc_attrs(TALLOC_CTX *mem_ctx, ...)
+static const char **talloc_attrs(TALLOC_CTX *mem_ctx, ...)
 {
         int i, num = 0;
@@ -4381 +4363 @@
         struct smbldap_state *connection;
 
-        uint32 acct_flags;
-        uint16 group_type;
+        uint32_t acct_flags;
+        uint16_t group_type;
 
         const char *base;
@@ -4557 +4539 @@
         char **vals;
         size_t converted_size;
-        DOM_SID sid;
-        uint32 acct_flags;
+        struct dom_sid sid;
+        uint32_t acct_flags;
 
         vals = ldap_get_values(ld, entry, "sambaAcctFlags");
@@ -4650 +4632 @@
 static bool ldapsam_search_users(struct pdb_methods *methods,
                                  struct pdb_search *search,
-                                 uint32 acct_flags)
+                                 uint32_t acct_flags)
 {
         struct ldapsam_privates *ldap_state =
@@ -4703 +4685 @@
         char **vals;
         size_t converted_size;
-        DOM_SID sid;
-        uint16 group_type;
+        struct dom_sid sid;
+        uint16_t group_type;
 
         result->account_name = "";
@@ -4811 +4793 @@
 
                 default:
-                        DEBUG(0,("unkown group type: %d\n", group_type));
+                        DEBUG(0,("unknown group type: %d\n", group_type));
                         return False;
         }
@@ -4822 +4804 @@
 static bool ldapsam_search_grouptype(struct pdb_methods *methods,
                                      struct pdb_search *search,
-                                     const DOM_SID *sid,
+                                     const struct dom_sid *sid,
                                      enum lsa_SidType type)
 {
@@ -4874 +4856 @@
 static bool ldapsam_search_aliases(struct pdb_methods *methods,
                                    struct pdb_search *search,
-                                   const DOM_SID *sid)
+                                   const struct dom_sid *sid)
 {
         return ldapsam_search_grouptype(methods, search, sid, SID_NAME_ALIAS);
@@ -4885 +4867 @@
 
 static NTSTATUS ldapsam_get_new_rid(struct ldapsam_privates *priv,
-                                    uint32 *rid)
+                                    uint32_t *rid)
 {
         struct smbldap_state *smbldap_state = priv->smbldap_state;
@@ -4895 +4877 @@
         char *value;
         int rc;
-        uint32 nextRid = 0;
+        uint32_t nextRid = 0;
         const char *dn;
 
@@ -4932 +4914 @@
                                                 "sambaNextRid", mem_ctx);
         if (value != NULL) {
-                uint32 tmp = (uint32)strtoul(value, NULL, 10);
+                uint32_t tmp = (uint32_t)strtoul(value, NULL, 10);
                 nextRid = MAX(nextRid, tmp);
         }
@@ -4939 +4921 @@
                                                 "sambaNextUserRid", mem_ctx);
         if (value != NULL) {
-                uint32 tmp = (uint32)strtoul(value, NULL, 10);
+                uint32_t tmp = (uint32_t)strtoul(value, NULL, 10);
                 nextRid = MAX(nextRid, tmp);
         }
@@ -4946 +4928 @@
                                                 "sambaNextGroupRid", mem_ctx);
         if (value != NULL) {
-                uint32 tmp = (uint32)strtoul(value, NULL, 10);
+                uint32_t tmp = (uint32_t)strtoul(value, NULL, 10);
                 nextRid = MAX(nextRid, tmp);
         }
@@ -4981 +4963 @@
 }
 
-static NTSTATUS ldapsam_new_rid_internal(struct pdb_methods *methods, uint32 *rid)
+static NTSTATUS ldapsam_new_rid_internal(struct pdb_methods *methods, uint32_t *rid)
 {
         int i;
@@ -5003 +4985 @@
 }
 
-static bool ldapsam_new_rid(struct pdb_methods *methods, uint32 *rid)
+static bool ldapsam_new_rid(struct pdb_methods *methods, uint32_t *rid)
 {
         NTSTATUS result = ldapsam_new_rid_internal(methods, rid);
@@ -5010 +4992 @@
 
 static bool ldapsam_sid_to_id(struct pdb_methods *methods,
-                              const DOM_SID *sid,
+                              const struct dom_sid *sid,
                               union unid_t *id, enum lsa_SidType *type)
 {
@@ -5107 +5089 @@
  */
 static bool ldapsam_uid_to_sid(struct pdb_methods *methods, uid_t uid,
-                               DOM_SID *sid)
+                               struct dom_sid *sid)
 {
         struct ldapsam_privates *priv =
@@ -5117 +5099 @@
         bool ret = false;
         char *user_sid_string;
-        DOM_SID *user_sid;
+        struct dom_sid user_sid;
         int rc;
         TALLOC_CTX *tmp_ctx = talloc_stackframe();
@@ -5156 +5138 @@
         }
 
-        user_sid = string_sid_talloc(tmp_ctx, user_sid_string);
-        if (user_sid == NULL) {
+        if (!string_to_sid(&user_sid, user_sid_string)) {
                 DEBUG(3, ("Error calling sid_string_talloc for sid '%s'\n",
                           user_sid_string));
@@ -5163 +5144 @@
         }
 
-        sid_copy(sid, user_sid);
+        sid_copy(sid, &user_sid);
 
         store_uid_sid_cache(sid, uid);
@@ -5180 +5161 @@
  */
 static bool ldapsam_gid_to_sid(struct pdb_methods *methods, gid_t gid,
-                               DOM_SID *sid)
+                               struct dom_sid *sid)
 {
         struct ldapsam_privates *priv =
@@ -5190 +5171 @@
         bool ret = false;
         char *group_sid_string;
-        DOM_SID group_sid;
+        struct dom_sid group_sid;
         int rc;
         TALLOC_CTX *tmp_ctx = talloc_stackframe();
@@ -5262 +5243 @@
 static NTSTATUS ldapsam_create_user(struct pdb_methods *my_methods,
                                     TALLOC_CTX *tmp_ctx, const char *name,
-                                    uint32 acb_info, uint32 *rid)
+                                    uint32_t acb_info, uint32_t *rid)
 {
         struct ldapsam_privates *ldap_state = (struct ldapsam_privates *)my_methods->private_data;
         LDAPMessage *entry = NULL;
         LDAPMessage *result = NULL;
-        uint32 num_result;
+        uint32_t num_result;
         bool is_machine = False;
         bool add_posix = False;
@@ -5279 +5260 @@
         char *shell;
         const char *dn = NULL;
-        DOM_SID group_sid;
-        DOM_SID user_sid;
+        struct dom_sid group_sid;
+        struct dom_sid user_sid;
         gid_t gid = -1;
         uid_t uid = -1;
@@ -5387 +5368 @@
         }
 
-        if (!init_ldap_from_sam(ldap_state, NULL, &mods, user, element_is_set_or_changed)) {
+        if (!init_ldap_from_sam(ldap_state, entry, &mods, user, element_is_set_or_changed)) {
                 DEBUG(1,("ldapsam_create_user: Unable to fill user structs\n"));
                 return NT_STATUS_UNSUCCESSFUL;
@@ -5403 +5384 @@
 
                 /* retrieve the Domain Users group gid */
-                if (!sid_compose(&group_sid, get_global_sam_sid(), DOMAIN_GROUP_RID_USERS) ||
+                if (!sid_compose(&group_sid, get_global_sam_sid(), DOMAIN_RID_USERS) ||
                     !sid_to_gid(&group_sid, &gid)) {
                         DEBUG (0, ("ldapsam_create_user: Unable to get the Domain Users gid: bailing out!\n"));
@@ -5534 +5515 @@
                 struct dom_sid *sids = NULL;
                 gid_t *gids = NULL;
-                size_t num_groups = 0;
+                uint32_t num_groups = 0;
                 int i;
                 uint32_t user_rid = pdb_get_user_rid(sam_acct);
@@ -5584 +5565 @@
                                          TALLOC_CTX *tmp_ctx,
                                          const char *name,
-                                         uint32 *rid)
+                                         uint32_t *rid)
 {
         struct ldapsam_privates *ldap_state = (struct ldapsam_privates *)my_methods->private_data;
@@ -5590 +5571 @@
         LDAPMessage *entry = NULL;
         LDAPMessage *result = NULL;
-        uint32 num_result;
+        uint32_t num_result;
         bool is_new_entry = False;
         LDAPMod **mods = NULL;
@@ -5599 +5580 @@
         char *gidstr;
         const char *dn = NULL;
-        DOM_SID group_sid;
+        struct dom_sid group_sid;
         gid_t gid = -1;
         int rc;
@@ -5656 +5637 @@
 
         if (num_result == 0) {
+                is_new_entry = true;
+        }
+
+        if (!NT_STATUS_IS_OK((ret = ldapsam_new_rid_internal(my_methods, rid)))) {
+                DEBUG(1, ("ldapsam_create_group: Could not allocate a new RID\n"));
+                return ret;
+        }
+
+        sid_compose(&group_sid, get_global_sam_sid(), *rid);
+
+        groupsidstr = talloc_strdup(tmp_ctx, sid_string_talloc(tmp_ctx,
+                                                               &group_sid));
+        grouptype = talloc_asprintf(tmp_ctx, "%d", SID_NAME_DOM_GRP);
+
+        if (!groupsidstr || !grouptype) {
+                DEBUG(0,("ldapsam_create_group: Out of memory!\n"));
+                return NT_STATUS_NO_MEMORY;
+        }
+
+        smbldap_set_mod(&mods, LDAP_MOD_ADD, "objectClass", LDAP_OBJ_GROUPMAP);
+        smbldap_set_mod(&mods, LDAP_MOD_ADD, "sambaSid", groupsidstr);
+        smbldap_set_mod(&mods, LDAP_MOD_ADD, "sambaGroupType", grouptype);
+        smbldap_set_mod(&mods, LDAP_MOD_ADD, "displayName", name);
+
+        if (is_new_entry) {
                 char *escape_name;
 
                 DEBUG(3,("ldapsam_create_user: Creating new posix group\n"));
-
-                is_new_entry = True;
 
                 /* lets allocate a new groupid for this group */
@@ -5690 +5694 @@
         }
 
-        if (!NT_STATUS_IS_OK((ret = ldapsam_new_rid_internal(my_methods, rid)))) {
-                DEBUG(1, ("ldapsam_create_group: Could not allocate a new RID\n"));
-                return ret;
-        }
-
-        sid_compose(&group_sid, get_global_sam_sid(), *rid);
-
-        groupsidstr = talloc_strdup(tmp_ctx, sid_string_talloc(tmp_ctx,
-                                                               &group_sid));
-        grouptype = talloc_asprintf(tmp_ctx, "%d", SID_NAME_DOM_GRP);
-
-        if (!groupsidstr || !grouptype) {
-                DEBUG(0,("ldapsam_create_group: Out of memory!\n"));
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        smbldap_set_mod(&mods, LDAP_MOD_ADD, "objectClass", LDAP_OBJ_GROUPMAP);
-        smbldap_set_mod(&mods, LDAP_MOD_ADD, "sambaSid", groupsidstr);
-        smbldap_set_mod(&mods, LDAP_MOD_ADD, "sambaGroupType", grouptype);
-        smbldap_set_mod(&mods, LDAP_MOD_ADD, "displayName", name);
         talloc_autofree_ldapmod(tmp_ctx, mods);
 
@@ -5736 +5720 @@
 }
 
-static NTSTATUS ldapsam_delete_dom_group(struct pdb_methods *my_methods, TALLOC_CTX *tmp_ctx, uint32 rid)
+static NTSTATUS ldapsam_delete_dom_group(struct pdb_methods *my_methods, TALLOC_CTX *tmp_ctx, uint32_t rid)
 {
         struct ldapsam_privates *ldap_state = (struct ldapsam_privates *)my_methods->private_data;
@@ -5745 +5729 @@
         char *gidstr;
         char *filter;
-        DOM_SID group_sid;
+        struct dom_sid group_sid;
         int rc;
 
@@ -5832 +5816 @@
 static NTSTATUS ldapsam_change_groupmem(struct pdb_methods *my_methods,
                                         TALLOC_CTX *tmp_ctx,
-                                        uint32 group_rid,
-                                        uint32 member_rid,
+                                        uint32_t group_rid,
+                                        uint32_t member_rid,
                                         int modop)
 {
@@ -5839 +5823 @@
         LDAPMessage *entry = NULL;
         LDAPMessage *result = NULL;
-        uint32 num_result;
+        uint32_t num_result;
         LDAPMod **mods = NULL;
         char *filter;
         char *uidstr;
         const char *dn = NULL;
-        DOM_SID group_sid;
-        DOM_SID member_sid;
+        struct dom_sid group_sid;
+        struct dom_sid member_sid;
         int rc;
 
@@ -5994 +5978 @@
 static NTSTATUS ldapsam_add_groupmem(struct pdb_methods *my_methods,
                                      TALLOC_CTX *tmp_ctx,
-                                     uint32 group_rid,
-                                     uint32 member_rid)
+                                     uint32_t group_rid,
+                                     uint32_t member_rid)
 {
         return ldapsam_change_groupmem(my_methods, tmp_ctx, group_rid, member_rid, LDAP_MOD_ADD);
@@ -6001 +5985 @@
 static NTSTATUS ldapsam_del_groupmem(struct pdb_methods *my_methods,
                                      TALLOC_CTX *tmp_ctx,
-                                     uint32 group_rid,
-                                     uint32 member_rid)
+                                     uint32_t group_rid,
+                                     uint32_t member_rid)
 {
         return ldapsam_change_groupmem(my_methods, tmp_ctx, group_rid, member_rid, LDAP_MOD_DELETE);
@@ -6014 +5998 @@
         LDAPMessage *entry = NULL;
         LDAPMessage *result = NULL;
-        uint32 num_result;
+        uint32_t num_result;
         LDAPMod **mods = NULL;
         char *filter;
@@ -6129 +6113 @@
         LDAPMessage *result = NULL;
         char *trusted_dn;
-        uint32 num_result;
+        uint32_t num_result;
 
         filter = talloc_asprintf(talloc_tos(),
@@ -6179 +6163 @@
                                       const char *domain,
                                       char** pwd,
-                                      DOM_SID *sid,
+                                      struct dom_sid *sid,
                                       time_t *pass_last_set_time)
 {
@@ -6223 +6207 @@
         if (sid != NULL) {
                 char *sid_str;
-                DOM_SID *dom_sid;
+                struct dom_sid dom_sid;
                 sid_str = smbldap_talloc_single_attribute(priv2ld(ldap_state),
                                                           entry, "sambaSID",
@@ -6230 +6214 @@
                         return False;
                 }
-                dom_sid = string_sid_talloc(talloc_tos(), sid_str);
-                if (dom_sid == NULL) {
+                if (!string_to_sid(&dom_sid, sid_str)) {
                         return False;
                 }
-                sid_copy(sid, dom_sid);
+                sid_copy(sid, &dom_sid);
         }
 
@@ -6243 +6226 @@
                                       const char* domain,
                                       const char* pwd,
-                                      const DOM_SID *sid)
+                                      const struct dom_sid *sid)
 {
         struct ldapsam_privates *ldap_state =
@@ -6341 +6324 @@
 static NTSTATUS ldapsam_enum_trusteddoms(struct pdb_methods *methods,
                                          TALLOC_CTX *mem_ctx,
-                                         uint32 *num_domains,
+                                         uint32_t *num_domains,
                                          struct trustdom_info ***domains)
 {
@@ -6558 +6541 @@
         NTSTATUS nt_status;
         struct ldapsam_privates *ldap_state = NULL;
-        uint32 alg_rid_base;
+        uint32_t alg_rid_base;
         char *alg_rid_base_string = NULL;
         LDAPMessage *result = NULL;
         LDAPMessage *entry = NULL;
-        DOM_SID ldap_domain_sid;
-        DOM_SID secrets_domain_sid;
+        struct dom_sid ldap_domain_sid;
+        struct dom_sid secrets_domain_sid;
         char *domain_sid_string = NULL;
         char *dn = NULL;
@@ -6570 +6553 @@
         trim_char( uri, '\"', '\"' );
         nt_status = pdb_init_ldapsam_common(pdb_method, uri);
-        if (uri) {
-                TALLOC_FREE(uri);
-        }
+
+        TALLOC_FREE(uri);
 
         if (!NT_STATUS_IS_OK(nt_status)) {
@@ -6622 +6604 @@
                 DEBUGADD(2, ("pdb_init_ldapsam: Continuing on regardless, "
                              "will be unable to allocate new users/groups, "
-                             "and will risk BDCs having inconsistant SIDs\n"));
+                             "and will risk BDCs having inconsistent SIDs\n"));
                 sid_copy(&ldap_state->domain_sid, get_global_sam_sid());
                 return NT_STATUS_OK;
@@ -6666 +6648 @@
                 found_sid = secrets_fetch_domain_sid(ldap_state->domain_name,
                                                      &secrets_domain_sid);
-                if (!found_sid || !sid_equal(&secrets_domain_sid,
+                if (!found_sid || !dom_sid_equal(&secrets_domain_sid,
                                              &ldap_domain_sid)) {
                         DEBUG(1, ("pdb_init_ldapsam: Resetting SID for domain "
@@ -6691 +6673 @@
                     talloc_tos());
         if (alg_rid_base_string) {
-                alg_rid_base = (uint32)atol(alg_rid_base_string);
+                alg_rid_base = (uint32_t)atol(alg_rid_base_string);
                 if (alg_rid_base != algorithmic_rid_base()) {
                         DEBUG(0, ("The value of 'algorithmic RID base' has "
@@ -6719 +6701 @@
         pdb_nds_init();
 
+        pdb_ipa_init();
+
         return NT_STATUS_OK;
 }