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)

diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index 43a1ef4347463552af286378b6bd60b343867c47..39583185202527d6df30ceb4c208c33406be4337 100644 (file)
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -35,6 +35,18 @@ REQUIRED_SUBSYSTEMS = \
 # End MODULE auth_winbind
 #######################
 
+#######################
+# 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]

diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index 2dcffd93e148d79e90f2e2f4565343be33b9ecd9..1186853520ab78d2836b99a39a57f7b88e99bd0c 100644 (file)
--- 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 ca816ef7186dc70464bb8947969402c9ef147cbf..da96c02e6bf923f763a09f3d0983eb21c52bd35a 100644 (file)
--- 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}