svn commit: samba r5983 - in branches/SAMBA_4_0/source: . auth libnet

[abartlet at samba.org]

Author: abartlet
Date: 2005-03-23 00:05:44 +0000 (Wed, 23 Mar 2005)
New Revision: 5983

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5983

Log:
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

Modified:
   branches/SAMBA_4_0/source/auth/config.mk
   branches/SAMBA_4_0/source/libnet/libnet_join.c
   branches/SAMBA_4_0/source/secrets.ldif


Changeset:
Modified: branches/SAMBA_4_0/source/auth/config.mk
===================================================================
--- branches/SAMBA_4_0/source/auth/config.mk	2005-03-22 23:46:12 UTC (rev 5982)
+++ branches/SAMBA_4_0/source/auth/config.mk	2005-03-23 00:05:44 UTC (rev 5983)
@@ -36,6 +36,18 @@
 #######################
 
 #######################
+# 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

Modified: branches/SAMBA_4_0/source/libnet/libnet_join.c
===================================================================
--- branches/SAMBA_4_0/source/libnet/libnet_join.c	2005-03-22 23:46:12 UTC (rev 5982)
+++ branches/SAMBA_4_0/source/libnet/libnet_join.c	2005-03-23 00:05:44 UTC (rev 5983)
@@ -386,7 +386,7 @@
 		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 @@
 				     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 */

Modified: branches/SAMBA_4_0/source/secrets.ldif
===================================================================
--- branches/SAMBA_4_0/source/secrets.ldif	2005-03-22 23:46:12 UTC (rev 5982)
+++ branches/SAMBA_4_0/source/secrets.ldif	2005-03-23 00:05:44 UTC (rev 5983)
@@ -19,6 +19,7 @@
 flatname: ${DOMAIN}
 realm: ${REALM}
 secret: ${JOINPASS}
+sAMAccountName: ${NETBIOSNAME}$
 whenCreated: ${LDAPTIME}
 whenChanged: ${LDAPTIME}