summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-11-14 01:04:13 +0000
committerJeremy Allison <jra@samba.org>1998-11-14 01:04:13 +0000
commit24ca89bfb03fb82e975eff94070275ee403cd0f9 (patch)
tree3a6816c1c78780a2dae2f50a84c141be1f236b91 /source3/include
parent744c34be2a053501a0fabd1c31a77e95f711f3e3 (diff)
downloadsamba-24ca89bfb03fb82e975eff94070275ee403cd0f9.tar.gz
samba-24ca89bfb03fb82e975eff94070275ee403cd0f9.tar.bz2
samba-24ca89bfb03fb82e975eff94070275ee403cd0f9.zip
Removed acconfig.h configure configure.in include/config.h.in: Made smbwrapper not made
by default. nmbd*: Changed all calls to namestr() to nmbd_namestr() to fix broken FreeBSD include file problem...sigh. Jeremy. (This used to be commit 9ee8f39aed8772a05c203161b4ae6b7d90d67481)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/config.h.in1
-rw-r--r--source3/include/proto.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/source3/include/config.h.in b/source3/include/config.h.in
index 39381e9714..3f1df1f33b 100644
--- a/source3/include/config.h.in
+++ b/source3/include/config.h.in
@@ -70,6 +70,7 @@
#undef aclent_t
#undef HAVE_CONNECT
#undef HAVE_SHORT_INO_T
+#undef WITH_SMBWRAPPER
#undef WITH_AFS
#undef WITH_DFS
#undef SUNOS5
diff --git a/source3/include/proto.h b/source3/include/proto.h
index c5029dae9e..c742d66406 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -495,7 +495,7 @@ BOOL find_master_ip(char *group, struct in_addr *master_ip);
/*The following definitions come from libsmb/nmblib.c */
void debug_nmb_packet(struct packet_struct *p);
-char *namestr(struct nmb_name *n);
+char *nmb_namestr(struct nmb_name *n);
struct packet_struct *copy_packet(struct packet_struct *packet);
void free_packet(struct packet_struct *packet);
struct packet_struct *read_packet(int fd,enum packet_type packet_type);