summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1997-10-09 18:40:52 +0000
committerJeremy Allison <jra@samba.org>1997-10-09 18:40:52 +0000
commitf3f44f7dbbc360733da329ef55bb0353ae0a8443 (patch)
tree2fc6f49a9d9897b087fe80bfcebfbd997b857a74 /source3/smbd
parent3dd03e4bb7af903eae162648bbf51da04fa68200 (diff)
downloadsamba-f3f44f7dbbc360733da329ef55bb0353ae0a8443.tar.gz
samba-f3f44f7dbbc360733da329ef55bb0353ae0a8443.tar.bz2
samba-f3f44f7dbbc360733da329ef55bb0353ae0a8443.zip
local.h: Fix spelling mistake :-).
namedbsubnet.c: Stop registering 1x name unless we can be a local master. reply.c: Remove ERRbaddirectory code. server.c: Remove abort() - use exit_server() instead. trans2.c: Remove ERRbaddirectory code. Jeremy (jallison@whistle.com) (This used to be commit 76247228896d39312ba896fa229076be3271e2e4)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/reply.c4
-rw-r--r--source3/smbd/server.c2
-rw-r--r--source3/smbd/trans2.c9
3 files changed, 11 insertions, 4 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 2a3679553c..baccb76291 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -641,13 +641,15 @@ int reply_chkpth(char *inbuf,char *outbuf)
unix_ERR_code = ERRbadpath;
}
- /* Ugly - NT specific hack - but needed (JRA) */
+#if 0
+ /* Ugly - NT specific hack - maybe not needed ? (JRA) */
if((errno == ENOTDIR) && (Protocol >= PROTOCOL_NT1) &&
(get_remote_arch() == RA_WINNT))
{
unix_ERR_class = ERRDOS;
unix_ERR_code = ERRbaddirectory;
}
+#endif
return(UNIXERROR(ERRDOS,ERRbadpath));
}
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index e4d433c06f..d387b7375b 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -2774,7 +2774,7 @@ inode = %x).\n", fsp->name, fnum, dev, inode));
{
DEBUG(0,("oplock_break: global_oplocks_open < 0 (%d). PANIC ERROR\n",
global_oplocks_open));
- abort();
+ exit_server("oplock_break: global_oplocks_open < 0");
}
DEBUG(5,("oplock_break: returning success for fnum = %d, dev = %x, inode = %x. Current \
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 7f46604cce..092a069a6e 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -608,13 +608,15 @@ static int call_trans2findfirst(char *inbuf, char *outbuf, int bufsize, int cnum
unix_ERR_code = ERRbadpath;
}
- /* Ugly - NT specific hack - but needed (JRA) */
+#if 0
+ /* Ugly - NT specific hack - maybe not needed ? (JRA) */
if((errno == ENOTDIR) && (Protocol >= PROTOCOL_NT1) &&
(get_remote_arch() == RA_WINNT))
{
unix_ERR_class = ERRDOS;
unix_ERR_code = ERRbaddirectory;
}
+#endif
return(ERROR(ERRDOS,ERRbadpath));
}
@@ -651,13 +653,16 @@ static int call_trans2findfirst(char *inbuf, char *outbuf, int bufsize, int cnum
unix_ERR_code = ERRbadpath;
}
- /* Ugly - NT specific hack - but needed (JRA) */
+#if 0
+ /* Ugly - NT specific hack - maybe not needed ? (JRA) */
if((errno == ENOTDIR) && (Protocol >= PROTOCOL_NT1) &&
(get_remote_arch() == RA_WINNT))
{
unix_ERR_class = ERRDOS;
unix_ERR_code = ERRbaddirectory;
}
+#endif
+
return (UNIXERROR(ERRDOS,ERRbadpath));
}
return(ERROR(ERRDOS,ERRbadpath));