summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/auth/config.mk12
-rw-r--r--source4/libnet/libnet_join.c4
-rw-r--r--source4/secrets.ldif1
3 files changed, 15 insertions, 2 deletions
diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index 43a1ef4347..3958318520 100644
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -36,6 +36,18 @@ REQUIRED_SUBSYSTEMS = \
#######################
#######################
+# Start MODULE auth_domain
+[MODULE::auth_domain]
+INIT_FUNCTION = auth_domain_init
+SUBSYSTEM = AUTH
+INIT_OBJ_FILES = \
+ auth/auth_domain.o
+REQUIRED_SUBSYSTEMS = \
+ NDR_NETLOGON LIBNDR
+# End MODULE auth_winbind
+#######################
+
+#######################
# Start MODULE auth_developer
[MODULE::auth_developer]
INIT_FUNCTION = auth_developer_init
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index 2dcffd93e1..1186853520 100644
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -386,7 +386,7 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx,
samdb_msg_add_string(ldb, mem_ctx, msg, "objectClass", "primaryDomain");
samdb_msg_add_string(ldb, mem_ctx, msg, "secret", r2.generic.out.join_password);
- samdb_msg_add_string(ldb, mem_ctx, msg, "accountName", r2.generic.in.account_name);
+ samdb_msg_add_string(ldb, mem_ctx, msg, "samAccountName", r2.generic.in.account_name);
samdb_msg_add_string(ldb, mem_ctx, msg, "secureChannelType", sct);
@@ -423,7 +423,7 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx,
prior_modified_time);
}
- samdb_msg_set_string(ldb, mem_ctx, msg, "accountName", r2.generic.in.account_name);
+ samdb_msg_set_string(ldb, mem_ctx, msg, "samAccountName", r2.generic.in.account_name);
samdb_msg_set_string(ldb, mem_ctx, msg, "secureChannelType", sct);
/* update the secret */
diff --git a/source4/secrets.ldif b/source4/secrets.ldif
index ca816ef718..da96c02e6b 100644
--- a/source4/secrets.ldif
+++ b/source4/secrets.ldif
@@ -19,6 +19,7 @@ objectClass: primaryDomain
flatname: ${DOMAIN}
realm: ${REALM}
secret: ${JOINPASS}
+sAMAccountName: ${NETBIOSNAME}$
whenCreated: ${LDAPTIME}
whenChanged: ${LDAPTIME}