summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-03-23 00:05:44 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:11:12 -0500
commitd735487aad2f722d3d13994b47a998ef5164c660 (patch)
tree85cd6f99a69cf45cdffbbd10802af4390639da92
parent1cb21b84a93028147ebd9c408a9db42d34e6cbf0 (diff)
downloadsamba-d735487aad2f722d3d13994b47a998ef5164c660.tar.gz
samba-d735487aad2f722d3d13994b47a998ef5164c660.tar.bz2
samba-d735487aad2f722d3d13994b47a998ef5164c660.zip
r5983: Start support for being a domain member in Samba4.
This adds the auth_domain module to the auth subsystem, and cleans up some small details around the join process (ensuring all the right info is in the DB). Andrew Bartlett (This used to be commit 858cbfb8210239aa85a01da95e5beb9546a998a5)
-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}