s3,s4: Make case spelling of sAMAccountName consistent

Signed-off-by: Pavel Filipenský <pfilipensky@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/auth/credentials/credentials_secrets.c b/auth/credentials/credentials_secrets.c
index 906f3ff1a2134ac8be9b46abb4cab503d46f470f..5f4c6cd1ed1e0995281079a5d3791a8290ce84ac 100644 (file)
--- a/auth/credentials/credentials_secrets.c
+++ b/auth/credentials/credentials_secrets.c
@@ -129,7 +129,7 @@ static NTSTATUS cli_credentials_set_secrets_lct(struct cli_credentials *cred,
 
        cli_credentials_set_password_last_changed_time(cred, lct);
 
-       machine_account = ldb_msg_find_attr_as_string(msg, "samAccountName", NULL);
+       machine_account = ldb_msg_find_attr_as_string(msg, "sAMAccountName", NULL);
 
        if (!machine_account) {
                machine_account = ldb_msg_find_attr_as_string(msg, "servicePrincipalName", NULL);

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index e30f84e3ffb434e1811718742011b93ac2a3cdf8..016402d5ca6c560951db3fe8c03764c6e2489c55 100644 (file)
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -1854,7 +1854,7 @@ char *ads_parent_dn(const char *dn)
        const char *attrs[] = {
                /* This is how Windows checks for machine accounts */
                "objectClass",
-               "SamAccountName",
+               "sAMAccountName",
                "userAccountControl",
                "DnsHostName",
                "ServicePrincipalName",
@@ -1875,7 +1875,7 @@ char *ads_parent_dn(const char *dn)
 
        /* the easiest way to find a machine account anywhere in the tree
           is to look for hostname$ */
-       expr = talloc_asprintf(frame, "(samAccountName=%s$)", machine);
+       expr = talloc_asprintf(frame, "(sAMAccountName=%s$)", machine);
        if (expr == NULL) {
                status = ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
                goto done;
@@ -2717,7 +2717,7 @@ ADS_STATUS ads_create_machine_acct(ADS_STRUCT *ads,
                                   const char *dns_domain_name)
 {
        ADS_STATUS ret;
-       char *samAccountName = NULL;
+       char *samaccountname = NULL;
        char *controlstr = NULL;
        TALLOC_CTX *ctx = NULL;
        ADS_MODLIST mods;
@@ -2791,8 +2791,8 @@ ADS_STATUS ads_create_machine_acct(ADS_STRUCT *ads,
 
        /* Create machine account */
 
-       samAccountName = talloc_asprintf(ctx, "%s$", machine_name);
-       if (samAccountName == NULL) {
+       samaccountname = talloc_asprintf(ctx, "%s$", machine_name);
+       if (samaccountname == NULL) {
                ret = ADS_ERROR(LDAP_NO_MEMORY);
                goto done;
        }
@@ -2869,7 +2869,7 @@ ADS_STATUS ads_create_machine_acct(ADS_STRUCT *ads,
        }
 
        ads_mod_str(ctx, &mods, "objectClass", "Computer");
-       ads_mod_str(ctx, &mods, "SamAccountName", samAccountName);
+       ads_mod_str(ctx, &mods, "sAMAccountName", samaccountname);
        ads_mod_str(ctx, &mods, "userAccountControl", controlstr);
        ads_mod_str(ctx, &mods, "DnsHostName", dns_hostname);
        ads_mod_strlist(ctx, &mods, "ServicePrincipalName", spn_array);
@@ -2905,7 +2905,7 @@ ADS_STATUS ads_move_machine_acct(ADS_STRUCT *ads, const char *machine_name,
        char *computer_rdn = NULL;
        bool need_move = False;
 
-       if (asprintf(&filter, "(samAccountName=%s$)", machine_name) == -1) {
+       if (asprintf(&filter, "(sAMAccountName=%s$)", machine_name) == -1) {
                rc = ADS_ERROR(LDAP_NO_MEMORY);
                goto done;
        }

diff --git a/source3/libads/ldap_user.c b/source3/libads/ldap_user.c
index 55421009a7b9ac348e25f9ac7a2d047c1a8cfcc9..40c87c833d36b9cd7a523db0db0835bbcad47f4a 100644 (file)
--- a/source3/libads/ldap_user.c
+++ b/source3/libads/ldap_user.c
@@ -37,7 +37,7 @@
                return ADS_ERROR(LDAP_NO_MEMORY);
        }
 
-       if (asprintf(&ldap_exp, "(samAccountName=%s)", escaped_user) == -1) {
+       if (asprintf(&ldap_exp, "(sAMAccountName=%s)", escaped_user) == -1) {
                TALLOC_FREE(escaped_user);
                return ADS_ERROR(LDAP_NO_MEMORY);
        }

diff --git a/source3/libnet/libnet_dssync_keytab.c b/source3/libnet/libnet_dssync_keytab.c
index 0c437da2f438c6da1f1ec1527976e44cfc9e2e51..66c5688c211ce0e90a0534492d44708186f92987 100644 (file)
--- a/source3/libnet/libnet_dssync_keytab.c
+++ b/source3/libnet/libnet_dssync_keytab.c
@@ -427,11 +427,11 @@ static NTSTATUS parse_user(TALLOC_CTX *mem_ctx,
        status = store_or_fetch_attribute(mem_ctx,
                                          ctx,
                                          object_dn,
-                                         "SAMACCOUNTNAME",
+                                         "sAMAccountName",
                                          &name);
        if (!NT_STATUS_IS_OK(status)) {
                DBG_ERR("store_or_fetch_attribute(%s, %s, %s): %s\n",
-                       object_dn, "SAMACCOUNTNAME", name,
+                       object_dn, "sAMAccountName", name,
                        nt_errstr(status));
                return status;
        }

diff --git a/source3/passdb/pdb_samba_dsdb.c b/source3/passdb/pdb_samba_dsdb.c
index bc3fa743b08157c776f16450a7354d1a493e4ae3..fd75419db7373ee794511171c3c92cc52f18c380 100644 (file)
--- a/source3/passdb/pdb_samba_dsdb.c
+++ b/source3/passdb/pdb_samba_dsdb.c
@@ -197,9 +197,9 @@ static NTSTATUS pdb_samba_dsdb_init_sam_from_priv(struct pdb_methods *m,
        uint64_t n;
        const DATA_BLOB *blob;
 
-       str = ldb_msg_find_attr_as_string(msg, "samAccountName", NULL);
+       str = ldb_msg_find_attr_as_string(msg, "sAMAccountName", NULL);
        if (str == NULL) {
-               DEBUG(10, ("no samAccountName\n"));
+               DEBUG(10, ("no sAMAccountName\n"));
                goto fail;
        }
        pdb_set_username(sam, str, PDB_SET);
@@ -531,7 +531,7 @@ static int pdb_samba_dsdb_replace_by_sam(struct pdb_samba_dsdb_state *state,
        }
 
        if (need_update(sam, PDB_USERNAME)) {
-               ret |= ldb_msg_add_string(msg, "samAccountName",
+               ret |= ldb_msg_add_string(msg, "sAMAccountName",
                                          pdb_get_username(sam));
        }
 
@@ -742,7 +742,7 @@ static NTSTATUS pdb_samba_dsdb_getsampwnam(struct pdb_methods *m,
                m->private_data, struct pdb_samba_dsdb_state);
 
        return pdb_samba_dsdb_getsampwfilter(m, state, sam_acct,
-                                        "(&(samaccountname=%s)(objectclass=user))",
+                                        "(&(sAMAccountName=%s)(objectclass=user))",
                                         username);
 }
 
@@ -932,7 +932,7 @@ static NTSTATUS pdb_samba_dsdb_getgrfilter(struct pdb_methods *m, GROUP_MAP *map
 {
        struct pdb_samba_dsdb_state *state = talloc_get_type_abort(
                m->private_data, struct pdb_samba_dsdb_state);
-       const char *attrs[] = { "objectClass", "objectSid", "description", "samAccountName", "groupType",
+       const char *attrs[] = { "objectClass", "objectSid", "description", "sAMAccountName", "groupType",
                                NULL };
        struct ldb_message *msg;
        va_list ap;
@@ -1015,7 +1015,7 @@ static NTSTATUS pdb_samba_dsdb_getgrfilter(struct pdb_methods *m, GROUP_MAP *map
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }
 
-       str = ldb_msg_find_attr_as_string(msg, "samAccountName",
+       str = ldb_msg_find_attr_as_string(msg, "sAMAccountName",
                                          NULL);
        if (str == NULL) {
                talloc_free(tmp_ctx);
@@ -1095,7 +1095,7 @@ static NTSTATUS pdb_samba_dsdb_getgrnam(struct pdb_methods *m, GROUP_MAP *map,
        NTSTATUS status;
 
        filter = talloc_asprintf(talloc_tos(),
-                                "(&(samaccountname=%s)(objectclass=group))",
+                                "(&(sAMAccountName=%s)(objectclass=group))",
                                 name);
        if (filter == NULL) {
                return NT_STATUS_NO_MEMORY;
@@ -1980,7 +1980,7 @@ static bool pdb_samba_dsdb_search_filter(struct pdb_methods *m,
 
                e->acct_flags = samdb_result_acct_flags(res->msgs[i], "userAccountControl");
                e->account_name = ldb_msg_find_attr_as_string(
-                       res->msgs[i], "samAccountName", NULL);
+                       res->msgs[i], "sAMAccountName", NULL);
                if (e->account_name == NULL) {
                        talloc_free(tmp_ctx);
                        return false;
@@ -3173,7 +3173,7 @@ static NTSTATUS add_trust_user(TALLOC_CTX *mem_ctx,
                return NT_STATUS_NO_MEMORY;
        }
 
-       ret = ldb_msg_add_fmt(msg, "samAccountName", "%s$", netbios_name);
+       ret = ldb_msg_add_fmt(msg, "sAMAccountName", "%s$", netbios_name);
        if (ret != LDB_SUCCESS) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -3518,7 +3518,7 @@ static NTSTATUS delete_trust_user(TALLOC_CTX *mem_ctx,
                           ldb_get_default_basedn(state->ldb),
                           &msgs,
                           attrs,
-                          "samAccountName=%s$",
+                          "sAMAccountName=%s$",
                           trust_user);
        if (ret > 1) {
                return NT_STATUS_INTERNAL_DB_CORRUPTION;

diff --git a/source4/dsdb/common/util_samr.c b/source4/dsdb/common/util_samr.c
index 0a48fcf5b92221ff68fdc3c2bd59cfefd50cd072..fb7571cbef32a61c2f3e4185ca8f0e0ff658e95d 100644 (file)
--- a/source4/dsdb/common/util_samr.c
+++ b/source4/dsdb/common/util_samr.c
@@ -559,7 +559,7 @@ NTSTATUS dsdb_lookup_rids(struct ldb_context *ldb,
                        talloc_free(tmp_ctx);
                        return NT_STATUS_NO_MEMORY;
                }
-               rc = dsdb_search_one(ldb, tmp_ctx, &msg, dn, LDB_SCOPE_BASE, attrs, 0, "samAccountName=*");
+               rc = dsdb_search_one(ldb, tmp_ctx, &msg, dn, LDB_SCOPE_BASE, attrs, 0, "sAMAccountName=*");
                if (rc == LDB_ERR_NO_SUCH_OBJECT) {
                        continue;
                } else if (rc != LDB_SUCCESS) {
@@ -567,7 +567,7 @@ NTSTATUS dsdb_lookup_rids(struct ldb_context *ldb,
                        return NT_STATUS_INTERNAL_DB_CORRUPTION;
                }
 
-               names[i] = ldb_msg_find_attr_as_string(msg, "samAccountName", NULL);
+               names[i] = ldb_msg_find_attr_as_string(msg, "sAMAccountName", NULL);
                if (names[i] == NULL) {
                        DEBUG(10, ("no samAccountName\n"));
                        continue;

diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c
index 91e02f9d94de9240684e2430657862cfccbb83e1..c04d4aed572388de31d074a3da01b5f5c50015cd 100644 (file)
--- a/source4/dsdb/samdb/cracknames.c
+++ b/source4/dsdb/samdb/cracknames.c
@@ -982,7 +982,7 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
        const char * const _result_attrs_spn[] = { "servicePrincipalName", NULL};
 
        const char * const _domain_attrs_display[] = { "ncName", "dnsRoot", NULL};
-       const char * const _result_attrs_display[] = { "displayName", "samAccountName", NULL};
+       const char * const _result_attrs_display[] = { "displayName", "sAMAccountName", NULL};
 
        const char * const _domain_attrs_sid[] = { "ncName", "dnsRoot", NULL};
        const char * const _result_attrs_sid[] = { "objectSid", NULL};

diff --git a/source4/dsdb/samdb/ldb_modules/acl.c b/source4/dsdb/samdb/ldb_modules/acl.c
index 720d71c7a4aba5d3b19c6ea34e7c8fbda5561414..3e5588c95bbe2884e819e859ed6a8adbdeb3d048 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/acl.c
+++ b/source4/dsdb/samdb/ldb_modules/acl.c
@@ -645,7 +645,7 @@ static int acl_check_spn(TALLOC_CTX *mem_ctx,
        const struct ldb_message *search_res = NULL;
 
        static const char *acl_attrs[] = {
-               "samAccountName",
+               "sAMAccountName",
                "dnsHostName",
                "userAccountControl",
                NULL

diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index 30f4fddc098cefa795655da9a0b414a05c1a641c..99d183e14e520b1136d743e1497a72eb4aac48ea 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -547,7 +547,7 @@ static int samldb_sam_accountname_valid_check(struct samldb_ctx *ac)
 
        ret = dsdb_get_expected_new_values(ac,
                                           ac->msg,
-                                          "samAccountName",
+                                          "sAMAccountName",
                                           &el,
                                           ac->req->operation);
        if (ret != LDB_SUCCESS) {
@@ -565,7 +565,7 @@ static int samldb_sam_accountname_valid_check(struct samldb_ctx *ac)
                }
        }
 
-       ret = samldb_unique_attr_check(ac, "samAccountName", NULL,
+       ret = samldb_unique_attr_check(ac, "sAMAccountName", NULL,
                                       ldb_get_default_basedn(
                                               ldb_module_get_ctx(ac->module)));
 

diff --git a/source4/dsdb/samdb/ldb_modules/update_keytab.c b/source4/dsdb/samdb/ldb_modules/update_keytab.c
index 780eb81d9981871817469d54b7b5f3e7d2155419..ecbae8057ba4d4d4bed150586da58f90587dde5d 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/update_keytab.c
+++ b/source4/dsdb/samdb/ldb_modules/update_keytab.c
@@ -432,7 +432,7 @@ static int update_kt_prepare_commit(struct ldb_module *module)
 
                krb5_ret = smb_krb5_update_keytab(tmp_ctx, smb_krb5_context->krb5_context,
                                                  keytab_name_from_msg(tmp_ctx, ldb, p->msg),
-                                                 ldb_msg_find_attr_as_string(p->msg, "samAccountName", NULL),
+                                                 ldb_msg_find_attr_as_string(p->msg, "sAMAccountName", NULL),
                                                  realm, SPNs, num_SPNs,
                                                  ldb_msg_find_attr_as_string(p->msg, "saltPrincipal", NULL),
                                                  ldb_msg_find_attr_as_string(p->msg, "secret", NULL),

diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c
index dd1c95cb925022fce89dc4d9d200cc520fc06c42..e626f230684a157cc5255d1a9249a4d78edc2dda 100644 (file)
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -1232,7 +1232,7 @@ static krb5_error_code samba_kdc_message2entry(krb5_context context,
                config_kdc_enctypes != 0 ?
                config_kdc_enctypes :
                ENC_ALL_TYPES;
-       const char *samAccountName = ldb_msg_find_attr_as_string(msg, "samAccountName", NULL);
+       const char *samAccountName = ldb_msg_find_attr_as_string(msg, "sAMAccountName", NULL);
 
        const struct authn_kerberos_client_policy *authn_client_policy = NULL;
        const struct authn_server_policy *authn_server_policy = NULL;

diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index d497117ea772d11975cfa5ea4bdb689ec1920f9d..58e490a52da1a469508f9ec093855acc29f5d4da 100644 (file)
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -1079,7 +1079,7 @@ static NTSTATUS add_trust_user(TALLOC_CTX *mem_ctx,
                return NT_STATUS_NO_MEMORY;
        }
 
-       ret = ldb_msg_add_fmt(msg, "samAccountName", "%s$", netbios_name);
+       ret = ldb_msg_add_fmt(msg, "sAMAccountName", "%s$", netbios_name);
        if (ret != LDB_SUCCESS) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -1932,7 +1932,7 @@ static NTSTATUS update_trust_user(TALLOC_CTX *mem_ctx,
 
        ret = gendb_search(sam_ldb, mem_ctx,
                           base_dn, &msgs, attrs,
-                          "samAccountName=%s$", netbios_name);
+                          "sAMAccountName=%s$", netbios_name);
        if (ret > 1) {
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }

diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index 848a01aad4a85cf8105f14f86d416acd6afaf19a..9d7fc4ac0da9bbfa1579c5b992d8260d8bdc7b40 100644 (file)
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -480,7 +480,7 @@ static NTSTATUS dcesrv_netr_ServerAuthenticateGeneric(
                "unicodePwd",
                "userAccountControl",
                "objectSid",
-               "samAccountName",
+               "sAMAccountName",
                /* Required for Group Managed Service Accounts. */
                "msDS-ManagedPasswordId",
                "msDS-ManagedPasswordInterval",
@@ -740,7 +740,7 @@ static NTSTATUS dcesrv_netr_ServerAuthenticateGeneric(
        }
 
        *trust_account_in_db = ldb_msg_find_attr_as_string(msgs[0],
-                                                          "samAccountName",
+                                                          "sAMAccountName",
                                                           NULL);
        if (*trust_account_in_db == NULL) {
                DEBUG(0,("No samAccountName returned in record matching user [%s]\n",

diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index dd767d936a696e399b6af6dbecd9373656a999ad..e756422be4f88ae7556ab2583f50ed18203e4a46 100644 (file)
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -3678,12 +3678,12 @@ static NTSTATUS dcesrv_samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALL
                break;
 
        case 6:
-               SET_STRING(msg, info6.account_name,     "samAccountName");
+               SET_STRING(msg, info6.account_name,     "sAMAccountName");
                SET_STRING(msg, info6.full_name,        "displayName");
                break;
 
        case 7:
-               SET_STRING(msg, info7.account_name,     "samAccountName");
+               SET_STRING(msg, info7.account_name,     "sAMAccountName");
                break;
 
        case 8:
@@ -3763,7 +3763,7 @@ static NTSTATUS dcesrv_samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALL
                IFSET(SAMR_FIELD_ACCT_EXPIRY)
                        SET_UINT64(msg, info21.acct_expiry,    "accountExpires");
                IFSET(SAMR_FIELD_ACCOUNT_NAME)
-                       SET_STRING(msg, info21.account_name,   "samAccountName");
+                       SET_STRING(msg, info21.account_name,   "sAMAccountName");
                IFSET(SAMR_FIELD_FULL_NAME)
                        SET_STRING(msg, info21.full_name,      "displayName");
                IFSET(SAMR_FIELD_HOME_DIRECTORY)
@@ -3868,7 +3868,7 @@ static NTSTATUS dcesrv_samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALL
                IFSET(SAMR_FIELD_ACCT_EXPIRY)
                        SET_UINT64(msg, info23.info.acct_expiry,    "accountExpires");
                IFSET(SAMR_FIELD_ACCOUNT_NAME)
-                       SET_STRING(msg, info23.info.account_name,   "samAccountName");
+                       SET_STRING(msg, info23.info.account_name,   "sAMAccountName");
                IFSET(SAMR_FIELD_FULL_NAME)
                        SET_STRING(msg, info23.info.full_name,      "displayName");
                IFSET(SAMR_FIELD_HOME_DIRECTORY)
@@ -3979,7 +3979,7 @@ static NTSTATUS dcesrv_samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALL
                IFSET(SAMR_FIELD_ACCT_EXPIRY)
                        SET_UINT64(msg, info25.info.acct_expiry,    "accountExpires");
                IFSET(SAMR_FIELD_ACCOUNT_NAME)
-                       SET_STRING(msg, info25.info.account_name,   "samAccountName");
+                       SET_STRING(msg, info25.info.account_name,   "sAMAccountName");
                IFSET(SAMR_FIELD_FULL_NAME)
                        SET_STRING(msg, info25.info.full_name,      "displayName");
                IFSET(SAMR_FIELD_HOME_DIRECTORY)
@@ -4150,7 +4150,7 @@ static NTSTATUS dcesrv_samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALL
                {
                        SET_STRING(msg,
                                   info32.info.account_name,
-                                  "samAccountName");
+                                  "sAMAccountName");
                }
                IFSET(SAMR_FIELD_FULL_NAME)
                {

diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c
index 8af79182e4b8c84798cbeb746a5f72673de44fd6..3c1bb26cce016bccc67b54c68678657043d3e161 100644 (file)
--- a/source4/rpc_server/samr/samr_password.c
+++ b/source4/rpc_server/samr/samr_password.c
@@ -187,7 +187,7 @@ NTSTATUS dcesrv_samr_ChangePasswordUser4(struct dcesrv_call_state *dce_call,
        }
 
        dn = msg->dn;
-       samAccountName = ldb_msg_find_attr_as_string(msg, "samAccountName", NULL);
+       samAccountName = ldb_msg_find_attr_as_string(msg, "sAMAccountName", NULL);
        objectSid = samdb_result_dom_sid(msg, msg, "objectSid");
 
        status = samdb_result_passwords(mem_ctx,
@@ -372,7 +372,7 @@ static NTSTATUS dcesrv_samr_ChangePasswordUser_impl(struct dcesrv_call_state *dc
        }
 
        user_dn = msg->dn;
-       user_samAccountName = ldb_msg_find_attr_as_string(msg, "samAccountName", NULL);
+       user_samAccountName = ldb_msg_find_attr_as_string(msg, "sAMAccountName", NULL);
        user_objectSid = samdb_result_dom_sid(mem_ctx, msg, "objectSid");
 
        status = samdb_result_passwords(mem_ctx, lp_ctx,

diff --git a/source4/torture/libnet/utils.c b/source4/torture/libnet/utils.c
index c0e0e657fa3c2ad1220fba72e20fc65c4c91bae4..de859d57a1db0b5c7f607e44c5f8d120db05a8ab 100644 (file)
--- a/source4/torture/libnet/utils.c
+++ b/source4/torture/libnet/utils.c
@@ -120,7 +120,7 @@ static bool _get_account_name_for_user_rdn(struct torture_context *tctx,
        struct ldb_result *ldb_res;
        const char *account_name = NULL;
        static const char *attrs[] = {
-               "samAccountName",
+               "sAMAccountName",
                NULL
        };
 
@@ -142,7 +142,7 @@ static bool _get_account_name_for_user_rdn(struct torture_context *tctx,
                             attrs,
                             "(&(objectClass=user)(name=%s))", user_rdn);
        if (LDB_SUCCESS == ldb_ret && 1 == ldb_res->count) {
-               account_name = ldb_msg_find_attr_as_string(ldb_res->msgs[0], "samAccountName", NULL);
+               account_name = ldb_msg_find_attr_as_string(ldb_res->msgs[0], "sAMAccountName", NULL);
        }
 
        /* return user_rdn by default */