Commit 6adc491d authored by Stewart Brodie's avatar Stewart Brodie
Browse files

Calls LLC_Shutdown if NetBIOS's _NB_Startup is going to fail.

Detail:
  NB_Startup was failing to stop the LLC timers if the function
    was going to fail after hooking onto TickerV.  This meant that
    if LanManFS never found an appropriate driver for NetBIOS use,
    then killing the module resulted in repeated aborts when the
    TickerV handler has invoked.
Admin:
  Untested.
  Fixes Bugzilla bug #26

Version 2.13. Tagged as 'LanManFS-2_13'
parent 4fc58c21
/* (2.12)
/* (2.13)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 2.12
#define Module_MajorVersion_CMHG 2.13
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 08 Aug 2000
#define Module_MajorVersion "2.12"
#define Module_Version 212
#define Module_MajorVersion "2.13"
#define Module_Version 213
#define Module_MinorVersion ""
#define Module_Date "08 Aug 2000"
#define Module_ApplicationDate2 "08-Aug-00"
#define Module_ApplicationDate4 "08-Aug-2000"
#define Module_FullVersion "2.12"
#define Module_FullVersion "2.13"
......@@ -1283,7 +1283,10 @@ EXPORT err_t _NB_Startup(void)
res = LLC_AttachDriver(LM_Vars.drivername, &Multi_Addr);
if ( res != OK )
{
LLC_Shutdown();
return res;
}
/* Now set our machine name */
......@@ -1299,7 +1302,13 @@ EXPORT err_t _NB_Startup(void)
if ( LM_Vars.verbose )
printf(" Setting machine name to '%s'\n", LM_Vars.machinename );
return _NB_AddLocalName( ntMACHINE, LM_Vars.machinename, &NB_MachineName );
res = _NB_AddLocalName( ntMACHINE, LM_Vars.machinename, &NB_MachineName );
if (res != OK)
{
LLC_Shutdown();
}
return res;
}
/* ----------------------- */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment