summaryrefslogtreecommitdiff
path: root/source3/param
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/param
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/param')
-rw-r--r--source3/param/loadparm.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 9f47f14be5..9a26819397 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -132,6 +132,8 @@ typedef struct
char *szCharacterSet;
char *szLogonScript;
char *szLogonPath;
+ char *szLogonDrive;
+ char *szLogonHome;
char *szSmbrun;
char *szWINSserver;
char *szInterfaces;
@@ -445,6 +447,8 @@ struct parm_struct
{"character set", P_STRING, P_GLOBAL, &Globals.szCharacterSet, handle_character_set},
{"logon script", P_STRING, P_GLOBAL, &Globals.szLogonScript, NULL},
{"logon path", P_STRING, P_GLOBAL, &Globals.szLogonPath, NULL},
+ {"logon drive", P_STRING, P_GLOBAL, &Globals.szLogonDrive, NULL},
+ {"logon home", P_STRING, P_GLOBAL, &Globals.szLogonHome, NULL},
{"remote announce", P_STRING, P_GLOBAL, &Globals.szRemoteAnnounce, NULL},
{"socket address", P_STRING, P_GLOBAL, &Globals.szSocketAddress, NULL},
{"homedir map", P_STRING, P_GLOBAL, &Globals.szNISHomeMapName, NULL},
@@ -620,6 +624,11 @@ static void init_globals(void)
string_set(&Globals.szServerString,s);
sprintf(s,"%d.%d", DEFAULT_MAJOR_VERSION, DEFAULT_MINOR_VERSION);
string_set(&Globals.szAnnounceVersion,s);
+
+ string_set(&Globals.szLogonDrive, "");
+ /* %N is the NIS auto.home server if -DAUTOHOME is used, else same as %L */
+ string_set(&Globals.szLogonHome, "\\\\%N\\%U");
+ string_set(&Globals.szLogonPath, "\\\\%N\\%U\\profile");
Globals.bLoadPrinters = True;
Globals.bUseRhosts = False;
Globals.max_packet = 65535;
@@ -838,6 +847,8 @@ FN_GLOBAL_STRING(lp_username_map,&Globals.szUsernameMap)
FN_GLOBAL_STRING(lp_character_set,&Globals.szCharacterSet)
FN_GLOBAL_STRING(lp_logon_script,&Globals.szLogonScript)
FN_GLOBAL_STRING(lp_logon_path,&Globals.szLogonPath)
+FN_GLOBAL_STRING(lp_logon_drive,&Globals.szLogonDrive)
+FN_GLOBAL_STRING(lp_logon_home,&Globals.szLogonHome)
FN_GLOBAL_STRING(lp_remote_announce,&Globals.szRemoteAnnounce)
FN_GLOBAL_STRING(lp_wins_server,&Globals.szWINSserver)
FN_GLOBAL_STRING(lp_interfaces,&Globals.szInterfaces)