Correctly check for errors in strlower_m() returns.

[samba.git] / source3 / passdb / pdb_ipa.c

diff --git a/source3/passdb/pdb_ipa.c b/source3/passdb/pdb_ipa.c
index f177a226e2e5a1baf3af6f8b9de5dd46b9133124..c0eb48d4489da31629a0fd11b0353df0728e7002 100644 (file)
--- a/source3/passdb/pdb_ipa.c
+++ b/source3/passdb/pdb_ipa.c
@@ -28,6 +28,7 @@
 #include "smbldap.h"
 #include "passdb/pdb_ldap.h"
 #include "passdb/pdb_ipa.h"
+#include "passdb/pdb_ldap_schema.h"
 
 #define IPA_KEYTAB_SET_OID "2.16.840.1.113730.3.8.3.1"
 #define IPA_MAGIC_ID_STR "999"
@@ -120,10 +121,10 @@ static char *get_account_dn(const char *name)
 
        if (name[strlen(name)-1] == '$') {
                dn = talloc_asprintf(talloc_tos(), "uid=%s,%s", escape_name,
-                                    lp_ldap_machine_suffix());
+                                    lp_ldap_machine_suffix(talloc_tos()));
        } else {
                dn = talloc_asprintf(talloc_tos(), "uid=%s,%s", escape_name,
-                                    lp_ldap_user_suffix());
+                                    lp_ldap_user_suffix(talloc_tos()));
        }
 
        SAFE_FREE(escape_name);
@@ -786,7 +787,9 @@ static struct pdb_domain_info *pdb_ipasam_get_domain_info(struct pdb_methods *pd
        if (info->dns_domain == NULL) {
                goto fail;
        }
-       strlower_m(info->dns_domain);
+       if (!strlower_m(info->dns_domain)) {
+               goto fail;
+       }
        info->dns_forest = talloc_strdup(info, info->dns_domain);
 
        /* we expect a domain SID to have 4 sub IDs */
@@ -1300,7 +1303,6 @@ static NTSTATUS ipasam_create_dom_group(struct pdb_methods *pdb_methods,
 {
        NTSTATUS status;
        struct ldapsam_privates *ldap_state;
-       int ldap_op = LDAP_MOD_REPLACE;
        char *dn;
        uint32_t has_objectclass = 0;
 
@@ -1311,11 +1313,8 @@ static NTSTATUS ipasam_create_dom_group(struct pdb_methods *pdb_methods,
        }
 
        status = find_group(ldap_state, name, &dn, &has_objectclass);
-       if (NT_STATUS_IS_OK(status)) {
-               ldap_op = LDAP_MOD_REPLACE;
-       } else if (NT_STATUS_EQUAL(status, NT_STATUS_NO_SUCH_USER)) {
-               ldap_op = LDAP_MOD_ADD;
-       } else {
+       if (!NT_STATUS_IS_OK(status) &&
+                       !NT_STATUS_EQUAL(status, NT_STATUS_NO_SUCH_USER)) {
                return status;
        }
 
@@ -1367,11 +1366,11 @@ static NTSTATUS ipasam_create_user(struct pdb_methods *pdb_methods,
                if (name[strlen(name)-1] == '$') {
                        dn = talloc_asprintf(tmp_ctx, "uid=%s,%s",
                                             escape_username,
-                                            lp_ldap_machine_suffix());
+                                            lp_ldap_machine_suffix(talloc_tos()));
                } else {
                        dn = talloc_asprintf(tmp_ctx, "uid=%s,%s",
                                             escape_username,
-                                            lp_ldap_user_suffix());
+                                            lp_ldap_user_suffix(talloc_tos()));
                }
                SAFE_FREE(escape_username);
                if (!dn) {
@@ -1406,6 +1405,42 @@ static NTSTATUS ipasam_create_user(struct pdb_methods *pdb_methods,
        return NT_STATUS_OK;
 }
 
+static NTSTATUS pdb_ipa_init_secrets(struct pdb_methods *m)
+{
+#if _SAMBA_BUILD_ == 4
+       struct pdb_domain_info *dom_info;
+       bool ret;
+
+       dom_info = pdb_ipasam_get_domain_info(m, m);
+       if (!dom_info) {
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       secrets_clear_domain_protection(dom_info->name);
+       ret = secrets_store_domain_sid(dom_info->name,
+                                      &dom_info->sid);
+       if (!ret) {
+               goto done;
+       }
+       ret = secrets_store_domain_guid(dom_info->name,
+                                       &dom_info->guid);
+       if (!ret) {
+               goto done;
+       }
+       ret = secrets_mark_domain_protected(dom_info->name);
+       if (!ret) {
+               goto done;
+       }
+
+done:
+       TALLOC_FREE(dom_info);
+       if (!ret) {
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+#endif
+       return NT_STATUS_OK;
+}
+
 static NTSTATUS pdb_init_IPA_ldapsam(struct pdb_methods **pdb_method, const char *location)
 {
        struct ldapsam_privates *ldap_state;
@@ -1457,6 +1492,12 @@ static NTSTATUS pdb_init_IPA_ldapsam(struct pdb_methods **pdb_method, const char
        (*pdb_method)->del_trusted_domain = ipasam_del_trusted_domain;
        (*pdb_method)->enum_trusted_domains = ipasam_enum_trusted_domains;
 
+       status = pdb_ipa_init_secrets(*pdb_method);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(10, ("pdb_ipa_init_secrets failed!\n"));
+               return status;
+       }
+
        return NT_STATUS_OK;
 }