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.c5
-rw-r--r--source3/smbd/files.c2
-rw-r--r--source3/smbd/ipc.c2
-rw-r--r--source3/smbd/lanman.c4
-rw-r--r--source3/smbd/message.c4
-rw-r--r--source3/smbd/negprot.c4
-rw-r--r--source3/smbd/notify.c4
-rw-r--r--source3/smbd/notify_hash.c3
-rw-r--r--source3/smbd/notify_kernel.c3
-rw-r--r--source3/smbd/nttrans.c2
-rw-r--r--source3/smbd/open.c4
-rw-r--r--source3/smbd/oplock.c6
-rw-r--r--source3/smbd/oplock_irix.c6
-rw-r--r--source3/smbd/oplock_linux.c5
-rw-r--r--source3/smbd/password.c4
-rw-r--r--source3/smbd/pipes.c3
-rw-r--r--source3/smbd/posix_acls.c2
-rw-r--r--source3/smbd/process.c3
-rw-r--r--source3/smbd/reply.c2
-rw-r--r--source3/smbd/sec_ctx.c2
-rw-r--r--source3/smbd/server.c9
-rw-r--r--source3/smbd/service.c4
-rw-r--r--source3/smbd/trans2.c4
-rw-r--r--source3/smbd/uid.c4
-rw-r--r--source3/smbd/vfs-wrap.c3
-rw-r--r--source3/smbd/vfs.c2
34 files changed, 1 insertions, 125 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 16caf8b52e..e8dc29f80a 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -1,5 +1,3 @@
-#define OLD_NTDOMAIN 1
-
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -633,5 +631,3 @@ 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 ba68557fdf..418ad6a675 100644
--- a/source3/smbd/chgpasswd.c
+++ b/source3/smbd/chgpasswd.c
@@ -1,5 +1,3 @@
-#define OLD_NTDOMAIN 1
-
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -937,5 +935,3 @@ 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 87bd313327..56aad64391 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -1,5 +1,3 @@
-#define OLD_NTDOMAIN 1
-
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -243,5 +241,3 @@ 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 cd4ca9ded4..e9f79fdf32 100644
--- a/source3/smbd/conn.c
+++ b/source3/smbd/conn.c
@@ -1,5 +1,3 @@
-#define OLD_NTDOMAIN 1
-
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -200,5 +198,3 @@ 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 a7e05c5682..5bf0dec944 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -1,5 +1,3 @@
-#define OLD_NTDOMAIN 1
-
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -893,5 +891,3 @@ 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 a4b4f65ad9..8b2c482b0a 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -1,5 +1,3 @@
-#define OLD_NTDOMAIN 1
-
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -334,5 +332,3 @@ 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 49da44d68e..d879f9a93c 100644
--- a/source3/smbd/error.c
+++ b/source3/smbd/error.c
@@ -1,5 +1,3 @@
-#define OLD_NTDOMAIN 1
-
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -146,5 +144,3 @@ 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 35e2f1455e..c79f0aa89e 100644
--- a/source3/smbd/fileio.c
+++ b/source3/smbd/fileio.c
@@ -1,4 +1,3 @@
-#define OLD_NTDOMAIN 1
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -584,4 +583,3 @@ void sync_file(connection_struct *conn, files_struct *fsp)
conn->vfs_ops.fsync(fsp,fsp->fd);
}
}
-#undef OLD_NTDOMAIN
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index aedd2e820f..bdbcd81b64 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -1,5 +1,3 @@
-#define OLD_NTDOMAIN 1
-
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -514,6 +512,3 @@ static BOOL scan_directory(char *path, char *name,connection_struct *conn,BOOL d
CloseDir(cur_dir);
return(False);
}
-
-
-#undef OLD_NTDOMAIN
diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 2909d49a2a..a4837a1a8b 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -1,4 +1,3 @@
-#define OLD_NTDOMAIN 1
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -364,4 +363,3 @@ 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 5ade667209..3b9e34b4d7 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -1,4 +1,3 @@
-#define OLD_NTDOMAIN 1
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -517,4 +516,3 @@ int reply_trans(connection_struct *conn, char *inbuf,char *outbuf, int size, int
END_PROFILE(SMBtrans);
return(outsize);
}
-#undef OLD_NTDOMAIN
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index c29f0df434..f5e1de1608 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -1,4 +1,3 @@
-#define OLD_NTDOMAIN 1
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -3330,6 +3329,3 @@ 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 ab3c841d9c..3afe7218e0 100644
--- a/source3/smbd/message.c
+++ b/source3/smbd/message.c
@@ -1,5 +1,3 @@
-#define OLD_NTDOMAIN 1
-
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -235,5 +233,3 @@ int reply_sendend(connection_struct *conn,
END_PROFILE(SMBsendend);
return(outsize);
}
-
-#undef OLD_NTDOMAIN
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index c2026f46f9..e15af3f3ae 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -1,5 +1,3 @@
-#define OLD_NTDOMAIN 1
-
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -448,5 +446,3 @@ int reply_negprot(connection_struct *conn,
END_PROFILE(SMBnegprot);
return(outsize);
}
-
-#undef OLD_NTDOMAIN
diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index 912ab43e9e..429723c19e 100644
--- a/source3/smbd/notify.c
+++ b/source3/smbd/notify.c
@@ -1,4 +1,3 @@
-#define OLD_NTDOMAIN 1
/*
Unix SMB/Netbios implementation.
Version 3.0
@@ -224,6 +223,3 @@ BOOL init_change_notify(void)
return True;
}
-
-
-#undef OLD_NTDOMAIN
diff --git a/source3/smbd/notify_hash.c b/source3/smbd/notify_hash.c
index 5a2f865310..a0a61569a8 100644
--- a/source3/smbd/notify_hash.c
+++ b/source3/smbd/notify_hash.c
@@ -1,4 +1,3 @@
-#define OLD_NTDOMAIN 1
/*
Unix SMB/Netbios implementation.
Version 3.0
@@ -195,5 +194,3 @@ struct cnotify_fns *hash_notify_init(void)
uint16 vuid = (lp_security() == SEC_SHARE) ? UID_FIELD_INVALID :
SVAL(cnbp->request_buf,smb_uid);
*/
-
-#undef OLD_NTDOMAIN
diff --git a/source3/smbd/notify_kernel.c b/source3/smbd/notify_kernel.c
index db823601f1..243a16a7f7 100644
--- a/source3/smbd/notify_kernel.c
+++ b/source3/smbd/notify_kernel.c
@@ -1,4 +1,3 @@
-#define OLD_NTDOMAIN 1
/*
Unix SMB/Netbios implementation.
Version 3.0
@@ -207,5 +206,3 @@ struct cnotify_fns *kernel_notify_init(void)
#else
void notify_kernel_dummy(void) {}
#endif /* HAVE_KERNEL_CHANGE_NOTIFY */
-
-#undef OLD_NTDOMAIN
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index d9a93f8d78..1ccac83b78 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -1,4 +1,3 @@
-#define OLD_NTDOMAIN 1
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -1974,4 +1973,3 @@ 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 3665e7d20f..afcaeff1ae 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1,5 +1,3 @@
-#define OLD_NTDOMAIN 1
-
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -1158,5 +1156,3 @@ 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 4f26eaf7f2..e0b494017a 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -1,5 +1,3 @@
-#define OLD_NTDOMAIN 1
-
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -978,7 +976,6 @@ should be %d\n", (int)pid, share_entry->op_port, global_oplock_port));
while(time_left >= 0)
{
char op_break_reply[OPBRK_CMD_HEADER_LEN+OPLOCK_BREAK_MSG_LEN];
- int32 reply_msg_len;
uint16 reply_from_port;
char *reply_msg_start;
fd_set fds;
@@ -1029,7 +1026,6 @@ should be %d\n", (int)pid, share_entry->op_port, global_oplock_port));
return False;
}
- reply_msg_len = IVAL(op_break_reply,OPBRK_CMD_LEN_OFFSET);
reply_from_port = SVAL(op_break_reply,OPBRK_CMD_PORT_OFFSET);
reply_msg_start = &op_break_reply[OPBRK_CMD_HEADER_LEN];
@@ -1234,5 +1230,3 @@ address %lx. Error was %s\n", (long)htonl(INADDR_LOOPBACK), strerror(errno)));
return True;
}
-
-#undef OLD_NTDOMAIN
diff --git a/source3/smbd/oplock_irix.c b/source3/smbd/oplock_irix.c
index cf1cbbb0fc..faf7e8e3c8 100644
--- a/source3/smbd/oplock_irix.c
+++ b/source3/smbd/oplock_irix.c
@@ -1,6 +1,4 @@
-#define OLD_NTDOMAIN 1
-
-/*
+/*
Unix SMB/Netbios implementation.
Version 2.x
IRIX kernel oplock processing
@@ -278,5 +276,3 @@ struct kernel_oplocks *irix_init_kernel_oplocks(void)
#else
void oplock_irix_dummy(void) {}
#endif /* HAVE_KERNEL_OPLOCKS_IRIX */
-
-#undef OLD_NTDOMAIN
diff --git a/source3/smbd/oplock_linux.c b/source3/smbd/oplock_linux.c
index d97378ac5d..e070761f10 100644
--- a/source3/smbd/oplock_linux.c
+++ b/source3/smbd/oplock_linux.c
@@ -1,5 +1,3 @@
-#define OLD_NTDOMAIN 1
-
/*
Unix SMB/Netbios implementation.
Version 3.0
@@ -302,6 +300,3 @@ struct kernel_oplocks *linux_init_kernel_oplocks(void)
#else
void oplock_linux_dummy(void) {}
#endif /* HAVE_KERNEL_OPLOCKS_LINUX */
-
-#undef OLD_NTDOMAIN
-
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 311a019506..849aa87a75 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -1,5 +1,3 @@
-#define OLD_NTDOMAIN 1
-
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -1610,5 +1608,3 @@ 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 df7141764c..366707cd58 100644
--- a/source3/smbd/pipes.c
+++ b/source3/smbd/pipes.c
@@ -1,4 +1,3 @@
-#define OLD_NTDOMAIN 1
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -262,5 +261,3 @@ int reply_pipe_close(connection_struct *conn, char *inbuf,char *outbuf)
return(outsize);
}
-
-#undef OLD_NTDOMAIN
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 9c5afad9c1..fe2974b235 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -1,4 +1,3 @@
-#define OLD_NTDOMAIN 1
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -1700,4 +1699,3 @@ int fchmod_acl(int fd, mode_t mode)
sys_acl_free_acl(posix_acl);
return ret;
}
-#undef OLD_NTDOMAIN
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index f8fde41b77..a34555adc1 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1,4 +1,3 @@
-#define OLD_NTDOMAIN 1
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -1256,5 +1255,3 @@ void smbd_process(void)
}
}
}
-
-#undef OLD_NTDOMAIN
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index a505160b7d..04e7b4c101 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -1,4 +1,3 @@
-#define OLD_NTDOMAIN 1
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -4840,4 +4839,3 @@ int reply_getattrE(connection_struct *conn, char *inbuf,char *outbuf, int size,
END_PROFILE(SMBgetattrE);
return(outsize);
}
-#undef OLD_NTDOMAIN
diff --git a/source3/smbd/sec_ctx.c b/source3/smbd/sec_ctx.c
index f3cc9e04e0..f604f6cce7 100644
--- a/source3/smbd/sec_ctx.c
+++ b/source3/smbd/sec_ctx.c
@@ -1,4 +1,3 @@
-#define OLD_NTDOMAIN 1
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -459,4 +458,3 @@ void init_sec_ctx(void)
current_user.vuid = UID_FIELD_INVALID;
current_user.nt_user_token = NULL;
}
-#undef OLD_NTDOMAIN
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 6457dd6295..d2a7ad3be4 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1,4 +1,3 @@
-#define OLD_NTDOMAIN 1
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -502,12 +501,6 @@ static void init_structs(void )
/* for RPC pipes */
init_rpc_pipe_hnd();
- /* for LSA handles */
- init_lsa_policy_hnd();
-
- /* for SPOOLSS handles */
- init_printer_hnd();
-
init_dptrs();
secrets_init();
@@ -804,5 +797,3 @@ static void usage(char *pname)
exit_server("normal exit");
return(0);
}
-
-#undef OLD_NTDOMAIN
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index f0ab2ba771..02405e8dda 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -1,5 +1,3 @@
-#define OLD_NTDOMAIN 1
-
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -681,5 +679,3 @@ 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 d94a775846..6cc65d1b21 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -1,5 +1,3 @@
-#define OLD_NTDOMAIN 1
-
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -2511,5 +2509,3 @@ 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 db43106b77..3d37021fff 100644
--- a/source3/smbd/uid.c
+++ b/source3/smbd/uid.c
@@ -1,5 +1,3 @@
-#define OLD_NTDOMAIN 1
-
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -521,5 +519,3 @@ BOOL sid_to_gid(DOM_SID *psid, gid_t *pgid, enum SID_NAME_USE *sidtype)
return True;
}
-
-#undef OLD_NTDOMAIN
diff --git a/source3/smbd/vfs-wrap.c b/source3/smbd/vfs-wrap.c
index ad4d4ddbef..8750f71151 100644
--- a/source3/smbd/vfs-wrap.c
+++ b/source3/smbd/vfs-wrap.c
@@ -1,4 +1,3 @@
-#define OLD_NTDOMAIN 1
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -543,5 +542,3 @@ int vfswrap_fchmod_acl(files_struct *fsp, int fd, mode_t mode)
{
return fchmod_acl(fd, mode);
}
-
-#undef OLD_NTDOMAIN
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 2cd83c37f3..b8aa290cab 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -1,4 +1,3 @@
-#define OLD_NTDOMAIN 1
/*
Unix SMB/Netbios implementation.
Version 1.9.
@@ -895,4 +894,3 @@ BOOL reduce_name(connection_struct *conn, char *s,char *dir,BOOL widelinks)
return(True);
#endif
}
-#undef OLD_NTDOMAIN