summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2000-03-22 19:03:12 +0000
committerJeremy Allison <jra@samba.org>2000-03-22 19:03:12 +0000
commit8f1620125dcb9c29c223f4efb6485528ece70f11 (patch)
tree358b480ac6e0f7e80aace7701c7e2399dacb9d4b /source3/include
parentc90a455f32ef8ab6eec6aaeb1fffeb00ce67fa2e (diff)
downloadsamba-8f1620125dcb9c29c223f4efb6485528ece70f11.tar.gz
samba-8f1620125dcb9c29c223f4efb6485528ece70f11.tar.bz2
samba-8f1620125dcb9c29c223f4efb6485528ece70f11.zip
acconfig.h configure configure.in: Added check for UT_SYSLEN for utmp code.
include/byteorder.h: Added alignment macros. include/nameserv.h: Added defines for msg_type field options - from rfc1002. lib/time.c: Typo fix. lib/util_unistr.c: Updates from UNICODE branch. printing/nt_printing.c: bzero -> memset. smbd/connection.c: Added check for UT_SYSLEN for utmp code. Other fixes : Rollback of unapproved commit from Luke. Please *ask* next time before doing large changes to HEAD. Jeremy. (This used to be commit f02999dbf7971b4ea05050d7206205d7737a78b2)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/byteorder.h4
-rw-r--r--source3/include/config.h.in1
-rw-r--r--source3/include/nameserv.h9
3 files changed, 14 insertions, 0 deletions
diff --git a/source3/include/byteorder.h b/source3/include/byteorder.h
index 59ae4979fd..b376a8964c 100644
--- a/source3/include/byteorder.h
+++ b/source3/include/byteorder.h
@@ -262,4 +262,8 @@ it also defines lots of intermediate macros, just ignore those :-)
DEBUG(5,("%s%04x %s: %08x\n", \
tab_depth(depth), base, string, outbuf)); }
+/* Alignment macros. */
+#define ALIGN4(p,base) ((4 - (PTR_DIFF((q), (base)) % 4)) & ~3)
+#define ALIGN2(p,base) ((2 - (PTR_DIFF((q), (base)) % 2)) & ~1)
+
#endif /* _BYTEORDER_H */
diff --git a/source3/include/config.h.in b/source3/include/config.h.in
index d4d5a8c213..69f586be9c 100644
--- a/source3/include/config.h.in
+++ b/source3/include/config.h.in
@@ -184,6 +184,7 @@
#undef HAVE_LIBDL
#undef NEED_SGI_SEMUN_HACK
#undef SYSCONF_SC_NGROUPS_MAX
+#undef HAVE_UX_UT_SYSLEN
/* The number of bytes in a int. */
#undef SIZEOF_INT
diff --git a/source3/include/nameserv.h b/source3/include/nameserv.h
index 3473c74a56..d9f830e0b3 100644
--- a/source3/include/nameserv.h
+++ b/source3/include/nameserv.h
@@ -453,6 +453,15 @@ struct nmb_packet
struct res_rec *additional;
};
+/* msg_type field options - from rfc1002. */
+
+#define DGRAM_UNIQUE 0x10
+#define DGRAM_GROUP 0x11
+#define DGRAM_BROADCAST 0x12
+#define DGRAM_ERROR 0x13
+#define DGRAM_QUERY_REQUEST 0x14
+#define DGRAM_POSITIVE_QUERY_RESPONSE 0x15
+#define DGRAM_NEGATIVE_QUERT_RESPONSE 0x16
/* A datagram - this normally contains SMB data in the data[] array. */