summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorSamba Release Account <samba-bugs@samba.org>1997-07-30 19:17:51 +0000
committerSamba Release Account <samba-bugs@samba.org>1997-07-30 19:17:51 +0000
commit75bbf35a8626ea30ac31546d0ceb9e2801ab7eae (patch)
tree536fbc1c6e99b6ca27dd95b85b58bc9b47297140 /source3/include
parent01d19fd31dcb2e728ce2c5289f13a03319f6f502 (diff)
downloadsamba-75bbf35a8626ea30ac31546d0ceb9e2801ab7eae.tar.gz
samba-75bbf35a8626ea30ac31546d0ceb9e2801ab7eae.tar.bz2
samba-75bbf35a8626ea30ac31546d0ceb9e2801ab7eae.zip
client.c: Minor change to cast parameters for DEC unix.
clientutil.c: Minor change to cast parameters for DEC unix. ipc.c: Fixes to parameterise the stuff John wants. loadparm.c: Fixes to parameterise the stuff John wants. nameannounce.c: Fixes to parameterise the stuff John wants. namedbwork.c: Fixes to parameterise the stuff John wants. nameserv.h: Fixes to parameterise the stuff John wants. proto.h: Fixes to parameterise the stuff John wants. smb.h: Fixes to parameterise the stuff John wants. util.c: tidy. Jeremy (jallison@whistle.com) (This used to be commit 9fbca2594ba775450d5dca13cbce257b4362ca66)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/nameserv.h9
-rw-r--r--source3/include/proto.h3
-rw-r--r--source3/include/smb.h4
3 files changed, 9 insertions, 7 deletions
diff --git a/source3/include/nameserv.h b/source3/include/nameserv.h
index 8482fa8d2c..83f3a3c524 100644
--- a/source3/include/nameserv.h
+++ b/source3/include/nameserv.h
@@ -408,11 +408,10 @@ struct packet_struct
/* do all remote announcements this often */
#define REMOTE_ANNOUNCE_INTERVAL 180
-#define DFLT_SERVER_TYPE (SV_TYPE_WORKSTATION | SV_TYPE_SERVER | \
- (lp_time_server() ? SV_TYPE_TIME_SOURCE : 0) | \
- SV_TYPE_SERVER_UNIX | \
- SV_TYPE_PRINTQ_SERVER | SV_TYPE_SERVER_NT | \
- SV_TYPE_NT )
+/* Types of machine we can announce as */
+#define ANNOUNCE_AS_NT 1
+#define ANNOUNCE_AS_WIN95 2
+#define ANNOUNCE_AS_WFW 3
/* Macro's to enumerate subnets either with or without
the WINS subnet. */
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 4b7b48f50b..23f7f191fb 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -267,6 +267,9 @@ BOOL lp_load(char *pszFname,BOOL global_only);
int lp_numservices(void);
void lp_dump(void);
int lp_servicenumber(char *pszServiceName);
+int lp_default_server_announce(void);
+int lp_major_announce_version(void);
+int lp_minor_announce_version(void);
char *volume_label(int snum);
/*The following definitions come from locking.c */
diff --git a/source3/include/smb.h b/source3/include/smb.h
index c7ff549fe5..2b6888b8a7 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -844,8 +844,8 @@ char *Strstr(char *s, char *p);
/* - Reappeared in 1.9.16p11 with fixed smbd services */
/* Version 4.20 - To indicate that nmbd and browsing now works better */
-#define MAJOR_VERSION 0x04
-#define MINOR_VERSION 0x02
+#define DEFAULT_MAJOR_VERSION 0x04
+#define DEFAULT_MINOR_VERSION 0x02
/* Browser Election Values */
#define BROWSER_ELECTION_VERSION 0x010f