summaryrefslogtreecommitdiff
path: root/source3/pipenetlog.c
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>1997-10-20 12:10:58 +0000
committerLuke Leighton <lkcl@samba.org>1997-10-20 12:10:58 +0000
commit423a7c417136af3f6d09b3c1763336dd0a401d4f (patch)
tree85684440ac212cb67b59531cecbab24992aac5f8 /source3/pipenetlog.c
parent65ae39226c06e54c3237dd53f4be55b7449000e1 (diff)
downloadsamba-423a7c417136af3f6d09b3c1763336dd0a401d4f.tar.gz
samba-423a7c417136af3f6d09b3c1763336dd0a401d4f.tar.bz2
samba-423a7c417136af3f6d09b3c1763336dd0a401d4f.zip
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)
Diffstat (limited to 'source3/pipenetlog.c')
-rw-r--r--source3/pipenetlog.c19
1 files changed, 5 insertions, 14 deletions
diff --git a/source3/pipenetlog.c b/source3/pipenetlog.c
index 0dac804834..d407e00661 100644
--- a/source3/pipenetlog.c
+++ b/source3/pipenetlog.c
@@ -524,20 +524,14 @@ static void api_lsa_sam_logon( user_struct *vuser,
pstrcpy(dom_sid , lp_domainsid ());
pstrcpy(my_workgroup, lp_workgroup ());
- pstrcpy(my_name , myname );
- strupper(my_name);
-
- pstrcpy(home_drive , "a:" );
-
-#if (defined(NETGROUP) && defined(AUTOMOUNT))
- pstrcpy(home_dir , vuser->home_share);
-#else
- pstrcpy(home_dir , "\\\\%L\\%U");
-#endif
- standard_sub_basic(home_dir);
+ pstrcpy(home_drive , lp_logon_drive ());
+ pstrcpy(home_dir , lp_logon_home ());
sam_logon_in_ssb = False;
+ pstrcpy(my_name , myname );
+ strupper(my_name);
+
make_lsa_user_info(&usr_info,
&dummy_time, /* logon_time */
@@ -603,9 +597,6 @@ BOOL api_netlogrpcTNP(int cnum,int uid, char *param,char *data,
if ((vuser = get_valid_user_struct(uid)) == NULL) return False;
DEBUG(3,("Username of UID %d is %s\n", vuser->uid, vuser->name));
-#if defined(NETGROUP) && defined(AUTOMOUNT)
- DEBUG(3,("HOMESHR for %s is %s\n", vuser->name, vuser->home_share));
-#endif
switch (opnum)
{