From 88d88f5d0d23c8c849739b9441872734c0431c99 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 5 Jun 1998 20:46:05 +0000 Subject: loadparm.c: Did it ! Changed defaults for 'case preserve' and 'short case preserve'. Also removed 'domain allow/deny' parameters. shmem_sysv.c: Added strerror code so I can see why sysV calls are failing. lib/rpc/server/srv_netlog.c: Removed code that used 'domain allow/deny' parameters - replaced with a comment so I will remember to fix this later. Jeremy. (This used to be commit 5f46c7c4b11a75f1ffbd806cde915b4bf28232db) --- source3/locking/shmem_sysv.c | 6 +++--- source3/param/loadparm.c | 8 ++------ source3/rpc_server/srv_netlog.c | 12 +++++++++++- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/source3/locking/shmem_sysv.c b/source3/locking/shmem_sysv.c index 20aea9283d..439d89c6e0 100644 --- a/source3/locking/shmem_sysv.c +++ b/source3/locking/shmem_sysv.c @@ -658,7 +658,7 @@ struct shmem_ops *sysv_shm_open(int ronly) } if (shm_id == -1) { - DEBUG(0,("Can't create or use IPC area\n")); + DEBUG(0,("Can't create or use IPC area. Error was %s\n", strerror(errno))); global_unlock(); return NULL; } @@ -667,7 +667,7 @@ struct shmem_ops *sysv_shm_open(int ronly) shm_header_p = (struct ShmHeader *)shmat(shm_id, 0, read_only?SHM_RDONLY:0); if ((long)shm_header_p == -1) { - DEBUG(0,("Can't attach to IPC area\n")); + DEBUG(0,("Can't attach to IPC area. Error was %s\n", strerror(errno))); global_unlock(); return NULL; } @@ -676,7 +676,7 @@ struct shmem_ops *sysv_shm_open(int ronly) we use a registration file containing the processids of the file mapping processes */ if (shmctl(shm_id, IPC_STAT, &shm_ds) != 0) { - DEBUG(0,("ERROR shm_open : can't IPC_STAT\n")); + DEBUG(0,("ERROR shm_open : can't IPC_STAT. Error was %s\n", strerror(errno))); } if (!read_only) { diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 436a43240b..8bd051567a 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -352,8 +352,8 @@ static service sDefault = False, /* bAlternatePerm */ False, /* revalidate */ False, /* case sensitive */ - False, /* case preserve */ - False, /* short case preserve */ + True, /* case preserve */ + True, /* short case preserve */ False, /* case mangle */ True, /* status */ True, /* bHideDotFiles */ @@ -592,10 +592,6 @@ static struct parm_struct parm_table[] = {"domain guest group",P_STRING, P_GLOBAL, &Globals.szDomainGuestGroup, NULL, NULL, 0}, {"domain admin users",P_STRING, P_GLOBAL, &Globals.szDomainAdminUsers, NULL, NULL, 0}, {"domain guest users",P_STRING, P_GLOBAL, &Globals.szDomainGuestUsers, NULL, NULL, 0}, - {"domain hosts allow",P_STRING, P_GLOBAL, &Globals.szDomainHostsallow, NULL, NULL, 0}, - {"domain allow hosts",P_STRING, P_GLOBAL, &Globals.szDomainHostsallow, NULL, NULL, 0}, - {"domain hosts deny", P_STRING, P_GLOBAL, &Globals.szDomainHostsdeny, NULL, NULL, 0}, - {"domain deny hosts", P_STRING, P_GLOBAL, &Globals.szDomainHostsdeny, NULL, NULL, 0}, {"machine password timeout", P_INTEGER, P_GLOBAL, &Globals.machine_password_timeout, NULL, NULL, 0}, {"Logon Options", P_SEP, P_SEPARATOR}, diff --git a/source3/rpc_server/srv_netlog.c b/source3/rpc_server/srv_netlog.c index 821945b757..0679e876e2 100644 --- a/source3/rpc_server/srv_netlog.c +++ b/source3/rpc_server/srv_netlog.c @@ -229,7 +229,16 @@ static void net_reply_sam_logoff(NET_Q_SAM_LOGOFF *q_s, prs_struct *rdata, static BOOL get_md4pw(char *md4pw, char *mach_name, char *mach_acct) { struct smb_passwd *smb_pass; - extern int Client; + +#if 0 + /* + * Currently this code is redundent as we already have a filter + * by hostname list. What this code really needs to do is to + * get a hosts allowed/hosts denied list from the SAM database + * on a per user basis, and make the access decision there. + * I will leave this code here for now as a reminder to implement + * this at a later date. JRA. + */ if (!allow_access(lp_domain_hostsdeny(), lp_domain_hostsallow(), client_name(Client), client_addr(Client))) @@ -237,6 +246,7 @@ static BOOL get_md4pw(char *md4pw, char *mach_name, char *mach_acct) DEBUG(0,("get_md4pw: Workstation %s denied access to domain\n", mach_acct)); return False; } +#endif /* 0 */ become_root(True); smb_pass = getsmbpwnam(mach_acct); -- cgit