diff options
author | Jeremy Allison <jra@samba.org> | 2000-10-28 19:38:39 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2000-10-28 19:38:39 +0000 |
commit | 1cb444057a7894ca97706fb65a756e5fdb635f81 (patch) | |
tree | e251df5cf04952b32aafa3db1c75e09b0f742f8f /source3/param/loadparm.c | |
parent | 234792321c07aa59103fb7502534e6dba0ca4c08 (diff) | |
download | samba-1cb444057a7894ca97706fb65a756e5fdb635f81.tar.gz samba-1cb444057a7894ca97706fb65a756e5fdb635f81.tar.bz2 samba-1cb444057a7894ca97706fb65a756e5fdb635f81.zip |
David Lee's utmp patch (finally). Thanks David !
Jeremy.
(This used to be commit b809a2d0c81c54e917ccc0c99b3e70ea8d7ceab1)
Diffstat (limited to 'source3/param/loadparm.c')
-rw-r--r-- | source3/param/loadparm.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 3fa3773276..43b0c62f17 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -168,6 +168,9 @@ typedef struct char *szWINSHook; #ifdef WITH_UTMP char *szUtmpDir; + char *szWtmpDir; + char *szUtmpHostname; + BOOL bUtmpConsolidate; #endif /* WITH_UTMP */ char *szSourceEnv; char *szWinbindUID; @@ -939,6 +942,10 @@ static struct parm_struct parm_table[] = { #ifdef WITH_UTMP {"utmp dir", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0}, {"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0}, + {"wtmp dir", P_STRING, P_GLOBAL, &Globals.szWtmpDir, NULL, NULL, 0}, + {"wtmp directory", P_STRING, P_GLOBAL, &Globals.szWtmpDir, NULL, NULL, 0}, + {"utmp hostname", P_STRING, P_GLOBAL, &Globals.szUtmpHostname, NULL, NULL, 0}, + {"utmp consolidate", P_BOOL, P_GLOBAL, &Globals.bUtmpConsolidate, NULL, NULL, 0}, #endif /* WITH_UTMP */ {"default service", P_STRING, P_GLOBAL, @@ -1142,6 +1149,9 @@ static void init_globals(void) string_set(&Globals.szLockDir, LOCKDIR); #ifdef WITH_UTMP string_set(&Globals.szUtmpDir, ""); + string_set(&Globals.szWtmpDir, ""); + string_set(&Globals.szUtmpHostname, "%m"); + Globals.bUtmpConsolidate = False; #endif /* WITH_UTMP */ string_set(&Globals.szSmbrun, SMBRUN); string_set(&Globals.szSocketAddress, "0.0.0.0"); @@ -1370,6 +1380,9 @@ FN_GLOBAL_STRING(lp_deleteprinter_cmd, &Globals.szDeletePrinterCommand) FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir) #ifdef WITH_UTMP FN_GLOBAL_STRING(lp_utmpdir, &Globals.szUtmpDir) +FN_GLOBAL_STRING(lp_wtmpdir, &Globals.szWtmpDir) +FN_GLOBAL_STRING(lp_utmp_hostname, &Globals.szUtmpHostname) +FN_GLOBAL_BOOL(lp_utmp_consolidate, &Globals.bUtmpConsolidate) #endif /* WITH_UTMP */ FN_GLOBAL_STRING(lp_rootdir, &Globals.szRootdir) FN_GLOBAL_STRING(lp_source_environment, &Globals.szSourceEnv) |