sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

local.h: Fix spelling mistake :-).

Browse Source 
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 commit is contained in:
Jeremy Allison -
parent 7bc4c4c27b
commit 7624722889
5 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/include/local.h
View File

@ -159,7 +159,7 @@
/* the directory to sit in when idle */
/* #define IDLE_DIR "/" */
/* Timout (in seconds) to wait for an oplock breal
/* Timout (in seconds) to wait for an oplock break
message to return. */
#define OPLOCK_BREAK_TIMEOUT 30

6
source/namedbsubnet.c
View File

@ -218,7 +218,11 @@ void add_workgroup_to_subnet( struct subnet_record *d, char *group)
int n;
add_my_name_entry(d,group,0x0 ,nb_type|NB_ACTIVE|NB_GROUP);
add_my_name_entry(d,group,0x1e,nb_type|NB_ACTIVE|NB_GROUP);
/* Only register the WORKGROUP<0x1e> name if we could be a local master
browser. */
if(lp_local_master())
add_my_name_entry(d,group,0x1e,nb_type|NB_ACTIVE|NB_GROUP);
/* Add all our server names to the workgroup list. We remove any
browser or logon server flags from all but the primary name.

4
source/smbd/reply.c
View File

@ -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));
}

2
source/smbd/server.c
View File

@ -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 \

9
source/smbd/trans2.c
View File

@ -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));