summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/blocking.c4
-rw-r--r--source3/smbd/chgpasswd.c4
-rw-r--r--source3/smbd/close.c4
-rw-r--r--source3/smbd/conn.c4
-rw-r--r--source3/smbd/dir.c4
-rw-r--r--source3/smbd/dosmode.c4
-rw-r--r--source3/smbd/error.c4
-rw-r--r--source3/smbd/fileio.c2
-rw-r--r--source3/smbd/filename.c4
-rw-r--r--source3/smbd/files.c2
-rw-r--r--source3/smbd/ipc.c2
-rw-r--r--source3/smbd/lanman.c3
-rw-r--r--source3/smbd/message.c4
-rw-r--r--source3/smbd/negprot.c4
-rw-r--r--source3/smbd/nttrans.c4
-rw-r--r--source3/smbd/open.c4
-rw-r--r--source3/smbd/oplock.c4
-rw-r--r--source3/smbd/password.c4
-rw-r--r--source3/smbd/pipes.c3
-rw-r--r--source3/smbd/process.c3
-rw-r--r--source3/smbd/reply.c2
-rw-r--r--source3/smbd/server.c2
-rw-r--r--source3/smbd/service.c4
-rw-r--r--source3/smbd/trans2.c4
-rw-r--r--source3/smbd/uid.c4
25 files changed, 86 insertions, 1 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index e8dc29f80a..16caf8b52e 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -1,3 +1,5 @@
+#define OLD_NTDOMAIN 1
+
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -631,3 +633,5 @@ void process_blocking_lock_queue(time_t t)
blr = (blocking_lock_record *)ubi_slNext(blr);
}
}
+
+#undef OLD_NTDOMAIN
diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c
index 708b52f4bc..d27cf373f5 100644
--- a/source3/smbd/chgpasswd.c
+++ b/source3/smbd/chgpasswd.c
@@ -1,3 +1,5 @@
+#define OLD_NTDOMAIN 1
+
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -935,3 +937,5 @@ BOOL check_plaintext_password(char *user, char *old_passwd,
else
return (True);
}
+
+#undef OLD_NTDOMAIN
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 03f6aaf81a..0b7b5f794e 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -1,3 +1,5 @@
+#define OLD_NTDOMAIN 1
+
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -225,3 +227,5 @@ int close_file(files_struct *fsp, BOOL normal_close)
return close_statfile(fsp, normal_close);
return close_normal_file(fsp, normal_close);
}
+
+#undef OLD_NTDOMAIN
diff --git a/source3/smbd/conn.c b/source3/smbd/conn.c
index f43a30d320..ebd18861fc 100644
--- a/source3/smbd/conn.c
+++ b/source3/smbd/conn.c
@@ -1,3 +1,5 @@
+#define OLD_NTDOMAIN 1
+
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -200,3 +202,5 @@ void conn_free(connection_struct *conn)
ZERO_STRUCTP(conn);
free(conn);
}
+
+#undef OLD_NTDOMAIN
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index ee383ea72a..aaab206a26 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -1,3 +1,5 @@
+#define OLD_NTDOMAIN 1
+
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -891,3 +893,5 @@ void DirCacheFlush(int snum)
entry = (dir_cache_entry *)next;
}
}
+
+#undef OLD_NTDOMAIN
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 278a4ab5e3..26fd2aff14 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -1,3 +1,5 @@
+#define OLD_NTDOMAIN 1
+
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -295,3 +297,5 @@ BOOL set_filetime(connection_struct *conn, char *fname, time_t mtime)
return(True);
}
+
+#undef OLD_NTDOMAIN
diff --git a/source3/smbd/error.c b/source3/smbd/error.c
index d879f9a93c..49da44d68e 100644
--- a/source3/smbd/error.c
+++ b/source3/smbd/error.c
@@ -1,3 +1,5 @@
+#define OLD_NTDOMAIN 1
+
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -144,3 +146,5 @@ int error_packet(char *inbuf,char *outbuf,int error_class,uint32 error_code,int
return(outsize);
}
+
+#undef OLD_NTDOMAIN
diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c
index 79dcd8ab83..45ad959a3c 100644
--- a/source3/smbd/fileio.c
+++ b/source3/smbd/fileio.c
@@ -1,3 +1,4 @@
+#define OLD_NTDOMAIN 1
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -657,3 +658,4 @@ void sync_file(connection_struct *conn, files_struct *fsp)
conn->vfs_ops.fsync(fsp->fd);
}
}
+#undef OLD_NTDOMAIN
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index ed1a1c3f63..294e80250a 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -1,3 +1,5 @@
+#define OLD_NTDOMAIN 1
+
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -509,3 +511,5 @@ static BOOL scan_directory(char *path, char *name,connection_struct *conn,BOOL d
return(False);
}
+
+#undef OLD_NTDOMAIN
diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index a4837a1a8b..2909d49a2a 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -1,3 +1,4 @@
+#define OLD_NTDOMAIN 1
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -363,3 +364,4 @@ void file_chain_restore(void)
{
chain_fsp = oplock_save_chain_fsp;
}
+#undef OLD_NTDOMAIN
diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index 73addda086..30ac8932aa 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -1,3 +1,4 @@
+#define OLD_NTDOMAIN 1
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -506,3 +507,4 @@ int reply_trans(connection_struct *conn, char *inbuf,char *outbuf, int size, int
return(outsize);
}
+#undef OLD_NTDOMAIN
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index b986df6d07..fe2cc3ae7d 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -1,3 +1,4 @@
+#define OLD_NTDOMAIN 1
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -3179,3 +3180,5 @@ int api_reply(connection_struct *conn,uint16 vuid,char *outbuf,char *data,char *
return -1;
}
+
+#undef OLD_NTDOMAIN
diff --git a/source3/smbd/message.c b/source3/smbd/message.c
index cc329d61a6..a65539affa 100644
--- a/source3/smbd/message.c
+++ b/source3/smbd/message.c
@@ -1,3 +1,5 @@
+#define OLD_NTDOMAIN 1
+
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -217,3 +219,5 @@ int reply_sendend(connection_struct *conn,
return(outsize);
}
+
+#undef OLD_NTDOMAIN
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index e8302a43e6..60af2924b2 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -1,3 +1,5 @@
+#define OLD_NTDOMAIN 1
+
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -437,3 +439,5 @@ int reply_negprot(connection_struct *conn,
return(outsize);
}
+
+#undef OLD_NTDOMAIN
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
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 0c6927ba2a..e501d9ded8 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1,3 +1,5 @@
+#define OLD_NTDOMAIN 1
+
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -1089,3 +1091,5 @@ free_and_exit:
free((char *)old_shares);
return(ret);
}
+
+#undef OLD_NTDOMAIN
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 4a363d45e9..ef43400074 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -1,3 +1,5 @@
+#define OLD_NTDOMAIN 1
+
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -1391,3 +1393,5 @@ Disabling kernel oplock support.\n", strerror(errno) ));
}
#endif /* HAVE_KERNEL_OPLOCKS */
}
+
+#undef OLD_NTDOMAIN
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 70663f0909..325600e92e 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -1,3 +1,5 @@
+#define OLD_NTDOMAIN 1
+
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -1523,3 +1525,5 @@ BOOL domain_client_validate( char *user, char *domain,
cli_shutdown(&cli);
return True;
}
+
+#undef OLD_NTDOMAIN
diff --git a/source3/smbd/pipes.c b/source3/smbd/pipes.c
index 0cfe653d30..c1d5c261fe 100644
--- a/source3/smbd/pipes.c
+++ b/source3/smbd/pipes.c
@@ -1,3 +1,4 @@
+#define OLD_NTDOMAIN 1
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -259,3 +260,5 @@ int reply_pipe_close(connection_struct *conn, char *inbuf,char *outbuf)
return(outsize);
}
+
+#undef OLD_NTDOMAIN
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 805bbe4415..ac81116999 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1,3 +1,4 @@
+#define OLD_NTDOMAIN 1
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -1061,3 +1062,5 @@ void smbd_process(void)
process_local_message(InBuffer, BUFFER_SIZE);
}
}
+
+#undef OLD_NTDOMAIN
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 2072667174..0d099a7b4c 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -1,3 +1,4 @@
+#define OLD_NTDOMAIN 1
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -4481,3 +4482,4 @@ int reply_getattrE(connection_struct *conn, char *inbuf,char *outbuf, int size,
return(outsize);
}
+#undef OLD_NTDOMAIN
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 54c6ddc5bd..f2a3631cb1 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1,3 +1,4 @@
+#define OLD_NTDOMAIN 1
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -782,3 +783,4 @@ static void usage(char *pname)
return(0);
}
+#undef OLD_NTDOMAIN
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 0701b854b7..71d718154d 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -1,3 +1,5 @@
+#define OLD_NTDOMAIN 1
+
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -684,3 +686,5 @@ void close_cnum(connection_struct *conn, uint16 vuid)
}
conn_free(conn);
}
+
+#undef OLD_NTDOMAIN
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 458d6f3ec0..55c0b306b0 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -1,3 +1,5 @@
+#define OLD_NTDOMAIN 1
+
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -2396,3 +2398,5 @@ int reply_trans2(connection_struct *conn,
call_trans2xxx calls have already sent
it. If outsize != -1 then it is returning */
}
+
+#undef OLD_NTDOMAIN
diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index 28d2fb71f6..d749470793 100644
--- a/source3/smbd/uid.c
+++ b/source3/smbd/uid.c
@@ -1,3 +1,5 @@
+#define OLD_NTDOMAIN 1
+
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -421,3 +423,5 @@ void unbecome_root(BOOL restore_dir)
become_root_depth = 0;
}
+
+#undef OLD_NTDOMAIN