util.c password.c :

	added automount_server() function which, if -DAUTOMOUNT is in use,
	returns the server name of the NIS auto.map entry.  otherwise,
	it returns local_server.

	added use of automount_server() for a new substitution %N for NIS
	home server.  this defaults, via automount_server(), to the same
	functionality as %L if -DAUTOMOUNT is not used.

	removed vuser->home_share.  moved code that grabbed the servername
	into the separate function automount_server().

loadparm.c :

	created "logon drive" (default of "")
	created "logon home"  (default of "\\%N\%U")
	changed default of "logon path" from NULL to "\\%N\%U\profile".

ipc.c pipenetlog.c :

	use lp_logon_drive(), lp_logon_home() and lp_logon_path() in their
	now easier-to-use form (don't have to check if *lp_logon_path() and
	manually substitute a default of \\%L\%U and do a standard_sub_basic()
	on the result, because the default automatically does this.
(This used to be commit c6c28a4c3c9010ff9d5eac4bad091189a786d5a0)

1 files changed, 0 insertions, 35 deletions

diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 2da8a8f936..311ef47679 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -155,15 +155,6 @@ tell random client vuid's (normally zero) from valid vuids.
 uint16 register_vuid(int uid,int gid, char *name,BOOL guest)
 {
   user_struct *vuser;
-
-#if (defined(NETGROUP) && defined (AUTOMOUNT))
-  int nis_error;        /* returned by yp all functions */
-  char *nis_result;     /* yp_match inits this */
-  int nis_result_len;  /* and set this */
-  char *nis_domain;     /* yp_get_default_domain inits this */
-  char *nis_map = (char *)lp_nis_home_map_name();
-  int home_server_len;
-#endif
   struct passwd *pwfile; /* for getting real name from passwd file */
 
 #if 0
@@ -224,32 +215,6 @@ uint16 register_vuid(int uid,int gid, char *name,BOOL guest)
 
   DEBUG(3,("uid %d registered to name %s\n",uid,name));
 
-#if (defined(NETGROUP) && defined (AUTOMOUNT))
-  vuser->home_share = NULL;
-  DEBUG(3, ("Setting default HOMESHR to: \\\\logon server\\HOMES\n"));
-  vuser->home_share = Realloc(vuser->home_share, 32);
-  strcpy(vuser->home_share,"\\\\%L\\%U");
-
-  if ((nis_error = yp_get_default_domain(&nis_domain)) != 0)
-    DEBUG(3, ("YP Error: %s\n", yperr_string(nis_error)));
-  DEBUG(3, ("NIS Domain: %s\n", nis_domain));
-
-  if ((nis_error = yp_match(nis_domain, nis_map, vuser->name, strlen(vuser->name),
-                        &nis_result, &nis_result_len)) != 0)
-    DEBUG(3, ("YP Error: %s\n", yperr_string(nis_error)));
-  if (!nis_error && lp_nis_home_map()) {
-    home_server_len = strcspn(nis_result,":");
-    DEBUG(3, ("NIS lookup succeeded\n\tHome server length: %d\n",home_server_len));
-    vuser->home_share = (char *)Realloc(vuser->home_share, home_server_len+12);
-    DEBUG(3, ("\tAllocated %d bytes for HOMESHR\n",home_server_len+12 ));
-    strcpy(vuser->home_share,"\\\\");
-    strncat(vuser->home_share, nis_result, home_server_len);
-    strcat(vuser->home_share,"\\homes");
-    DEBUG(2,("\tUser = %s\n\tUID = %d\n\tNIS result = %s\n\tHOMESHR = %s\n",
-           vuser->name, vuser->uid, nis_result, vuser->home_share));
-  }
-#endif
-
   DEBUG(3, ("Clearing default real name\n"));
   fstrcpy(vuser->real_name, "<Full Name>\0");
   if (lp_unix_realname()) {