diff options
| author | Andrew Tridgell <tridge@samba.org> | 2000-05-10 10:41:59 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2000-05-10 10:41:59 +0000 |
| commit | 49a0e6d5989656c1b3c9c063a20308ca4ee5d73b (patch) | |
| tree | 6c89da7fcb785e86a55c92a813045b9fc3712f51 /source3/smbd/nttrans.c | |
| parent | ddc9b8b40642c90fe7c34b088eae4f8075f4033a (diff) | |
| download | samba-49a0e6d5989656c1b3c9c063a20308ca4ee5d73b.tar.gz samba-49a0e6d5989656c1b3c9c063a20308ca4ee5d73b.tar.bz2 samba-49a0e6d5989656c1b3c9c063a20308ca4ee5d73b.zip | |
more merging voodoo
this adds "#define OLD_NTDOMAIN 1" in lots of places. Don't panic -
this isn't permanent, it should go after another few merge steps have
been done
(This used to be commit 92109d7b3c06f240452d39f669ecb8c9c86ab610)
Diffstat (limited to 'source3/smbd/nttrans.c')
| -rw-r--r-- | source3/smbd/nttrans.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index 98f5959c2d..e98187de25 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -1,3 +1,4 @@ +#define OLD_NTDOMAIN 1 /* Unix SMB/Netbios implementation. Version 1.9. @@ -2160,7 +2161,7 @@ static BOOL unpack_nt_permissions(SMB_STRUCT_STAT *psbuf, uid_t *puser, gid_t *p for(i = 0; i < dacl->num_aces; i++) { DOM_SID ace_sid; - SEC_ACE *psa = &dacl->ace_list[i]; + SEC_ACE *psa = &dacl->ace[i]; if((psa->type != SEC_ACE_TYPE_ACCESS_ALLOWED) && (psa->type != SEC_ACE_TYPE_ACCESS_DENIED)) { @@ -2669,3 +2670,4 @@ due to being in oplock break state.\n" )); calls have already sent it. If outsize != -1 then it is returning an error packet. */ } +#undef OLD_NTDOMAIN |