[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1283-g9f4506e

Günther Deschner gd at samba.org
Sat Jan 12 00:36:42 GMT 2008


The branch, v3-2-test has been updated
       via  9f4506e5e2828e0f23bc37586770995c3424b208 (commit)
       via  93084487952f4ef23209401d689b3be3af6c9e6e (commit)
       via  82bd6322b691506ddea2b274973e614fa8c6ee5e (commit)
      from  c6609c042b128e7d63eb64cfdfb0f6b65cb59d76 (commit)

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


- Log -----------------------------------------------------------------
commit 9f4506e5e2828e0f23bc37586770995c3424b208
Author: Günther Deschner <gd at samba.org>
Date:   Sat Jan 12 01:28:20 2008 +0100

    Auto-add missing shares in libnet_conf_set_parameter().
    Michael, please have a look.
    
    Guenther

commit 93084487952f4ef23209401d689b3be3af6c9e6e
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jan 11 18:51:15 2008 +0100

    Add debug bool flag for libnetjoin ctx.
    
    Guenther

commit 82bd6322b691506ddea2b274973e614fa8c6ee5e
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jan 11 18:49:20 2008 +0100

    Use domain_is_ad one more time in libnetjoin.
    
    Guenther

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

Summary of changes:
 source/libnet/libnet_conf.c |    6 ++++--
 source/libnet/libnet_join.c |    5 ++---
 source/libnet/libnet_join.h |    1 +
 3 files changed, 7 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libnet/libnet_conf.c b/source/libnet/libnet_conf.c
index 0bdf480..47b4800 100644
--- a/source/libnet/libnet_conf.c
+++ b/source/libnet/libnet_conf.c
@@ -719,8 +719,10 @@ WERROR libnet_conf_set_parameter(const char *service,
 	TALLOC_CTX *mem_ctx = talloc_stackframe();
 
 	if (!libnet_conf_share_exists(service)) {
-		werr = WERR_NO_SUCH_SERVICE;
-		goto done;
+		werr = libnet_conf_create_share(service);
+		if (!W_ERROR_IS_OK(werr)) {
+			goto done;
+		}
 	}
 
 	werr = libnet_conf_reg_open_service_key(mem_ctx, service, REG_KEY_WRITE,
diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c
index 1df85eb..ea92059 100644
--- a/source/libnet/libnet_join.c
+++ b/source/libnet/libnet_join.c
@@ -678,14 +678,13 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
 	memcpy(&pwbuf[516], md5buffer, sizeof(md5buffer));
 
 	acb_info |= ACB_PWNOEXP;
-#if 0
-	if ( dom_type == ND_TYPE_AD ) {
+	if (r->out.domain_is_ad) {
 #if !defined(ENCTYPE_ARCFOUR_HMAC)
 		acb_info |= ACB_USE_DES_KEY_ONLY;
 #endif
 		;;
 	}
-#endif
+
 	ZERO_STRUCT(ctr);
 	ZERO_STRUCT(p25);
 
diff --git a/source/libnet/libnet_join.h b/source/libnet/libnet_join.h
index 95b9657..c47e8d9 100644
--- a/source/libnet/libnet_join.h
+++ b/source/libnet/libnet_join.h
@@ -36,6 +36,7 @@ struct libnet_JoinCtx {
 		const char *upn;
 		bool modify_config;
 		struct ads_struct *ads;
+		bool debug;
 	} in;
 
 	struct {


-- 
Samba Shared Repository


More information about the samba-cvs mailing list