summaryrefslogtreecommitdiff
path: root/source3/lib/netapi
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2008-01-23 13:08:14 +1100
committerAndrew Tridgell <tridge@samba.org>2008-01-23 13:08:14 +1100
commit39d172bf34d0cbb3bf3e3a04d534876097cdccb5 (patch)
tree3a32fd867e34c9a86c3a2f01308445b76bf2d50c /source3/lib/netapi
parent2caa0e82f5ff2f45a5c912c624e54c4a43f0c3cc (diff)
parent9051199e40dec27d3532fbec7f5744033def1874 (diff)
downloadsamba-39d172bf34d0cbb3bf3e3a04d534876097cdccb5.tar.gz
samba-39d172bf34d0cbb3bf3e3a04d534876097cdccb5.tar.bz2
samba-39d172bf34d0cbb3bf3e3a04d534876097cdccb5.zip
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit bc2973df8504850a40cb0a1172689dc0bdafa323)
Diffstat (limited to 'source3/lib/netapi')
-rw-r--r--source3/lib/netapi/joindomain.c4
-rw-r--r--source3/lib/netapi/netapi.h11
2 files changed, 15 insertions, 0 deletions
diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index cbfc6c01e3..133aff3dd8 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -558,6 +558,7 @@ static WERROR NetGetJoinableOUsLocal(struct libnetapi_ctx *ctx,
uint32_t *ou_count,
const char ***ous)
{
+#ifdef WITH_ADS
NTSTATUS status;
ADS_STATUS ads_status;
ADS_STRUCT *ads = NULL;
@@ -608,6 +609,9 @@ static WERROR NetGetJoinableOUsLocal(struct libnetapi_ctx *ctx,
ads_destroy(&ads);
return WERR_OK;
+#else
+ return WERR_NOT_SUPPORTED;
+#endif
}
/****************************************************************
diff --git a/source3/lib/netapi/netapi.h b/source3/lib/netapi/netapi.h
index 67bb8a8fca..c2f1b488db 100644
--- a/source3/lib/netapi/netapi.h
+++ b/source3/lib/netapi/netapi.h
@@ -96,6 +96,17 @@ NET_API_STATUS NetGetJoinInformation(const char *server_name,
uint16_t *name_type);
/****************************************************************
+ NetGetJoinableOUs
+****************************************************************/
+
+NET_API_STATUS NetGetJoinableOUs(const char *server_name,
+ const char *domain,
+ const char *account,
+ const char *password,
+ uint32_t *ou_count,
+ const char ***ous);
+
+/****************************************************************
NetServerGetInfo
****************************************************************/