mirror of
https://github.com/samba-team/samba.git
synced 2025-03-01 04:58:35 +03:00
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)
This commit is contained in:
parent
28029c73b7
commit
88d88f5d0d
@ -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) {
|
||||
|
@ -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},
|
||||
|
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user