diff options
| author | Jeremy Allison <jra@samba.org> | 1998-06-29 22:50:49 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-06-29 22:50:49 +0000 |
| commit | 4ab3d1682789319965a55edb37212b7671a743bb (patch) | |
| tree | fe8317ae6ed3abd88ed532e213a865a503879c3e /source/nmbd/nmbd_subnetdb.c | |
| parent | a38d903d2016202d470f1405e593be3c20404d72 (diff) | |
| download | samba-4ab3d1682789319965a55edb37212b7671a743bb.tar.gz samba-4ab3d1682789319965a55edb37212b7671a743bb.tar.xz samba-4ab3d1682789319965a55edb37212b7671a743bb.zip | |
nmbd_elections.c: Removed force elections code to bring into line with 1.9.18.
nmbd_namelistdb.c: Added comment for Chris.
nmbd_subnetdb.c: Went back to Chris's comparison code as with the make_nmb_name
change it all works now.
lib/rpc/server/srv_netlog.c: Ensure we return 'account disabled' for disabled
accounts, rather than crashing.
Jeremy.
Diffstat (limited to 'source/nmbd/nmbd_subnetdb.c')
| -rw-r--r-- | source/nmbd/nmbd_subnetdb.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/source/nmbd/nmbd_subnetdb.c b/source/nmbd/nmbd_subnetdb.c index 40ae1db1b35..36a3ee9a27c 100644 --- a/source/nmbd/nmbd_subnetdb.c +++ b/source/nmbd/nmbd_subnetdb.c @@ -74,6 +74,7 @@ static void add_subnet(struct subnet_record *subrec) } /* CRH!!! */ +#if 0 /* ************************************************************************** ** * This will go away when we move to a "real" database back-end. Note that we cannot use memcmp here as we have no control over how the struct nmb_name structures are packed in memory. JRA. @@ -97,6 +98,24 @@ int namelist_entry_compare( ubi_trItemPtr Item, ubi_trNodePtr Node ) return nmbname->name_type - NR->name.name_type; } /* namelist_entry_compare */ +#else +/* ************************************************************************** ** + * This will go away when we move to a "real" database back-end. + * ************************************************************************** ** + */ +int namelist_entry_compare( ubi_trItemPtr Item, ubi_trNodePtr Node ) + { + struct name_record *NR = (struct name_record *)Node; + + struct nmb_name *Iname = (struct nmb_name *)Item; + DEBUG(10, ("namelist_entry_compare: %d == memcmp( \"%s\", \"%s\", %d )\n", + memcmp( Item, &(NR->name), sizeof(struct nmb_name) ), + namestr(Iname), namestr(&NR->name), sizeof(struct nmb_name)) ); + + return( memcmp( Item, &(NR->name), sizeof(struct nmb_name) ) ); + } /* namelist_entry_compare */ + +#endif /* CRH!!! */ /**************************************************************************** |