summaryrefslogtreecommitdiff
path: root/source4/libnet/libnet_join.h
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-05-16 22:55:29 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-05-18 16:12:08 +0200
commitc6cc22adc059aeb6de50305b8a40d513d8f05bbc (patch)
treeb7d03da48987b9af6060f6f35fb069a3d25d7578 /source4/libnet/libnet_join.h
parentc47b078ec339343732da21212e04a5b7cf548e8c (diff)
downloadsamba-c6cc22adc059aeb6de50305b8a40d513d8f05bbc.tar.gz
s4-libnet: Remove libnet_Join and create libnet_Join_member
libnet_Join conflicts with a function in the source3 netapi of the same name, and the ability to join as a DC via this particular method is unused. Andrew Bartlett
Diffstat (limited to 'source4/libnet/libnet_join.h')
-rw-r--r--source4/libnet/libnet_join.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/source4/libnet/libnet_join.h b/source4/libnet/libnet_join.h
index 79884130d8a..6acf374b383 100644
--- a/source4/libnet/libnet_join.h
+++ b/source4/libnet/libnet_join.h
@@ -63,11 +63,10 @@ struct libnet_JoinDomain {
} out;
};
-struct libnet_Join {
+struct libnet_Join_member {
struct {
const char *domain_name;
const char *netbios_name;
- enum netr_SchannelType join_type;
enum libnet_Join_level level;
} in;