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)

diff --git a/source3/include/local.h b/source3/include/local.h
index 22d1b2a08e0e0f39e78c0b082d0b15586030cfcb..97857727c7488573adf75c164e367e9b25611a12 100644 (file)
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -159,7 +159,7 @@
 /* the directory to sit in when idle */
 /* #define IDLE_DIR "/" */
 
 /* 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
    message to return. */
 
 #define OPLOCK_BREAK_TIMEOUT 30

diff --git a/source3/namedbsubnet.c b/source3/namedbsubnet.c
index 4f0b647996d1b96a5e227036ac680b578863f84b..c6663d71fd472077ad724a2a34260e5bb81bbc5b 100644 (file)
--- a/source3/namedbsubnet.c
+++ b/source3/namedbsubnet.c
@@ -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);
     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.
 
     /* Add all our server names to the workgroup list. We remove any
        browser or logon server flags from all but the primary name.

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 2a3679553c08ee725ff1a40d30dc4fa65c295540..baccb76291146b9714eb1d8bab6ca6c46b8f5c7a 100644 (file)
--- 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;
     }
 
       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;
     }
     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(UNIXERROR(ERRDOS,ERRbadpath));
   }

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index e4d433c06f9800212747a1f19f79bd036dd8180d..d387b7375bb7d200744bb8a0e4afaa6cd1ef0447 100644 (file)
--- 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));
   {
     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 \
   }
 
   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 7f46604cce9dcade4c038b0e0367a2d0425ba967..092a069a6e33b4a66d7d5fe24c3c453466df293c 100644 (file)
--- 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;
     }
 
       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;
     }
     if((errno == ENOTDIR) && (Protocol >= PROTOCOL_NT1) && 
        (get_remote_arch() == RA_WINNT))
     {
       unix_ERR_class = ERRDOS;
       unix_ERR_code = ERRbaddirectory;
     }

+#endif 

 
     return(ERROR(ERRDOS,ERRbadpath));
   }
 
     return(ERROR(ERRDOS,ERRbadpath));
   }


@@ -651,13 +653,16 @@ static int call_trans2findfirst(char *inbuf, char *outbuf, int bufsize, int cnum
           unix_ERR_code = ERRbadpath;
         }
 
           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;
         }
         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));
         return (UNIXERROR(ERRDOS,ERRbadpath));
       }
       return(ERROR(ERRDOS,ERRbadpath));