summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-12-06 23:06:38 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:05:45 -0500
commit83b987befdbba857131102700d237728784b6f69 (patch)
treee2256666211d54b6781c1e48ab1ba95ad1b788c3 /source3/include
parent436b3dd88a703c4f79c638d76cb0219fc8870bda (diff)
downloadsamba-83b987befdbba857131102700d237728784b6f69.tar.gz
samba-83b987befdbba857131102700d237728784b6f69.tar.bz2
samba-83b987befdbba857131102700d237728784b6f69.zip
r12107: Move to a tdb-based wins database. At the moment we still
use it as though it were an in-memory db and dump out to a flat file every 2 mins, but that can now change. Jeremy. (This used to be commit a342681792724c1ae8561ba8d352c4ee6e2a5332)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/includes.h6
-rw-r--r--source3/include/nameserv.h6
-rw-r--r--source3/include/smb.h7
3 files changed, 5 insertions, 14 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index cde199eed8..80fc3feed9 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -863,8 +863,6 @@ extern int errno;
/* Lists, trees, caching, database... */
#include "xfile.h"
#include "intl.h"
-#include "ubi_sLinkList.h"
-#include "ubi_dLinkList.h"
#include "dlinklist.h"
#include "tdb/tdb.h"
#include "tdb/spinlock.h"
@@ -887,10 +885,6 @@ extern int errno;
#include "util_getent.h"
-#ifndef UBI_BINTREE_H
-#include "ubi_Cache.h"
-#endif /* UBI_BINTREE_H */
-
#include "debugparse.h"
#include "version.h"
diff --git a/source3/include/nameserv.h b/source3/include/nameserv.h
index ec3d56c06b..9f6bf76a09 100644
--- a/source3/include/nameserv.h
+++ b/source3/include/nameserv.h
@@ -217,7 +217,7 @@ struct nmb_data {
/* This structure represents an entry in a local netbios name list. */
struct name_record {
- ubi_trNode node[1];
+ struct name_record *prev, *next;
struct subnet_record *subnet;
struct nmb_name name; /* The netbios name. */
struct nmb_data data; /* The netbios data. */
@@ -225,7 +225,7 @@ struct name_record {
/* Browser cache for synchronising browse lists. */
struct browse_cache_record {
- ubi_dlNode node[1];
+ struct browse_cache_record *prev, *next;
unstring lmb_name;
unstring work_group;
struct in_addr ip;
@@ -425,7 +425,7 @@ struct subnet_record {
enum subnet_type type; /* To catagorize the subnet. */
struct work_record *workgrouplist; /* List of workgroups. */
- ubi_trRoot namelist[1]; /* List of netbios names. */
+ struct name_record *namelist; /* List of netbios names. */
struct response_record *responselist; /* List of responses expected. */
BOOL namelist_changed;
diff --git a/source3/include/smb.h b/source3/include/smb.h
index b2d28b7d70..a3dce53a4c 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1530,17 +1530,14 @@ struct node_status_extra {
/* There really is more here ... */
};
-struct pwd_info
-{
+struct pwd_info {
BOOL null_pwd;
BOOL cleartext;
fstring password;
-
};
-typedef struct user_struct
-{
+typedef struct user_struct {
struct user_struct *next, *prev;
uint16 vuid; /* Tag for this entry. */
uid_t uid; /* uid of a validated user */