[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1500-g645f237

Günther Deschner gd at samba.org
Fri Jan 18 07:51:37 GMT 2008


The branch, v3-2-test has been updated
       via  645f2376d40fabdc787902ac7506ad7234616619 (commit)
       via  f297ea259d58f7a12924b7111ab79818188cff46 (commit)
      from  8c89d60924b0380231da834cd3c097b4f8cdc369 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 645f2376d40fabdc787902ac7506ad7234616619
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jan 18 08:48:44 2008 +0100

    Fix the build w/o ADS.
    
    Guenther

commit f297ea259d58f7a12924b7111ab79818188cff46
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jan 18 03:14:08 2008 +0100

    Add header for NetGetJoinableOUs to libnetapi.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source/lib/netapi/joindomain.c |    4 ++++
 source/lib/netapi/netapi.h     |   11 +++++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/netapi/joindomain.c b/source/lib/netapi/joindomain.c
index cbfc6c0..133aff3 100644
--- a/source/lib/netapi/joindomain.c
+++ b/source/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/source/lib/netapi/netapi.h b/source/lib/netapi/netapi.h
index 67bb8a8..c2f1b48 100644
--- a/source/lib/netapi/netapi.h
+++ b/source/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
 ****************************************************************/
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list